Commit d75cb91
win,build: add arbitrary and binlog options
This change adds a 'msbuild_arg' option to vcbuild.bat that can be used
to pass arbitrary flags to MSBuild.
It also adds a 'binlog' flag as a shortcut 'msbuild_arg' option to
enable binary logging to `%config%\node.binlog`. This is especially
convenient when debugging changes to the build system.
In the process of developing this change, the idea of adding 'setlocal'
to the beginning of the script was rejected since other scripts in this
repo rely on the exported environment variables. This change adds a
note describing this.
PR-URL: #25994
Reviewed-By: João Reis <reis@janeasystems.com>1 parent c57510e commit d75cb91
1 file changed
Lines changed: 8 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,9 @@ | |||
| 1 | 1 | @if not defined DEBUG_HELPER @ECHO OFF | |
| 2 | 2 | ||
| 3 | + :: Other scripts rely on the environment variables set in this script, so we | ||
| 4 | + :: explicitly allow them to persist in the calling shell. | ||
| 5 | + endlocal | ||
| 6 | + | ||
| 3 | 7 | if /i "%1"=="help" goto help | |
| 4 | 8 | if /i "%1"=="--help" goto help | |
| 5 | 9 | if /i "%1"=="-help" goto help | |
@@ -59,6 +63,7 @@ set no_cctest= | |||
| 59 | 63 | set cctest= | |
| 60 | 64 | set openssl_no_asm= | |
| 61 | 65 | set doc= | |
| 66 | + set extra_msbuild_args=^ | ||
| 62 | 67 | ||
| 63 | 68 | :next-arg | |
| 64 | 69 | if "%1"=="" goto args-done | |
@@ -132,6 +137,8 @@ if /i "%1"=="no-cctest" set no_cctest=1&goto arg-ok | |||
| 132 | 137 | if /i "%1"=="cctest" set cctest=1&goto arg-ok | |
| 133 | 138 | if /i "%1"=="openssl-no-asm" set openssl_no_asm=1&goto arg-ok | |
| 134 | 139 | if /i "%1"=="doc" set doc=1&goto arg-ok | |
| 140 | + if /i "%1"=="binlog" set extra_msbuild_args=%extra_msbuild_args% /binaryLogger:%config%\node.binlog&goto arg-ok | ||
| 141 | + if /i "%1"=="msbuild_arg" set extra_msbuild_args=%extra_msbuild_args% %2&goto arg-ok-2 | ||
| 135 | 142 | ||
| 136 | 143 | echo Error: invalid command line option `%1`. | |
| 137 | 144 | exit /b 1 | |
@@ -313,7 +320,7 @@ if "%target%"=="Build" ( | |||
| 313 | 320 | if defined cctest set target="Build" | |
| 314 | 321 | ) | |
| 315 | 322 | if "%target%"=="rename_node_bin_win" if exist "%config%\cctest.exe" del "%config%\cctest.exe" | |
| 316 | - msbuild node.sln %msbcpu% /t:%target% /p:Configuration=%config% /p:Platform=%msbplatform% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo | ||
| 323 | + msbuild node.sln %msbcpu% /t:%target% /p:Configuration=%config% /p:Platform=%msbplatform% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo %extra_msbuild_args% | ||
| 317 | 324 | if errorlevel 1 ( | |
| 318 | 325 | if not defined project_generated echo Building Node with reused solution failed. To regenerate project files use "vcbuild projgen" | |
| 319 | 326 | goto exit | |
0 commit comments