From da112b0a511afe41aee40c1014ef4b7b7aeaf504 Mon Sep 17 00:00:00 2001 From: Claudio Valerio <=claudio@open-sankore.org> Date: Thu, 1 Dec 2011 15:17:46 +0100 Subject: [PATCH] fixed some build issue on windows --- Sankore 3.1.iss | 46 ++++++++++++++++++++++---------------------- release.win7.vc9.bat | 14 ++++++++------ 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Sankore 3.1.iss b/Sankore 3.1.iss index 973d7813..1a59b506 100644 --- a/Sankore 3.1.iss +++ b/Sankore 3.1.iss @@ -6,19 +6,19 @@ ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B} -AppName=Open-Sankoré -AppVerName=Open-Sankoré -AppPublisher=Sankore +AppName=Open-Sankore +AppVerName=Open-Sankore +AppPublisher=Open-Sankore AppPublisherURL=http://dev.open-sankore.org AppSupportURL=http://dev.open-sankore.org AppUpdatesURL=http://dev.open-sankore.org -DefaultDirName={pf}\Open-Sankoré -DefaultGroupName=Open-Sankoré +DefaultDirName={pf}\Open-Sankore +DefaultGroupName=Open-Sankore OutputDir=.\install\win32\ -OutputBaseFilename=Open-Sankoré +OutputBaseFilename=Open-Sankore SetupIconFile=.\resources\win\uniboard.ico Compression=lzma SolidCompression=yes @@ -36,7 +36,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip [InstallDelete] -Type: files ; Name: "{app}\Open-Sankoré.pdb" +Type: files ; Name: "{app}\Open-Sankore.pdb" Type: filesandordirs ; Name: "{app}\library" Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT" Type: filesandordirs ; Name: "{app}\plugins" @@ -83,31 +83,31 @@ Source: "..\Qt-sankore3.1\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{ap ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] -Name: "{group}\Open-Sankoré"; Filename: "{app}\Open-Sankoré.exe" +Name: "{group}\Open-Sankore"; Filename: "{app}\Open-Sankore.exe" Name: "{group}\{cm:UninstallProgram,Sankore 3.1}"; Filename: "{uninstallexe}" -Name: "{commondesktop}\Open-Sankoré"; Filename: "{app}\Open-Sankoré.exe"; Tasks: desktopicon -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Open-Sankoré"; Filename: "{app}\Open-Sankoré.exe"; Tasks: quicklaunchicon +Name: "{commondesktop}\Open-Sankore"; Filename: "{app}\Open-Sankore.exe"; Tasks: desktopicon +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Open-Sankore"; Filename: "{app}\Open-Sankore.exe"; Tasks: quicklaunchicon ;Name: "{group}\Printing Preferences"; Filename: "{app}\properties.exe"; WorkingDir: {app} [Registry] Root: HKCR; Subkey: ".ubz"; ValueType: string; ValueName: ""; ValueData: "SankoreFile"; Flags: uninsdeletevalue -Root: HKCR; Subkey: "SankoreFile"; ValueType: string; ValueName: ""; ValueData: "Open-Sankoré document"; Flags: uninsdeletekey -Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Open-Sankoré.exe,1" -Root: HKCR; Subkey: "SankoreFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Open-Sankoré.exe"" ""%1""" +Root: HKCR; Subkey: "SankoreFile"; ValueType: string; ValueName: ""; ValueData: "Open-Sankore document"; Flags: uninsdeletekey +Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Open-Sankore.exe,1" +Root: HKCR; Subkey: "SankoreFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Open-Sankore.exe"" ""%1""" -Root: HKLM; Subkey: "SOFTWARE\Open-Sankoré"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankoré.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64 -Root: HKLM; Subkey: "SOFTWARE\Open-Sankoré"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorNotX64 -Root: HKLM; Subkey: "SOFTWARE\Open-Sankoré"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64 -Root: HKLM; Subkey: "SOFTWARE\Open-Sankoré\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64 +Root: HKLM; Subkey: "SOFTWARE\Open-Sankore"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64 +Root: HKLM; Subkey: "SOFTWARE\Open-Sankore"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorNotX64 +Root: HKLM; Subkey: "SOFTWARE\Open-Sankore"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64 +Root: HKLM; Subkey: "SOFTWARE\Open-Sankore\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64 -Root: HKLM64; Subkey: "SOFTWARE\Open-Sankoré"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankoré.exe"; Flags: uninsdeletevalue; Check: isProcessorX64 -Root: HKLM64; Subkey: "SOFTWARE\Open-Sankoré"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorX64 -Root: HKLM64; Subkey: "SOFTWARE\Open-Sankoré"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64 -Root: HKLM64; Subkey: "SOFTWARE\Open-Sankoré\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64 +Root: HKLM64; Subkey: "SOFTWARE\Open-Sankore"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorX64 +Root: HKLM64; Subkey: "SOFTWARE\Open-Sankore"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorX64 +Root: HKLM64; Subkey: "SOFTWARE\Open-Sankore"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64 +Root: HKLM64; Subkey: "SOFTWARE\Open-Sankore\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64 [Run] Filename: "{tmp}\vcredist_x86.exe";WorkingDir:"{tmp}" -Filename: "{app}\Open-Sankoré.exe"; Description: "{cm:LaunchProgram,Sankore 3.1}"; Flags: nowait postinstall +Filename: "{app}\Open-Sankore.exe"; Description: "{cm:LaunchProgram,Open-Sankore}"; Flags: nowait postinstall [UninstallDelete] ; cleanup and delete whole installation directory @@ -122,4 +122,4 @@ end; function isProcessorNotX64: Boolean; begin Result := not isProcessorX64; -end; +end; \ No newline at end of file diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index ec20b011..4a7cc9cb 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -16,10 +16,12 @@ REM --------------------------------------------------------------------- set QT_DIR=..\Qt-sankore3.1 set QT_BIN=%QT_DIR%\bin -set GIT_BIN=C:\Program Files (x86)\Git\bin -set VS_BIN=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin -set WIN_SDK_BIN=C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\Bin -set INNO_EXE=C:\Program Files (x86)\Inno Setup 5\iscc.exe +set PROGRAMS_FILE_PATH=C:\Program Files + +set GIT_BIN=%PROGRAMS_FILE_PATH%\Git\bin +set VS_BIN=%PROGRAMS_FILE_PATH%\Microsoft Visual Studio 9.0\VC\bin +set WIN_SDK_BIN=%PROGRAMS_FILE_PATH%\Microsoft SDKs\Windows\v6.0A\Bin +set INNO_EXE=%PROGRAMS_FILE_PATH%\Inno Setup 5\iscc.exe set BUILD_DIR=build\win32\release set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%;%GIT_BIN% @@ -33,7 +35,7 @@ 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% +REM rmdir /S /Q %BUILD_DIR% set EDITION=MNEMIS_EDITION @@ -56,7 +58,7 @@ nmake release-install del ".\build\win32\release\product\Sankore 3.1.pdb" -set INSTALLER_NAME=Open-Sankoré +set INSTALLER_NAME=Open-Sankore set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe