Fossil SCM
Make it easier to build multiple configurations of Fossil with MSVC.
Commit
8db943facce6fba7df3ce35ddf48fa05fe29434711a6ffc45aa17ce07b90667e
Parent
b2993e5a66d88cd…
1 file changed
+12
-5
+12
-5
| --- win/buildmsvc.bat | ||
| +++ win/buildmsvc.bat | ||
| @@ -183,27 +183,34 @@ | ||
| 183 | 183 | %_VECHO% VcInstallDir = '%VCINSTALLDIR%' |
| 184 | 184 | |
| 185 | 185 | REM |
| 186 | 186 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 187 | 187 | REM |
| 188 | -IF NOT EXIST "%ROOT%\msvcbld" ( | |
| 189 | - %__ECHO% MKDIR "%ROOT%\msvcbld" | |
| 188 | +IF NOT DEFINED BUILDDIR ( | |
| 189 | + SET BUILDDIR=%ROOT%\msvcbld%BUILDSUFFIX% | |
| 190 | +) | |
| 191 | + | |
| 192 | +%_VECHO% BuildSuffix = '%BUILDSUFFIX%' | |
| 193 | +%_VECHO% BuildDir = '%BUILDDIR%' | |
| 194 | + | |
| 195 | +IF NOT EXIST "%BUILDDIR%" ( | |
| 196 | + %__ECHO% MKDIR "%BUILDDIR%" | |
| 190 | 197 | |
| 191 | 198 | IF ERRORLEVEL 1 ( |
| 192 | - ECHO Could not make directory "%ROOT%\msvcbld". | |
| 199 | + ECHO Could not make directory "%BUILDDIR%". | |
| 193 | 200 | GOTO errors |
| 194 | 201 | ) |
| 195 | 202 | ) |
| 196 | 203 | |
| 197 | 204 | REM |
| 198 | 205 | REM NOTE: Attempt to change to the created build output directory so that |
| 199 | 206 | REM the generated files will be placed there. |
| 200 | 207 | REM |
| 201 | -%__ECHO2% PUSHD "%ROOT%\msvcbld" | |
| 208 | +%__ECHO2% PUSHD "%BUILDDIR%" | |
| 202 | 209 | |
| 203 | 210 | IF ERRORLEVEL 1 ( |
| 204 | - ECHO Could not change to directory "%ROOT%\msvcbld". | |
| 211 | + ECHO Could not change to directory "%BUILDDIR%". | |
| 205 | 212 | GOTO errors |
| 206 | 213 | ) |
| 207 | 214 | |
| 208 | 215 | REM |
| 209 | 216 | REM NOTE: If requested, setup the build environment to refer to the Windows |
| 210 | 217 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -183,27 +183,34 @@ | |
| 183 | %_VECHO% VcInstallDir = '%VCINSTALLDIR%' |
| 184 | |
| 185 | REM |
| 186 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 187 | REM |
| 188 | IF NOT EXIST "%ROOT%\msvcbld" ( |
| 189 | %__ECHO% MKDIR "%ROOT%\msvcbld" |
| 190 | |
| 191 | IF ERRORLEVEL 1 ( |
| 192 | ECHO Could not make directory "%ROOT%\msvcbld". |
| 193 | GOTO errors |
| 194 | ) |
| 195 | ) |
| 196 | |
| 197 | REM |
| 198 | REM NOTE: Attempt to change to the created build output directory so that |
| 199 | REM the generated files will be placed there. |
| 200 | REM |
| 201 | %__ECHO2% PUSHD "%ROOT%\msvcbld" |
| 202 | |
| 203 | IF ERRORLEVEL 1 ( |
| 204 | ECHO Could not change to directory "%ROOT%\msvcbld". |
| 205 | GOTO errors |
| 206 | ) |
| 207 | |
| 208 | REM |
| 209 | REM NOTE: If requested, setup the build environment to refer to the Windows |
| 210 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -183,27 +183,34 @@ | |
| 183 | %_VECHO% VcInstallDir = '%VCINSTALLDIR%' |
| 184 | |
| 185 | REM |
| 186 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 187 | REM |
| 188 | IF NOT DEFINED BUILDDIR ( |
| 189 | SET BUILDDIR=%ROOT%\msvcbld%BUILDSUFFIX% |
| 190 | ) |
| 191 | |
| 192 | %_VECHO% BuildSuffix = '%BUILDSUFFIX%' |
| 193 | %_VECHO% BuildDir = '%BUILDDIR%' |
| 194 | |
| 195 | IF NOT EXIST "%BUILDDIR%" ( |
| 196 | %__ECHO% MKDIR "%BUILDDIR%" |
| 197 | |
| 198 | IF ERRORLEVEL 1 ( |
| 199 | ECHO Could not make directory "%BUILDDIR%". |
| 200 | GOTO errors |
| 201 | ) |
| 202 | ) |
| 203 | |
| 204 | REM |
| 205 | REM NOTE: Attempt to change to the created build output directory so that |
| 206 | REM the generated files will be placed there. |
| 207 | REM |
| 208 | %__ECHO2% PUSHD "%BUILDDIR%" |
| 209 | |
| 210 | IF ERRORLEVEL 1 ( |
| 211 | ECHO Could not change to directory "%BUILDDIR%". |
| 212 | GOTO errors |
| 213 | ) |
| 214 | |
| 215 | REM |
| 216 | REM NOTE: If requested, setup the build environment to refer to the Windows |
| 217 |