From 44e64dcd37b4073879e85d99bb8dac43e2138476 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 25 Oct 2013 09:18:01 +0300 Subject: Windows package generation improvement and readme typo fix Change-Id: I81e4fbac98dece98198be318b2bb919a23c3f96d Reviewed-by: Miikka Heikkinen --- README | 2 +- tools/generate_package_win.cmd | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README b/README index f38040dc..9970e8a8 100644 --- a/README +++ b/README @@ -76,7 +76,7 @@ others may be only partially implemented. Here are some known issues: - Mac: Graphs drawn half the size on Retina displays. - Using multiple graphs in one application crashes on application shutdown unless the last graph to have active context is deleted last. -- Android doesn't support both widgets and OpenGL simulataneously, so only +- Android doesn't support both widgets and OpenGL simultaneously, so only the Qt Quick 2 API is usable in practice in Android. - Shadows are not supported with OpenGL ES2 (including Angle builds in Windows). - Anti-aliasing doesn't work with OpenGL ES2 (including Angle builds in Windows). diff --git a/tools/generate_package_win.cmd b/tools/generate_package_win.cmd index 2a1895b7..a1046f6b 100644 --- a/tools/generate_package_win.cmd +++ b/tools/generate_package_win.cmd @@ -14,7 +14,7 @@ if "%1"=="" ( ) if "%2"=="" ( - set DATAVIS_BRANCH=master + set DATAVIS_BRANCH=origin/master ) else ( set DATAVIS_BRANCH=%2 ) @@ -30,6 +30,7 @@ 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 fetch 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%... @@ -37,6 +38,11 @@ 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 +::Workaround for git archive bug +rmdir /q /s %DATAVIS_PACKAGE_UNZIP_DIR%\tests 2> NUL +rmdir /q /s %DATAVIS_PACKAGE_UNZIP_DIR%\tools 2> NUL +rmdir /q /s %DATAVIS_BUILD_DIR%\tests 2> NUL +rmdir /q /s %DATAVIS_BUILD_DIR%\tools 2> NUL echo Generating includes, mkspecs, and docs in %DATAVIS_BUILD_DIR%... pushd %DATAVIS_BUILD_DIR% -- cgit v1.2.3