Update comments in the MSVC batch build tool.
FossilOrigin-Name: 0414bb73ef83332bec3d06471d431690356dbe13
This commit is contained in:
parent
99eef00d43
commit
293566eaf2
12
manifest
12
manifest
@ -1,5 +1,5 @@
|
||||
C Enable\ssome\smore\stests\son\sWindows.
|
||||
D 2013-10-31T06:13:57.969
|
||||
C Update\scomments\sin\sthe\sMSVC\sbatch\sbuild\stool.
|
||||
D 2013-10-31T06:39:15.748
|
||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||
F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
|
||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||
@ -1077,7 +1077,7 @@ F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361
|
||||
F test/win32longpath.test e2aafc07e6990fe86c69be22a3d1a0e210cd329b
|
||||
F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
|
||||
F test/zerodamage.test 209d7ed441f44cc5299e4ebffbef06fd5aabfefd
|
||||
F tool/build-all-msvc.bat 38623a30fd58288fda5cc7f7df2682aaab75c9d5 x
|
||||
F tool/build-all-msvc.bat 1bac6adc3fdb4d9204f21d17b14be25778370e48 x
|
||||
F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
|
||||
F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
|
||||
F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
|
||||
@ -1126,7 +1126,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
|
||||
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
||||
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
|
||||
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
|
||||
P 1a0a88657f54874703fc05f828ce29ad115d9f28
|
||||
R 3ecce2c5ce21312a1dbb296432d69334
|
||||
P 72389c295bb240ec76746e289403b82e04189903
|
||||
R 1054ff58e814a30ba005df284390b721
|
||||
U mistachkin
|
||||
Z 202c1504aa0d2b90c6b0d6f25f8395e7
|
||||
Z 4b58002663daf257cb37f517515be69c
|
||||
|
@ -1 +1 @@
|
||||
72389c295bb240ec76746e289403b82e04189903
|
||||
0414bb73ef83332bec3d06471d431690356dbe13
|
@ -252,7 +252,7 @@ FOR %%P IN (%PLATFORMS%) DO (
|
||||
CALL :fn_CopyVariable %%P_NAME PLATFORMNAME
|
||||
|
||||
REM
|
||||
REM NOTE: This is the inner loop. There should be exactly one iteration.
|
||||
REM NOTE: This is the second loop. There should be exactly one iteration.
|
||||
REM This loop is necessary because the PlatformName environment
|
||||
REM variable was set above and that value is needed by some of the
|
||||
REM commands contained in the inner loop. If these commands were
|
||||
@ -289,6 +289,10 @@ FOR %%P IN (%PLATFORMS%) DO (
|
||||
REM
|
||||
SET PATH=%TOOLPATH%;%SystemRoot%\System32;%SystemRoot%
|
||||
|
||||
REM
|
||||
REM NOTE: This is the inner loop. There are normally two iterations, one
|
||||
REM for each supported build configuration, e.g. Debug or Retail.
|
||||
REM
|
||||
FOR %%B IN (%CONFIGURATIONS%) DO (
|
||||
REM
|
||||
REM NOTE: When preparing the debug build, set the DEBUG and MEMDEBUG
|
||||
@ -318,6 +322,10 @@ FOR %%P IN (%PLATFORMS%) DO (
|
||||
REM platform to the platform-specific directory beneath the
|
||||
REM binary directory.
|
||||
REM
|
||||
REM 5. Unless prevented from doing so, copy the "sqlite3.pdb"
|
||||
REM symbols file for this platform to the platform-specific
|
||||
REM directory beneath the binary directory.
|
||||
REM
|
||||
"%ComSpec%" /C (
|
||||
REM
|
||||
REM NOTE: Attempt to setup the MSVC environment for this platform.
|
||||
@ -345,21 +353,30 @@ FOR %%P IN (%PLATFORMS%) DO (
|
||||
)
|
||||
|
||||
REM
|
||||
REM NOTE: When using MSVC 2012, the native SDK path cannot simply use
|
||||
REM the "lib" sub-directory beneath the location specified in the
|
||||
REM WindowsSdkDir environment variable because that location does
|
||||
REM not actually contain the necessary library files for x86.
|
||||
REM This must be done for each iteration because it relies upon
|
||||
REM the WindowsSdkDir environment variable being set by the batch
|
||||
REM file used to setup the MSVC environment.
|
||||
REM NOTE: When using MSVC 2012 and/or 2013, the native SDK path cannot
|
||||
REM simply use the "lib" sub-directory beneath the location
|
||||
REM specified in the WindowsSdkDir environment variable because
|
||||
REM that location does not actually contain the necessary library
|
||||
REM files for x86. This must be done for each iteration because
|
||||
REM it relies upon the WindowsSdkDir environment variable being
|
||||
REM set by the batch file used to setup the MSVC environment.
|
||||
REM
|
||||
IF DEFINED SET_NSDKLIBPATH (
|
||||
REM
|
||||
REM NOTE: The Windows Phone SDK has a slightly different directory
|
||||
REM structure and must be handled specially here.
|
||||
REM
|
||||
IF DEFINED WindowsPhoneKitDir (
|
||||
CALL :fn_CopyVariable WindowsPhoneKitDir NSDKLIBPATH
|
||||
CALL :fn_AppendVariable NSDKLIBPATH \lib\x86
|
||||
) ELSE IF DEFINED WindowsSdkDir (
|
||||
CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH
|
||||
|
||||
REM
|
||||
REM NOTE: The Windows 8.1 SDK has a slightly different directory
|
||||
REM naming convention. Currently, this tool assumes that
|
||||
REM the Windows 8.1 SDK should only be used with MSVC 2013.
|
||||
REM
|
||||
IF "%VisualStudioVersion%" == "12.0" (
|
||||
CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86
|
||||
) ELSE (
|
||||
|
Loading…
Reference in New Issue
Block a user