From ad8e369486b8bc718ef055e5a2574343e1e3aeb9 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 15 Oct 2013 08:44:43 +0300
Subject: Fixes to Windows package script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I062f13329e7488c9cd92a651ec5ef6a81e2dc67a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 tools/generate_package_win.cmd | 86 +++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 39 deletions(-)

(limited to 'tools')

diff --git a/tools/generate_package_win.cmd b/tools/generate_package_win.cmd
index 02d17d02..2a1895b7 100644
--- a/tools/generate_package_win.cmd
+++ b/tools/generate_package_win.cmd
@@ -1,49 +1,57 @@
 @echo off
 
+SETLOCAL
+
 set DATAVIS_TEMP_DIR=temp_dir
 set DATAVIS_TEMP_DIR_FULL=..\%DATAVIS_TEMP_DIR%
-set DATAVIS_BUILD_DIR=%DATAVIS_TEMP_DIR_FULL%\tempbuild
-set DATAVIS_SOURCE_DIR=%CD%
 
-if "%2"=="" (
-    set DATAVIS_BRANCH=master
-) else (
-    set DATAVIS_BRANCH=%2
-)
 if "%1"=="" (
     echo Usage: generate_package_win version [branch or SHA]
     echo Branch defaults to master.
-    echo Creates the package in parent dir
-    echo Docs are generated in a shadow build dir %DATAVIS_BUILD_DIR%
+    echo Creates the package in parent dir.
+    echo A temporary dir %DATAVIS_TEMP_DIR_FULL% is utilized for intermediate steps.
+    goto :end
+)
+
+if "%2"=="" (
+    set DATAVIS_BRANCH=master
 ) else (
-    set DATAVIS_VERSION=%1
-    set DATAVIS_PACKAGE_UNZIP_DIR=%DATAVIS_TEMP_DIR_FULL%\qtdatavisualization_%DATAVIS_VERSION%
-    set DATAVIS_ZIP=qtdatavisualization_temp_%DATAVIS_VERSION%.zip
-    set DATAVIS_ZIP_FULL=%DATAVIS_TEMP_DIR_FULL%\%DATAVIS_ZIP%
-    echo Exporting %DATAVIS_BRANCH% to %DATAVIS_ZIP_FULL%...
-    rmdir /q /s %DATAVIS_TEMP_DIR_FULL% 2> NUL
-    md %DATAVIS_TEMP_DIR_FULL% 2> NUL
-    call git archive --format zip --output ../%DATAVIS_TEMP_DIR%/%DATAVIS_ZIP% %DATAVIS_BRANCH%
-
-    echo Unzipping %DATAVIS_ZIP_FULL% to %DATAVIS_PACKAGE_UNZIP_DIR%...
-    md %DATAVIS_PACKAGE_UNZIP_DIR% 2> NUL
-    call unzip %DATAVIS_ZIP_FULL% -d %DATAVIS_PACKAGE_UNZIP_DIR% > NUL
-
-    echo Generating includes, mkspecs, and docs in %DATAVIS_BUILD_DIR%...
-    md %DATAVIS_BUILD_DIR% 2> NUL
-    pushd %DATAVIS_BUILD_DIR%
-    qmake %DATAVIS_SOURCE_DIR%\qtdatavisualization.pro > NUL 2> NUL
-    nmake docs > NUL 2> NUL
-    popd
-
-    echo Copying generated files to %DATAVIS_PACKAGE_UNZIP_DIR%
-    set DATAVIS_XCOPY_CMD=xcopy /s /i /q
-    %DATAVIS_XCOPY_CMD% %DATAVIS_BUILD_DIR%\doc %DATAVIS_PACKAGE_UNZIP_DIR%\doc
-    %DATAVIS_XCOPY_CMD% %DATAVIS_BUILD_DIR%\mkspecs %DATAVIS_PACKAGE_UNZIP_DIR%\mkspecs
-    %DATAVIS_XCOPY_CMD% %DATAVIS_BUILD_DIR%\include %DATAVIS_PACKAGE_UNZIP_DIR%\include
-
-    set DATAVIS_FINAL_ZIP=..\qtdatavisualization_%DATAVIS_VERSION%.zip
-    echo Repackaging %DATAVIS_PACKAGE_UNZIP_DIR% to %DATAVIS_FINAL_ZIP%
-    del /q %DATAVIS_FINAL_ZIP% 2> NUL
-    call 7z a -r -y -tzip %DATAVIS_FINAL_ZIP% %DATAVIS_PACKAGE_UNZIP_DIR% >NUL
+    set DATAVIS_BRANCH=%2
 )
+
+set DATAVIS_VERSION=%1
+set DATAVIS_BUILD_DIR=%DATAVIS_TEMP_DIR_FULL%\tempbuild
+set DATAVIS_PACKAGE_UNZIP_DIR=%DATAVIS_TEMP_DIR_FULL%\qtdatavisualization_%DATAVIS_VERSION%
+set DATAVIS_TEMP_ZIP=qtdatavisualization_temp_%DATAVIS_VERSION%.zip
+set DATAVIS_TEMP_ZIP_FULL=%DATAVIS_TEMP_DIR_FULL%\%DATAVIS_TEMP_ZIP%
+set DATAVIS_XCOPY_CMD=xcopy /s /i /q
+set DATAVIS_FINAL_ZIP=..\qtdatavisualization_%DATAVIS_VERSION%.zip
+
+echo Exporting %DATAVIS_BRANCH% to %DATAVIS_TEMP_ZIP_FULL%...
+rmdir /q /s %DATAVIS_TEMP_DIR_FULL% 2> NUL
+md %DATAVIS_TEMP_DIR_FULL% 2> NUL
+call git archive --format zip --output ../%DATAVIS_TEMP_DIR%/%DATAVIS_TEMP_ZIP% %DATAVIS_BRANCH%
+
+echo Unzipping %DATAVIS_TEMP_ZIP_FULL% to %DATAVIS_PACKAGE_UNZIP_DIR% and %DATAVIS_BUILD_DIR%...
+md %DATAVIS_PACKAGE_UNZIP_DIR% 2> NUL
+md %DATAVIS_BUILD_DIR% 2> NUL
+call 7z x -y -o%DATAVIS_PACKAGE_UNZIP_DIR% %DATAVIS_TEMP_ZIP_FULL%  > NUL
+call 7z x -y -o%DATAVIS_BUILD_DIR% %DATAVIS_TEMP_ZIP_FULL%  > NUL
+
+echo Generating includes, mkspecs, and docs in %DATAVIS_BUILD_DIR%...
+pushd %DATAVIS_BUILD_DIR%
+::Fake git build to get syncqt to run
+md .git 2> NUL
+qmake > NUL 2> NUL
+nmake docs > NUL 2> NUL
+popd
+
+echo Copying generated files to %DATAVIS_PACKAGE_UNZIP_DIR%
+%DATAVIS_XCOPY_CMD% %DATAVIS_BUILD_DIR%\doc %DATAVIS_PACKAGE_UNZIP_DIR%\doc
+%DATAVIS_XCOPY_CMD% %DATAVIS_BUILD_DIR%\include %DATAVIS_PACKAGE_UNZIP_DIR%\include
+
+echo Repackaging %DATAVIS_PACKAGE_UNZIP_DIR% to %DATAVIS_FINAL_ZIP%
+del /q %DATAVIS_FINAL_ZIP% 2> NUL
+call 7z a -r -y -tzip %DATAVIS_FINAL_ZIP% %DATAVIS_PACKAGE_UNZIP_DIR% >NUL
+
+:end
-- 
cgit v1.2.3