Fossil SCM
Make the MSVC batch build tool sub-routine 'fn_UnsetVariable' a bit more robust.
Commit
8e9cdd242c60ecd9751c8534cbdc3eb94c24b867
Parent
f77fbed8e306e22…
1 file changed
+4
-2
+4
-2
| --- win/buildmsvc.bat | ||
| +++ win/buildmsvc.bat | ||
| @@ -259,12 +259,14 @@ | ||
| 259 | 259 | CALL :fn_UnsetVariable PFILES_SDK71A |
| 260 | 260 | SET NMAKE_ARGS=%NMAKE_ARGS% FOSSIL_ENABLE_WINXP=1 |
| 261 | 261 | GOTO :EOF |
| 262 | 262 | |
| 263 | 263 | :fn_UnsetVariable |
| 264 | - IF NOT "%1" == "" ( | |
| 265 | - SET %1= | |
| 264 | + SET VALUE=%1 | |
| 265 | + IF DEFINED VALUE ( | |
| 266 | + SET %VALUE%= | |
| 267 | + SET VALUE= | |
| 266 | 268 | CALL :fn_ResetErrorLevel |
| 267 | 269 | ) |
| 268 | 270 | GOTO :EOF |
| 269 | 271 | |
| 270 | 272 | :fn_ResetErrorLevel |
| 271 | 273 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -259,12 +259,14 @@ | |
| 259 | CALL :fn_UnsetVariable PFILES_SDK71A |
| 260 | SET NMAKE_ARGS=%NMAKE_ARGS% FOSSIL_ENABLE_WINXP=1 |
| 261 | GOTO :EOF |
| 262 | |
| 263 | :fn_UnsetVariable |
| 264 | IF NOT "%1" == "" ( |
| 265 | SET %1= |
| 266 | CALL :fn_ResetErrorLevel |
| 267 | ) |
| 268 | GOTO :EOF |
| 269 | |
| 270 | :fn_ResetErrorLevel |
| 271 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -259,12 +259,14 @@ | |
| 259 | CALL :fn_UnsetVariable PFILES_SDK71A |
| 260 | SET NMAKE_ARGS=%NMAKE_ARGS% FOSSIL_ENABLE_WINXP=1 |
| 261 | GOTO :EOF |
| 262 | |
| 263 | :fn_UnsetVariable |
| 264 | SET VALUE=%1 |
| 265 | IF DEFINED VALUE ( |
| 266 | SET %VALUE%= |
| 267 | SET VALUE= |
| 268 | CALL :fn_ResetErrorLevel |
| 269 | ) |
| 270 | GOTO :EOF |
| 271 | |
| 272 | :fn_ResetErrorLevel |
| 273 |