From 9c6f9330e1402985bbf3bcc59a3ce845f0c23bd3 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 3 Mar 2014 14:05:44 +0100 Subject: [PATCH 1/3] removed c++11 --- OpenBoard.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index f08e499a..d9147b59 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -102,8 +102,6 @@ MOC_DIR = $$BUILD_DIR/moc RCC_DIR = $$BUILD_DIR/rcc UI_DIR = $$BUILD_DIR/ui -QMAKE_CXXFLAGS += -std=c++11 - win32 { RC_FILE = resources/win/OpenBoard.rc CONFIG += qaxcontainer From f7ace733e4d74eb3ad6e4063441547f8a95cfec4 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 3 Mar 2014 14:13:35 +0100 Subject: [PATCH 2/3] updated path --- OpenBoard.iss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenBoard.iss b/OpenBoard.iss index 88e317fb..232c3547 100644 --- a/OpenBoard.iss +++ b/OpenBoard.iss @@ -47,12 +47,12 @@ Type: filesandordirs ; Name: "{app}\i18n" Type: files ; Name: "{app}\*.dll" [Files] -Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}" +Source: "..\OpenBoard-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}" Source: "build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ;OpenSSL -Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion -Source: "..\Sankore-ThirdParty\openssl\win32\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion +Source: "..\OpenBoard-ThirdParty\openssl\openssl-1.0.0d\out32dll\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion +Source: "..\OpenBoard-ThirdParty\openssl\openssl-1.0.0d\out32dll\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion ;Qt base dll Source: "..\Qt-4.8\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion From 95e5472d3917035678ecd77d1ff4c50d0fdce2ea Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 3 Mar 2014 14:14:11 +0100 Subject: [PATCH 3/3] the installer isn't zipped anymore --- release.win7.vc9.bat | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index 8a308438..b53a6b22 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -21,7 +21,6 @@ set QT_BIN=%QT_DIR%\bin set PROGRAMS_FILE_PATH=C:\Program Files -set SEVEN_ZIP_EXE="%PROGRAMS_FILE_PATH%\7-Zip\7z.exe" 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 @@ -96,15 +95,9 @@ del build\win32\release\product\i18n\qt_help* del "build\win32\release\product\%APPLICATION_NAME%.pdb" -set INSTALLER_PATH=.\install\win32\%APPLICATION_NAME%.exe -call "%INNO_EXE%" "%APPLICATION_NAME%.iss" /F"%APPLICATION_NAME%" +call "%INNO_EXE%" "%APPLICATION_NAME%.iss" /F"%APPLICATION_NAME%_Installer_%VERSION%" -set INSTALL_DIRECTORY=install\win32\ -xcopy *.pdf %INSTALL_DIRECTORY% -cd %INSTALL_DIRECTORY% -call %SEVEN_ZIP_EXE% a %APPLICATION_NAME%_Windows_%VERSION%.zip *.exe *.pdf -cd ..\..\ GOTO END :EXIT_WITH_ERROR