/ Check-in [0414bb73]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update comments in the MSVC batch build tool.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0414bb73ef83332bec3d06471d431690356dbe13
User & Date: mistachkin 2013-10-31 06:39:15
Context
2013-10-31
18:49
Fix a problem in os_unix.c causing compilation failure if SQLITE_DEBUG and SQLITE_MAX_MMAP_SIZE=0 are both defined. check-in: 090db8c8 user: dan tags: trunk
06:39
Update comments in the MSVC batch build tool. check-in: 0414bb73 user: mistachkin tags: trunk
06:13
Enable some more tests on Windows. check-in: 72389c29 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to tool/build-all-msvc.bat.

   248    248     REM NOTE: Using the MSVC platform name, lookup the simpler platform name to
   249    249     REM       be used for the name of the platform-specific binary directory via
   250    250     REM       the environment variables setup earlier.
   251    251     REM
   252    252     CALL :fn_CopyVariable %%P_NAME PLATFORMNAME
   253    253   
   254    254     REM
   255         -  REM NOTE: This is the inner loop.  There should be exactly one iteration.
          255  +  REM NOTE: This is the second loop.  There should be exactly one iteration.
   256    256     REM       This loop is necessary because the PlatformName environment
   257    257     REM       variable was set above and that value is needed by some of the
   258    258     REM       commands contained in the inner loop.  If these commands were
   259    259     REM       directly contained in the outer loop, the PlatformName environment
   260    260     REM       variable would be stuck with its initial empty value instead.
   261    261     REM
   262    262     FOR /F "tokens=2* delims==" %%D IN ('SET PLATFORMNAME') DO (
................................................................................
   285    285       CALL :fn_UnsetVariable WindowsSdkDir_old
   286    286   
   287    287       REM
   288    288       REM NOTE: Reset the PATH here to the absolute bare minimum required.
   289    289       REM
   290    290       SET PATH=%TOOLPATH%;%SystemRoot%\System32;%SystemRoot%
   291    291   
          292  +    REM
          293  +    REM NOTE: This is the inner loop.  There are normally two iterations, one
          294  +    REM       for each supported build configuration, e.g. Debug or Retail.
          295  +    REM
   292    296       FOR %%B IN (%CONFIGURATIONS%) DO (
   293    297         REM
   294    298         REM NOTE: When preparing the debug build, set the DEBUG and MEMDEBUG
   295    299         REM       environment variables to be picked up by the MSVC makefile
   296    300         REM       itself.
   297    301         REM
   298    302         IF /I "%%B" == "Debug" (
................................................................................
   314    318         REM       3. Build the "sqlite3.dll" and "sqlite3.lib" binaries for this
   315    319         REM          platform.
   316    320         REM
   317    321         REM       4. Copy the "sqlite3.dll" and "sqlite3.lib" binaries for this
   318    322         REM          platform to the platform-specific directory beneath the
   319    323         REM          binary directory.
   320    324         REM
          325  +      REM       5. Unless prevented from doing so, copy the "sqlite3.pdb"
          326  +      REM          symbols file for this platform to the platform-specific
          327  +      REM          directory beneath the binary directory.
          328  +      REM
   321    329         "%ComSpec%" /C (
   322    330           REM
   323    331           REM NOTE: Attempt to setup the MSVC environment for this platform.
   324    332           REM
   325    333           %__ECHO3% CALL "%VCVARSALL%" %%P
   326    334   
   327    335           IF ERRORLEVEL 1 (
................................................................................
   341    349                 ECHO Cannot build, Windows SDK not found for platform %%P.
   342    350                 GOTO errors
   343    351               )
   344    352             )
   345    353           )
   346    354   
   347    355           REM
   348         -        REM NOTE: When using MSVC 2012, the native SDK path cannot simply use
   349         -        REM       the "lib" sub-directory beneath the location specified in the
   350         -        REM       WindowsSdkDir environment variable because that location does
   351         -        REM       not actually contain the necessary library files for x86.
   352         -        REM       This must be done for each iteration because it relies upon
   353         -        REM       the WindowsSdkDir environment variable being set by the batch
   354         -        REM       file used to setup the MSVC environment.
          356  +        REM NOTE: When using MSVC 2012 and/or 2013, the native SDK path cannot
          357  +        REM       simply use the "lib" sub-directory beneath the location
          358  +        REM       specified in the WindowsSdkDir environment variable because
          359  +        REM       that location does not actually contain the necessary library
          360  +        REM       files for x86.  This must be done for each iteration because
          361  +        REM       it relies upon the WindowsSdkDir environment variable being
          362  +        REM       set by the batch file used to setup the MSVC environment.
   355    363           REM
   356    364           IF DEFINED SET_NSDKLIBPATH (
          365  +          REM
          366  +          REM NOTE: The Windows Phone SDK has a slightly different directory
          367  +          REM       structure and must be handled specially here.
          368  +          REM
   357    369             IF DEFINED WindowsPhoneKitDir (
   358    370               CALL :fn_CopyVariable WindowsPhoneKitDir NSDKLIBPATH
   359    371               CALL :fn_AppendVariable NSDKLIBPATH \lib\x86
   360    372             ) ELSE IF DEFINED WindowsSdkDir (
   361    373               CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH
   362    374   
          375  +            REM
          376  +            REM NOTE: The Windows 8.1 SDK has a slightly different directory
          377  +            REM       naming convention.  Currently, this tool assumes that
          378  +            REM       the Windows 8.1 SDK should only be used with MSVC 2013.
          379  +            REM
   363    380               IF "%VisualStudioVersion%" == "12.0" (
   364    381                 CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86
   365    382               ) ELSE (
   366    383                 CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86
   367    384               )
   368    385             )
   369    386           )