From 69090c1303cb5923085628a8bdac42dd496c0efe Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@open-sankore.org>
Date: Tue, 31 Jul 2012 11:40:25 +0200
Subject: [PATCH] improved windows installer

---
 release.win7.vc9.bat | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat
index af1f549b..9d7c5bae 100644
--- a/release.win7.vc9.bat
+++ b/release.win7.vc9.bat
@@ -18,6 +18,7 @@ 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
@@ -37,7 +38,7 @@ REM is correct. This is important because installer
 REM pick up dll from this directory
 IF NOT EXIST "%QT_DIR%\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR
 
-rmdir /S /Q %BUILD_DIR%
+REM rmdir /S /Q %BUILD_DIR%
 
 set EDITION=MNEMIS_EDITION
 
@@ -46,7 +47,9 @@ set EDITION=MNEMIS_EDITION
 %LRELEASE% Sankore_3.1.pro
 %LRELEASE% %BASE_QT_TRANSLATIONS_DIRECTORY%\translations.pro
 
-REM set /p VERSION= < build\win32\release\version
+set /p VERSION= < build\win32\release\version
+REM remove the last character that is a space
+set VERSION=%VERSION: =%
 REM git rev-list --tags --max-count=1 > tmp
 REM set /p LAST_TAG= < tmp
 REM erase tmp
@@ -78,3 +81,17 @@ set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
 
 call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%"
 
+set INSTALL_DIRECTORY=install\win32\
+
+xcopy *.pdf %INSTALL_DIRECTORY%
+cd %INSTALL_DIRECTORY%
+call %SEVEN_ZIP_EXE% a Open-Sankore_Windows_%VERSION%.zip *.exe *.pdf 
+cd ..\..\
+GOTO END
+
+:EXIT_WITH_ERROR
+echo "Error found"
+GOTO :EOF
+
+:END
+echo "Open-Sankore's build finished"