/ Check-in [43155b15]
Login

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

Overview
Comment:Rename a tool batch file subroutine to avoid confusion about its purpose.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 43155b1543bddbb84a8bc13a5b7344b228ddacb9
User & Date: mistachkin 2012-10-05 07:36:34
Context
2012-10-05
14:43
Consolidate all occurrences of the "no such collation sequence" error message into a single spot. check-in: 8ea67522 user: drh tags: trunk
07:36
Rename a tool batch file subroutine to avoid confusion about its purpose. check-in: 43155b15 user: mistachkin tags: trunk
2012-10-03
18:09
Fix an out-of-order memset() that occurs before all variable declarations are finished. Also fix a line that exceeds the 80-character line length limit. check-in: ba2f492f user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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

   138    138   REM
   139    139   FOR %%P IN (%PLATFORMS%) DO (
   140    140     REM
   141    141     REM NOTE: Using the MSVC platform name, lookup the simpler platform name to
   142    142     REM       be used for the name of the platform-specific binary directory via
   143    143     REM       the environment variables setup earlier.
   144    144     REM
   145         -  CALL :fn_SetVariable %%P_NAME PLATFORMNAME
          145  +  CALL :fn_CopyVariable %%P_NAME PLATFORMNAME
   146    146   
   147    147     REM
   148    148     REM NOTE: This is the inner loop.  There should be exactly one iteration.
   149    149     REM       This loop is necessary because the PlatformName environment
   150    150     REM       variable was set above and that value is needed by some of the
   151    151     REM       commands contained in the inner loop.  If these commands were
   152    152     REM       directly contained in the outer loop, the PlatformName environment
................................................................................
   226    226         REM       WindowsSdkDir environment variable because that location does
   227    227         REM       not actually contain the necessary library files for x86.
   228    228         REM       This must be done for each iteration because it relies upon
   229    229         REM       the WindowsSdkDir environment variable being set by the batch
   230    230         REM       file used to setup the MSVC environment.
   231    231         REM
   232    232         IF DEFINED SET_NSDKLIBPATH (
   233         -        CALL :fn_SetVariable WindowsSdkDir NSDKLIBPATH
          233  +        CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH
   234    234           CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86
   235    235         )
   236    236   
   237    237         REM
   238    238         REM NOTE: Unless prevented from doing so, invoke NMAKE with the MSVC
   239    239         REM       makefile to clean any stale build output from previous
   240    240         REM       iterations of this loop and/or previous runs of this batch
................................................................................
   335    335     VERIFY > NUL
   336    336     GOTO :EOF
   337    337   
   338    338   :fn_SetErrorLevel
   339    339     VERIFY MAYBE 2> NUL
   340    340     GOTO :EOF
   341    341   
   342         -:fn_SetVariable
          342  +:fn_CopyVariable
   343    343     SETLOCAL
   344    344     IF NOT DEFINED %1 GOTO :EOF
   345    345     IF "%2" == "" GOTO :EOF
   346    346     SET __ECHO_CMD=ECHO %%%1%%
   347    347     FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (
   348    348       SET VALUE=%%V
   349    349     )