SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update PYTHON env var to PYTHON_LOC

Browse Source
This commit is contained in:
Vasily
2019-01-04 17:07:52 +01:00
parent 93bbcc618a
commit 33dba6202b
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_scripts/win/test.bat
-9
View File
@@ -1,9 +0,0 @@
@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.
build_scripts/win/verify_formatting.cmd
+1 -1
View File
@@ -32,7 +32,7 @@ ECHO %current_activity%: Clang-format located.
%CLANG_FORMAT_LOC% --version
python %project_dir%/build_scripts/run-clang-format.py %project_dir%/src -r --color never --clang-format-executable %CLANG_FORMAT_LOC%
%PYTHON_LOC%python %project_dir%/build_scripts/run-clang-format.py %project_dir%/src -r --color never --clang-format-executable %CLANG_FORMAT_LOC%
IF NOT ERRORLEVEL 1 (
ECHO FORMATTED CORRECTLY.
) ELSE (
build_windows.cmd
+3 -3
View File
@@ -22,13 +22,13 @@ SET project_dir=%folder_path%
ECHO %top_level_activity%: Calling build script.
%PYTHON%python %project_dir%\build_scripts\win\build.py build
%PYTHON_LOC%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_LOC%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%
@@ -40,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_LOC%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%
docs/building_for_windows.md
+4
View File
@@ -23,7 +23,9 @@ For pushing changes to the repo:
2. Clang format. Part of the [LLVM collection](https://releases.llvm.org/download.html).
Additionally, for fully building portable and installer release versions:
3. [7zip](https://www.7-zip.org/download.html)
4. [Nullsoft Scriptable Install System (NSIS)](https://sourceforge.net/projects/nsis/)
<a name="locs_and_envs"></a>
@@ -39,6 +41,7 @@ The following environmental variables are relevant for building the project.
| `ZIP_LOC` | Path to your 7zip `.exe`. Both portable and installer will work. |
| `NSIS_LOC` | Path to your installation of NSIS containing the `makensis` file. Both portable and installer will work. |
| `LLVM_LOC` | Path to your LLVM bin directory containing `clang-format.exe`. Not necessary for building with the MSVC compiler, but necessary for pushing changes to the repo. Leave as empty string if your `clang-format`.exe` and `clang-cl.exe` are in the path. |
| `PYTHON_LOC` | A non-error-checked way of referring to a specific python installation. Must end on a backslash or be undefined. If undefined `python` must be in the path. |
If an environment variable isn't set a default value will be provided. The default values are shown in the table below.
@@ -50,6 +53,7 @@ If an environment variable isn't set a default value will be provided. The defau
| `ZIP_LOC` | `"C:\Program Files\7-Zip\7z.exe"` |
| `NSIS_LOC` | `"C:\Program Files (x86)\NSIS\"` |
| `LLVM_LOC` | `"C:\Program Files\LLVM\bin\"` |
| `PYTHON_LOC` | NONE SUPPLIED. It is expected that `python` is in the path if `PYTHON_LOC` is defined.|
Additionally, these optional environment variables are supported.