OpenBoardImporter works on windows

preferencesAboutTextFull
Claudio Valerio 12 years ago
parent ea04796e94
commit a62dfe2901
  1. 3
      OpenBoard.iss
  2. 16
      release.win7.vc9.bat
  3. 6
      src/core/UBOpenSankoreImporter.cpp

@ -91,6 +91,9 @@ Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir:
Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion
Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion
;OpenBoardImporter
Source: "..\OpenSankoreToOpenBoard\release\OpenBoardImporter.exe"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion
;fonts for xpdf ;fonts for xpdf
Source: "resources\windows\xpdfrc"; DestDir: "{app}"; Flags: ignoreversion Source: "resources\windows\xpdfrc"; DestDir: "{app}"; Flags: ignoreversion
Source: "resources\fonts\*"; DestDir: "{app}\fonts"; Flags: ignoreversion Source: "resources\fonts\*"; DestDir: "{app}\fonts"; Flags: ignoreversion

@ -1,4 +1,4 @@
echo off echo off
REM -------------------------------------------------------------------- REM --------------------------------------------------------------------
REM This program is free software: you can redistribute it and/or modify REM This program is free software: you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by REM it under the terms of the GNU General Public License as published by
@ -36,6 +36,18 @@ call "%VS_BIN%\vcvars32.bat"
echo %PATH% echo %PATH%
REM Third party impoter application
set IMPORTER_NAME="OpenBoardImporter"
set IMPORTER_PATH="%cd%\..\OpenSankoreToOpenBoard"
IF NOT EXIST "%IMPORTER_PATH%" GOTO EXIT_WITH_ERROR
set HOME_DIR="%cd%"
cd %IMPORTER_PATH%
IF EXIST "release" (del "release\*.*" /Q)
"%QT_BIN%\qmake.exe" %IMPORTER_NAME%.pro
nmake release
cd %HOME_DIR%
REM this checks if the custom qt directory path REM this checks if the custom qt directory path
REM is correct. This is important because installer REM is correct. This is important because installer
REM pick up dll from this directory REM pick up dll from this directory
@ -92,7 +104,7 @@ GOTO END
:EXIT_WITH_ERROR :EXIT_WITH_ERROR
echo "Error found" echo "Error found"
GOTO :EOF GOTO EOF
:END :END
echo "%APPLICATION_NAME% build finished" echo "%APPLICATION_NAME% build finished"

@ -41,7 +41,10 @@ UBOpenSankoreImporter::UBOpenSankoreImporter(QObject *parent) :
#elif defined Q_WS_MACX #elif defined Q_WS_MACX
newProcess.startDetached(qApp->applicationDirPath()+"/../Resources/OpenBoardImporter.app/Contents/MacOS/OpenBoardImporter"); newProcess.startDetached(qApp->applicationDirPath()+"/../Resources/OpenBoardImporter.app/Contents/MacOS/OpenBoardImporter");
#else #else
newProcess.startDetached(qApp->applicationDirPath()+"/Importer/OpenBoardImporter.exe"); // Windows does not allows to run easily an exe located in a subdirectory when the main
// directory is placed into programs files.
//newProcess.startDetached(qApp->applicationDirPath()+"\\Importer\\OpenBoardImporter.exe");
newProcess.startDetached("C:/OpenBoard/Importer/OpenBoardImporter.exe");
#endif #endif
qApp->exit(0); qApp->exit(0);
} }
@ -49,3 +52,4 @@ UBOpenSankoreImporter::UBOpenSankoreImporter(QObject *parent) :
} }
Loading…
Cancel
Save