From 93bbcc618aba440f558613c9bc2535da9f12fd56 Mon Sep 17 00:00:00 2001 From: Vasily Date: Wed, 2 Jan 2019 22:51:33 +0100 Subject: [PATCH] Correct 7zip directory, no python definition expansion --- .appveyor.yml | 2 ++ .../win/__pycache__/common.cpython-37.pyc | Bin 0 -> 4146 bytes build_scripts/win/build.py | 6 +++--- build_scripts/win/test.bat | 13 +++++++++---- build_windows.cmd | 7 +++---- 5 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 build_scripts/win/__pycache__/common.cpython-37.pyc diff --git a/.appveyor.yml b/.appveyor.yml index c0540ad..7b807e4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,6 +17,8 @@ environment: NSIS_LOC: '"C:\Program Files (x86)\NSIS\"' ZIP_LOC: '"C:\Program Files\7-zip\7z.exe"' LLVM_LOC: '"C:\Program Files\LLVM\bin\"' + PYTHON: '"C:\Python37\"' + BUILD_PACKAGE: "1" BUILD_CLANG: '"1"' diff --git a/build_scripts/win/__pycache__/common.cpython-37.pyc b/build_scripts/win/__pycache__/common.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4061d4f3e46a6e670e5c796336d465507a6fbb85 GIT binary patch literal 4146 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 G=zjrz`OCrp literal 0 HcmV?d00001 diff --git a/build_scripts/win/build.py b/build_scripts/win/build.py index 7d3e86c..78070f8 100644 --- a/build_scripts/win/build.py +++ b/build_scripts/win/build.py @@ -16,7 +16,7 @@ def package(): ZIP_NAME = "AdvancedSettings-" + VERSION_STRING + ".7z" add_line_to_run_bat_file("@ECHO Starting 7zip:") - add_line_to_run_bat_file('"' + ZIP_LOC + '"' + " a -t7z " + get_project_dir() + "\\" + OUTPUT_DIR + "\\" + ZIP_NAME + " " + get_deploy_dir() + "\\*") + add_line_to_run_bat_file('"' + ZIP_LOC + '"' + " a -t7z " + get_project_dir() + "\\bin\\win64\\" + ZIP_NAME + " " + get_deploy_dir() + "\\*") add_error_handling_line_to_bat_file() add_line_to_run_bat_file("@ECHO 7zip done.") say("7zip added to file.") @@ -59,7 +59,7 @@ def deploy(): + "\\qtdata --libdir " + get_deploy_dir() + " --plugindir " + get_deploy_dir() + "\\qtdata\\plugins --no-system-d3d-compiler --no-opengl-sw --" + COMPILE_MODE + " --qmldir " + get_project_dir() + "\\src\\res\\qml\\ " + get_deploy_dir() + "\\AdvancedSettings.exe") - + add_error_handling_line_to_bat_file() add_line_to_run_bat_file("@ECHO windeployqt finished.") say("windeployqt added to file.") @@ -81,7 +81,7 @@ def deploy(): copy_folder(get_project_dir() + "\\src\\package_files", get_deploy_dir()) #openvr dll - copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "openvr_api.dll") + copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "\\openvr_api.dll") say("Creating batch file:") create_batch_file() diff --git a/build_scripts/win/test.bat b/build_scripts/win/test.bat index 9f346b7..612ad0d 100644 --- a/build_scripts/win/test.bat +++ b/build_scripts/win/test.bat @@ -1,4 +1,9 @@ -set PATH=%PATH%;C:\Qt\5.11.1\msvc2017_64\bin\; -@ECHO Starting windeployqt: -"windeployqt" --dir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\qtdata --libdir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings --plugindir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\qtdata\plugins --no-system-d3d-compiler --no-opengl-sw --release --qmldir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\src\res\qml\ Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\AdvancedSettings.exe -@ECHO windeployqt finished. +@ECHO Starting 7zip: +"C:\Program Files\7-Zip\7z.exe" a -t7z Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\\bin\\win64\\AdvancedSettings\AdvancedSettings-2-8-0.7z Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\* +IF ERRORLEVEL 1 EXIT /B 1 +@ECHO 7zip done. +@ECHO Starting NSIS: +cd Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\NSISPortable\App\NSIS +makensis /V2 /WX Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\installer\installer.nsi +IF ERRORLEVEL 1 EXIT /B 1 +@ECHO NSIS done. diff --git a/build_windows.cmd b/build_windows.cmd index ca24e22..624b04f 100644 --- a/build_windows.cmd +++ b/build_windows.cmd @@ -22,14 +22,13 @@ SET project_dir=%folder_path% ECHO %top_level_activity%: Calling build script. -CALL %project_dir%\build_scripts\win\build.cmd -%PYTHON%\python %project_dir%\build_scripts\win\build.py build +%PYTHON%python %project_dir%\build_scripts\win\build.py build IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% call %project_dir%\build_scripts\win\test.bat IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% ECHO %top_level_activity%: Calling deployment script. -%PYTHON%\python %project_dir%\build_scripts\win\build.py deploy +%PYTHON%python %project_dir%\build_scripts\win\build.py deploy IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% call %project_dir%\build_scripts\win\test.bat IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% @@ -41,7 +40,7 @@ IF NOT DEFINED BUILD_PACKAGE ( EXIT /B %exit_code_success% ) ECHO %top_level_activity%: Calling packaging script. -%PYTHON%\python %project_dir%\build_scripts\win\build.py package +%PYTHON%python %project_dir%\build_scripts\win\build.py package IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps% call %project_dir%\build_scripts\win\test.bat IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%