Merge branch 'master' of github.com:Sankore/Sankore-3.1

Sankore 3.1.iss

@@ -8,23 +8,27 @@
 AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B}
 AppName=Sankore 3.1
 AppVerName=Sankore 3.1
-AppPublisher=Mnemis
+AppPublisher=Sankore
 
-AppPublisherURL=http://www.getuniboard.com
-AppSupportURL=http://support.getuniboard.com
-AppUpdatesURL=http://www.getuniboard.com
+AppPublisherURL=http://dev.open-sankore.org
+AppSupportURL=http://dev.open-sankore.org
+AppUpdatesURL=http://dev.open-sankore.org
 
 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
 
 [Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"
+Name: "gr"; MessagesFile: "compiler:Languages\German.isl"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"
+Name: "sp"; MessagesFile: "compiler:Languages\Spanish.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
@@ -40,18 +44,30 @@ Type: filesandordirs ; Name: "{app}\i18n"
 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: ".\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\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}\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]
 Name: "{group}\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"
-;Name: "{group}\{cm:ProgramOnTheWeb,Sankore 3.1}"; Filename: "http://www.getuniboard.com/"
 Name: "{group}\{cm:UninstallProgram,Sankore 3.1}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"; Tasks: desktopicon
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"; Tasks: quicklaunchicon
-Name: "{group}\Printing Preferences"; Filename: "{app}\properties.exe"; WorkingDir: {app}
+;Name: "{group}\Printing Preferences"; Filename: "{app}\properties.exe"; WorkingDir: {app}
 
 [Registry]
 Root: HKCR; Subkey: ".ubz"; ValueType: string; ValueName: ""; ValueData: "SankoreFile"; Flags: uninsdeletevalue
@@ -70,6 +86,7 @@ Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "EMF:
 Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
 
 [Run]
+Filename: "{tmp}\vcredist_x86.exe";WorkingDir:"{tmp}"
 Filename: "{app}\Sankore 3.1.exe"; Description: "{cm:LaunchProgram,Sankore 3.1}"; Flags: nowait postinstall
 
 [UninstallDelete]
@@ -85,4 +102,4 @@ end;
 function isProcessorNotX64: Boolean;
 begin
 	Result := not isProcessorX64;
-end;
+end;

release.macx.sh

@@ -2,7 +2,7 @@
 
 # Executables
 QMAKE="/usr/local/Trolltech/Qt-4.7.3/bin/qmake"
-MACDEPLOYQT="/usr/bin/macdeployqt"
+MACDEPLOYQT="`pwd`/../Qt-sankore3.1/bin/macdeployqt"
 DMGUTIL="`pwd`/../Sankore-ThirdParty/refnum/dmgutil/dmgutil.pl"
 DSYMUTIL=/usr/bin/dsymutil
 STRIP=/usr/bin/strip

release.vc9.bat

@@ -5,12 +5,16 @@ 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 UB_DATA_DIR="D:\"
 
 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
@@ -30,11 +34,8 @@ echo %LAST_TAG_VERSION%
 
 if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
 
-
 nmake release-install
 
-.\thirdparty\google-breakpad\r318\bin\win32\dump_syms.exe .\build\win32\release\product\Sankore 3.1.pdb > "%UB_DATA_DIR%\releases\uniboard\sym\win32\Sankore 3.1.exe\%LONG_VERSION%%EDITION%.sym"
-
 del .\build\win32\release\product\Sankore 3.1.pdb
 
 set INSTALLER_NAME=Sankore 3.1
@@ -44,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