Fossil SCM
Reverse check-in [0f0b904337150bd5]. For MSVC, in order to build using the current directory as the build output directory, set the BUILDDIR environment variable to C:\Users\mistachkin\Documents\checkouts\sqlite\fossil before executing the build tool.
Commit
a6332ebfe98c5f66f1e7a17141d127424aabdb70fbbcbcc1261747e3ad6944cf
Parent
8e3898ac039d54d…
1 file changed
+12
-9
+12
-9
| --- win/buildmsvc.bat | ||
| +++ win/buildmsvc.bat | ||
| @@ -182,10 +182,15 @@ | ||
| 182 | 182 | |
| 183 | 183 | %_VECHO% VcInstallDir = '%VCINSTALLDIR%' |
| 184 | 184 | |
| 185 | 185 | REM |
| 186 | 186 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 187 | +REM In order to build using the current directory as the build | |
| 188 | +REM output directory, use the following command before executing | |
| 189 | +REM this tool: | |
| 190 | +REM | |
| 191 | +REM SET BUILDDIR=%CD% | |
| 187 | 192 | REM |
| 188 | 193 | IF DEFINED BUILDDIR ( |
| 189 | 194 | IF DEFINED BUILDSUFFIX ( |
| 190 | 195 | CALL :fn_FindVarInVar BUILDSUFFIX BUILDDIR |
| 191 | 196 | |
| @@ -195,25 +200,23 @@ | ||
| 195 | 200 | REM |
| 196 | 201 | ) ELSE ( |
| 197 | 202 | REM |
| 198 | 203 | REM NOTE: The build suffix is not present, add it now. |
| 199 | 204 | REM |
| 200 | - SET "BUILDDIR=%BUILDDIR%%BUILDSUFFIX%" | |
| 205 | + SET BUILDDIR=%BUILDDIR%%BUILDSUFFIX% | |
| 201 | 206 | ) |
| 202 | 207 | |
| 203 | 208 | CALL :fn_ResetErrorLevel |
| 204 | 209 | ) |
| 205 | 210 | ) ELSE ( |
| 206 | 211 | REM |
| 207 | - REM When BUILDDIR is not defined, build in the current directory. | |
| 208 | - REM For compatibility, create the build artifacts in 'msvcbld' | |
| 209 | - REM subdirectory (similar to how the Linux build is done). | |
| 210 | - REM | |
| 211 | - REM USECASE-1: in-source build (current dir is %ROOT%) | |
| 212 | - REM USECASE-2: out-of-source build (current dir is arbitrary) | |
| 213 | - REM | |
| 214 | - SET "BUILDDIR=%CD%\msvcbld%BUILDSUFFIX%" | |
| 212 | + REM NOTE: By default, when BUILDDIR is unset, build in the "msvcbld" | |
| 213 | + REM sub-directory relative to the root of the source checkout. | |
| 214 | + REM This retains backward compatibility with third-party build | |
| 215 | + REM scripts, etc, | |
| 216 | + REM | |
| 217 | + SET BUILDDIR=%ROOT%\msvcbld%BUILDSUFFIX% | |
| 215 | 218 | ) |
| 216 | 219 | |
| 217 | 220 | %_VECHO% BuildSuffix = '%BUILDSUFFIX%' |
| 218 | 221 | %_VECHO% BuildDir = '%BUILDDIR%' |
| 219 | 222 | |
| 220 | 223 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -182,10 +182,15 @@ | |
| 182 | |
| 183 | %_VECHO% VcInstallDir = '%VCINSTALLDIR%' |
| 184 | |
| 185 | REM |
| 186 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 187 | REM |
| 188 | IF DEFINED BUILDDIR ( |
| 189 | IF DEFINED BUILDSUFFIX ( |
| 190 | CALL :fn_FindVarInVar BUILDSUFFIX BUILDDIR |
| 191 | |
| @@ -195,25 +200,23 @@ | |
| 195 | REM |
| 196 | ) ELSE ( |
| 197 | REM |
| 198 | REM NOTE: The build suffix is not present, add it now. |
| 199 | REM |
| 200 | SET "BUILDDIR=%BUILDDIR%%BUILDSUFFIX%" |
| 201 | ) |
| 202 | |
| 203 | CALL :fn_ResetErrorLevel |
| 204 | ) |
| 205 | ) ELSE ( |
| 206 | REM |
| 207 | REM When BUILDDIR is not defined, build in the current directory. |
| 208 | REM For compatibility, create the build artifacts in 'msvcbld' |
| 209 | REM subdirectory (similar to how the Linux build is done). |
| 210 | REM |
| 211 | REM USECASE-1: in-source build (current dir is %ROOT%) |
| 212 | REM USECASE-2: out-of-source build (current dir is arbitrary) |
| 213 | REM |
| 214 | SET "BUILDDIR=%CD%\msvcbld%BUILDSUFFIX%" |
| 215 | ) |
| 216 | |
| 217 | %_VECHO% BuildSuffix = '%BUILDSUFFIX%' |
| 218 | %_VECHO% BuildDir = '%BUILDDIR%' |
| 219 | |
| 220 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -182,10 +182,15 @@ | |
| 182 | |
| 183 | %_VECHO% VcInstallDir = '%VCINSTALLDIR%' |
| 184 | |
| 185 | REM |
| 186 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 187 | REM In order to build using the current directory as the build |
| 188 | REM output directory, use the following command before executing |
| 189 | REM this tool: |
| 190 | REM |
| 191 | REM SET BUILDDIR=%CD% |
| 192 | REM |
| 193 | IF DEFINED BUILDDIR ( |
| 194 | IF DEFINED BUILDSUFFIX ( |
| 195 | CALL :fn_FindVarInVar BUILDSUFFIX BUILDDIR |
| 196 | |
| @@ -195,25 +200,23 @@ | |
| 200 | REM |
| 201 | ) ELSE ( |
| 202 | REM |
| 203 | REM NOTE: The build suffix is not present, add it now. |
| 204 | REM |
| 205 | SET BUILDDIR=%BUILDDIR%%BUILDSUFFIX% |
| 206 | ) |
| 207 | |
| 208 | CALL :fn_ResetErrorLevel |
| 209 | ) |
| 210 | ) ELSE ( |
| 211 | REM |
| 212 | REM NOTE: By default, when BUILDDIR is unset, build in the "msvcbld" |
| 213 | REM sub-directory relative to the root of the source checkout. |
| 214 | REM This retains backward compatibility with third-party build |
| 215 | REM scripts, etc, |
| 216 | REM |
| 217 | SET BUILDDIR=%ROOT%\msvcbld%BUILDSUFFIX% |
| 218 | ) |
| 219 | |
| 220 | %_VECHO% BuildSuffix = '%BUILDSUFFIX%' |
| 221 | %_VECHO% BuildDir = '%BUILDDIR%' |
| 222 | |
| 223 |