MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release-1.30' of github.com:Sankore/Sankore-3.1 into release-1.30

Browse Source
preferencesAboutTextFull
Claudio Valerio 13 years ago
parent e1472657f7 9847d9a9b3
commit 57d659ffca
3 changed files with 31 additions and 92 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 46
      Sankore 3.1.iss
  2. 63
      release.vc9.bat
  3. 14
      release.win7.vc9.bat

46
Sankore 3.1.iss
Unescape View File

@ -6,19 +6,19 @@
; Do not use the same AppId value in installers for other applications. ; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B} AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B}
AppName=Open-Sankoré AppName=Open-Sankore
AppVerName=Open-Sankoré AppVerName=Open-Sankore
AppPublisher=Sankore AppPublisher=Open-Sankore
AppPublisherURL=http://dev.open-sankore.org AppPublisherURL=http://dev.open-sankore.org
AppSupportURL=http://dev.open-sankore.org AppSupportURL=http://dev.open-sankore.org
AppUpdatesURL=http://dev.open-sankore.org AppUpdatesURL=http://dev.open-sankore.org
DefaultDirName={pf}\Open-Sankoré DefaultDirName={pf}\Open-Sankore
DefaultGroupName=Open-Sankoré DefaultGroupName=Open-Sankore
OutputDir=.\install\win32\ OutputDir=.\install\win32\
OutputBaseFilename=Open-Sankoré OutputBaseFilename=Open-Sankore
SetupIconFile=.\resources\win\uniboard.ico SetupIconFile=.\resources\win\uniboard.ico
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
@ -36,7 +36,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
[InstallDelete] [InstallDelete]
Type: files ; Name: "{app}\Open-Sankoré.pdb" Type: files ; Name: "{app}\Open-Sankore.pdb"
Type: filesandordirs ; Name: "{app}\library" Type: filesandordirs ; Name: "{app}\library"
Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT" Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT"
Type: filesandordirs ; Name: "{app}\plugins" 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 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons] [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: "{group}\{cm:UninstallProgram,Sankore 3.1}"; Filename: "{uninstallexe}"
Name: "{commondesktop}\Open-Sankoré"; Filename: "{app}\Open-Sankoré.exe"; Tasks: desktopicon Name: "{commondesktop}\Open-Sankore"; Filename: "{app}\Open-Sankore.exe"; Tasks: desktopicon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Open-Sankoré"; Filename: "{app}\Open-Sankoré.exe"; Tasks: quicklaunchicon 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} ;Name: "{group}\Printing Preferences"; Filename: "{app}\properties.exe"; WorkingDir: {app}
[Registry] [Registry]
Root: HKCR; Subkey: ".ubz"; ValueType: string; ValueName: ""; ValueData: "SankoreFile"; Flags: uninsdeletevalue 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"; ValueType: string; ValueName: ""; ValueData: "Open-Sankore document"; Flags: uninsdeletekey
Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Open-Sankoré.exe,1" 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-Sankoré.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-Sankore"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankore.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-Sankore"; 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-Sankore"; 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\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-Sankore"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankore.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-Sankore"; 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-Sankore"; 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\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
[Run] [Run]
Filename: "{tmp}\vcredist_x86.exe";WorkingDir:"{tmp}" 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] [UninstallDelete]
; cleanup and delete whole installation directory ; cleanup and delete whole installation directory
@ -122,4 +122,4 @@ end;
function isProcessorNotX64: Boolean; function isProcessorNotX64: Boolean;
begin begin
Result := not isProcessorX64; Result := not isProcessorX64;
end; end;

63
release.vc9.bat
Unescape View File

@ -1,63 +0,0 @@
REM --------------------------------------------------------------------
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 the Free Software Foundation, either version 3 of the License, or
REM (at your option) any later version.
REM
REM This program is distributed in the hope that it will be useful,
REM but WITHOUT ANY WARRANTY; without even the implied warranty of
REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
REM GNU General Public License for more details.
REM
REM You should have received a copy of the GNU General Public License
REM along with this program. If not, see <http://www.gnu.org/licenses/>.
REM ---------------------------------------------------------------------
set QT_DIR=..\Qt-sankore3.1
set QT_BIN=%QT_DIR%\bin
set VS_BIN="C:\Program Files\Microsoft Visual Studio 9.0\VC\bin"
set WIN_SDK_BIN="C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin"
set INNO_EXE="C:\Program Files\Inno Setup 5\iscc.exe "
set BUILD_DIR=build\win32\release
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
"%QT_BIN%\qmake.exe" "DEFINES+=%EDITION%"
set /p VERSION= < build\win32\release\version
git rev-list --tags --max-count=1 > tmp
set /p LAST_TAG= < tmp
erase tmp
git describe %LAST_TAG% > tmp
set /p LAST_TAG_VERSION=< tmp
erase tmp
echo %VERSION%
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
set INSTALLER_NAME=Sankore 3.1
set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
call %INNO_EXE% "Sankore 3.1.iss" /F"%INSTALLER_NAME%"
:EXIT_WITH_ERROR
echo ERROR

14
release.win7.vc9.bat
Unescape View File

@ -16,10 +16,12 @@ REM ---------------------------------------------------------------------
set QT_DIR=..\Qt-sankore3.1 set QT_DIR=..\Qt-sankore3.1
set QT_BIN=%QT_DIR%\bin set QT_BIN=%QT_DIR%\bin
set GIT_BIN=C:\Program Files (x86)\Git\bin set PROGRAMS_FILE_PATH=C:\Program Files
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 GIT_BIN=%PROGRAMS_FILE_PATH%\Git\bin
set INNO_EXE=C:\Program Files (x86)\Inno Setup 5\iscc.exe 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 BUILD_DIR=build\win32\release
set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%;%GIT_BIN% 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 REM pick up dll from this directory
IF NOT EXIST "..\Qt-sankore3.1\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR 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 set EDITION=MNEMIS_EDITION
@ -56,7 +58,7 @@ nmake release-install
del ".\build\win32\release\product\Sankore 3.1.pdb" 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 set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe

Write Preview
Loading…
Cancel
Save