diff --git a/Sankore 3.1.iss b/Sankore 3.1.iss index c93a94e8..195ce228 100644 --- a/Sankore 3.1.iss +++ b/Sankore 3.1.iss @@ -18,7 +18,7 @@ DefaultDirName={pf}\Sankore 3.1 DefaultGroupName=Sankore 3.1 OutputDir=.\install\win32\ -OutputBaseFilename=Sankore 3.1 setup +OutputBaseFilename=Sankore 3.1 SetupIconFile=.\resources\win\uniboard.ico Compression=lzma SolidCompression=yes @@ -46,22 +46,22 @@ Type: files ; Name: "{app}\*.dll" [Files] Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}" Source: ".\build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ".\runtime\windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; +;Source: ".\runtime\windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; ;Source: ".\resources\win\plugins\*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs ;Qt base dll -Source: "..Qt-sankore3.1\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..Qt-sankore3.1\lib\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..Qt-sankore3.1\lib\QtXml4.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..Qt-sankore3.1\lib\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..Qt-sankore3.1\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..Qt-sankore3.1\lib\phonon.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..Qt-sankore3.1\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..Qt-sankore3.1\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\QtXml4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion ;Qt plugins -Source: "..\Qt-sankore3.1\plugins\imageformats\qjpeg4.dll"; DestDir: "{app}\plugins\imageformats"; Flags: ignoreversion -Source: "..\Qt-sankore3.1\plugins\imageformats\qsvg4.dll"; DestDir: "{app}\plugins\imageformats"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\plugins\imageformats\qjpeg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\plugins\imageformats\qsvg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/release.vc9.bat b/release.vc9.bat index fbf027c9..85bd8cf7 100644 --- a/release.vc9.bat +++ b/release.vc9.bat @@ -10,6 +10,11 @@ set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN% call %VS_BIN%\vcvars32.bat +REM this checks if the custom qt directory path +REM is correct. This is important because installer +REM pick up dll from this directory +IF NOT EXIST "..\Qt-sankore3.1\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR + rmdir /S /Q %BUILD_DIR% set EDITION=MNEMIS_EDITION @@ -29,7 +34,6 @@ echo %LAST_TAG_VERSION% if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR - nmake release-install del .\build\win32\release\product\Sankore 3.1.pdb @@ -41,5 +45,4 @@ set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe call %INNO_EXE% "Sankore 3.1.iss" /F"%INSTALLER_NAME%" :EXIT_WITH_ERROR - echo version %VERSION% - echo last tag version %LAST_TAG_VERSION% + echo ERROR diff --git a/resources/win/plugins/imageformats/qjpeg4.dll b/resources/win/plugins/imageformats/qjpeg4.dll deleted file mode 100644 index a94486d6..00000000 Binary files a/resources/win/plugins/imageformats/qjpeg4.dll and /dev/null differ diff --git a/resources/win/plugins/imageformats/qsvg4.dll b/resources/win/plugins/imageformats/qsvg4.dll deleted file mode 100644 index 3904148c..00000000 Binary files a/resources/win/plugins/imageformats/qsvg4.dll and /dev/null differ diff --git a/runtime/windows/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest b/runtime/windows/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest deleted file mode 100644 index a0b2152d..00000000 --- a/runtime/windows/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest +++ /dev/null @@ -1,8 +0,0 @@ - - - - - VF5ECUAHPV7EnUf+/UIXMPizPvs= - 3Wg+StVMq2uhx7POnAkl2w4dDmY= - /YfRn7UQENzdMeoMHxTgdRMiObA= - \ No newline at end of file diff --git a/runtime/windows/Microsoft.VC90.CRT/msvcm90.dll b/runtime/windows/Microsoft.VC90.CRT/msvcm90.dll deleted file mode 100644 index 734d86be..00000000 Binary files a/runtime/windows/Microsoft.VC90.CRT/msvcm90.dll and /dev/null differ diff --git a/runtime/windows/Microsoft.VC90.CRT/msvcp90.dll b/runtime/windows/Microsoft.VC90.CRT/msvcp90.dll deleted file mode 100644 index 70ddf553..00000000 Binary files a/runtime/windows/Microsoft.VC90.CRT/msvcp90.dll and /dev/null differ diff --git a/runtime/windows/Microsoft.VC90.CRT/msvcr90.dll b/runtime/windows/Microsoft.VC90.CRT/msvcr90.dll deleted file mode 100644 index 072bc0b4..00000000 Binary files a/runtime/windows/Microsoft.VC90.CRT/msvcr90.dll and /dev/null differ diff --git a/runtime/windows/QtCore4.dll b/runtime/windows/QtCore4.dll deleted file mode 100644 index 0d342206..00000000 Binary files a/runtime/windows/QtCore4.dll and /dev/null differ diff --git a/runtime/windows/QtGui4.dll b/runtime/windows/QtGui4.dll deleted file mode 100644 index c1a98619..00000000 Binary files a/runtime/windows/QtGui4.dll and /dev/null differ diff --git a/runtime/windows/QtNetwork4.dll b/runtime/windows/QtNetwork4.dll deleted file mode 100644 index 1d3ff9e3..00000000 Binary files a/runtime/windows/QtNetwork4.dll and /dev/null differ diff --git a/runtime/windows/QtScript4.dll b/runtime/windows/QtScript4.dll deleted file mode 100644 index d7b56e7a..00000000 Binary files a/runtime/windows/QtScript4.dll and /dev/null differ diff --git a/runtime/windows/QtSvg4.dll b/runtime/windows/QtSvg4.dll deleted file mode 100644 index 05470d72..00000000 Binary files a/runtime/windows/QtSvg4.dll and /dev/null differ diff --git a/runtime/windows/QtWebKit4.dll b/runtime/windows/QtWebKit4.dll deleted file mode 100644 index 8a321067..00000000 Binary files a/runtime/windows/QtWebKit4.dll and /dev/null differ diff --git a/runtime/windows/QtXml4.dll b/runtime/windows/QtXml4.dll deleted file mode 100644 index c3706b84..00000000 Binary files a/runtime/windows/QtXml4.dll and /dev/null differ diff --git a/runtime/windows/phonon4.dll b/runtime/windows/phonon4.dll deleted file mode 100644 index c12ac545..00000000 Binary files a/runtime/windows/phonon4.dll and /dev/null differ