/ Check-in [8469d651]
Login

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

Overview
Comment:Work in progress on making VSIX packages for the Visual Studio 2015 CTP.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | vsix2015
Files: files | file ages | folders
SHA1: 8469d651a0442a2bc572a869a0457a6ea8c06bc7
User & Date: mistachkin 2015-04-19 06:18:10
Context
2015-04-19
18:58
Improve documentation and comments in the MSVC batch build tool. check-in: ca64ef07 user: mistachkin tags: vsix2015
06:18
Work in progress on making VSIX packages for the Visual Studio 2015 CTP. check-in: 8469d651 user: mistachkin tags: vsix2015
2015-04-18
19:20
The sqlite3_trace() callback does not try to expand parameters in statements that have no parameter. check-in: 917e3c36 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   284    284   
   285    285   # Check if the native library paths should be used when compiling
   286    286   # the command line tools used during the compilation process.  If
   287    287   # so, set the necessary macro now.
   288    288   #
   289    289   !IF $(USE_NATIVE_LIBPATHS)!=0
   290    290   NLTLIBPATHS = "/LIBPATH:$(NCRTLIBPATH)" "/LIBPATH:$(NSDKLIBPATH)"
          291  +
          292  +!IFDEF NUCRTLIBPATH
          293  +NUCRTLIBPATH = $(NUCRTLIBPATH:\\=\)
          294  +NLTLIBPATHS = $(NLTLIBPATHS) "/LIBPATH:$(NUCRTLIBPATH)"
          295  +!ENDIF
   291    296   !ENDIF
   292    297   
   293    298   # C compiler and options for use in building executables that
   294    299   # will run on the target platform.  (BCC and TCC are usually the
   295    300   # same unless your are cross-compiling.)
   296    301   #
   297    302   !IF $(USE_FULLWARN)!=0

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

   213    213   REM       external tools were found in the search above.
   214    214   REM
   215    215   SET TOOLPATH=%gawk.exe_PATH%;%tclsh85.exe_PATH%
   216    216   
   217    217   %_VECHO% ToolPath = '%TOOLPATH%'
   218    218   
   219    219   REM
   220         -REM NOTE: Check for MSVC 2012/2013 because the Windows SDK directory handling
   221         -REM       is slightly different for those versions.
          220  +REM NOTE: Setting the Windows SDK library path is only required for MSVC
          221  +REM       2012, 2013, and 2015.
          222  +REM
          223  +CALL :fn_UnsetVariable SET_NSDKLIBPATH
          224  +
          225  +REM
          226  +REM NOTE: Setting the Universal CRT library path is only required for MSVC
          227  +REM       2015.
          228  +REM
          229  +CALL :fn_UnsetVariable SET_NUCRTLIBPATH
          230  +
          231  +REM
          232  +REM NOTE: Check for MSVC 2012, 2013, and 2015 specially because the Windows
          233  +REM       SDK directory handling is slightly different for those versions.
   222    234   REM
   223    235   IF "%VisualStudioVersion%" == "11.0" (
   224    236     REM
   225    237     REM NOTE: If the Windows SDK library path has already been set, do not set
   226    238     REM       it to something else later on.
   227    239     REM
   228    240     IF NOT DEFINED NSDKLIBPATH (
................................................................................
   232    244     REM
   233    245     REM NOTE: If the Windows SDK library path has already been set, do not set
   234    246     REM       it to something else later on.
   235    247     REM
   236    248     IF NOT DEFINED NSDKLIBPATH (
   237    249       SET SET_NSDKLIBPATH=1
   238    250     )
   239         -) ELSE (
   240         -  CALL :fn_UnsetVariable SET_NSDKLIBPATH
          251  +) ELSE IF "%VisualStudioVersion%" == "14.0" (
          252  +  REM
          253  +  REM NOTE: If the Windows SDK library path has already been set, do not set
          254  +  REM       it to something else later on.
          255  +  REM
          256  +  IF NOT DEFINED NSDKLIBPATH (
          257  +    SET SET_NSDKLIBPATH=1
          258  +  )
          259  +
          260  +  REM
          261  +  REM NOTE: If the Universal CRT library path has already been set, do not set
          262  +  REM       it to something else later on.
          263  +  REM
          264  +  IF NOT DEFINED NUCRTLIBPATH (
          265  +    SET SET_NUCRTLIBPATH=1
          266  +  )
   241    267   )
   242    268   
   243    269   REM
   244    270   REM NOTE: Check if this is the Windows Phone SDK.  If so, a different batch
   245    271   REM       file is necessary to setup the build environment.  Since the variable
   246    272   REM       values involved here may contain parenthesis, using GOTO instead of
   247    273   REM       an IF block is required.
................................................................................
   290    316       CALL :fn_UnsetVariable FrameworkVersion
   291    317       CALL :fn_UnsetVariable FrameworkVersion32
   292    318       CALL :fn_UnsetVariable FSHARPINSTALLDIR
   293    319       CALL :fn_UnsetVariable INCLUDE
   294    320       CALL :fn_UnsetVariable LIB
   295    321       CALL :fn_UnsetVariable LIBPATH
   296    322       CALL :fn_UnsetVariable Platform
          323  +    CALL :fn_UnsetVariable UniversalCRTSdkDir
   297    324       REM CALL :fn_UnsetVariable VCINSTALLDIR
   298    325       CALL :fn_UnsetVariable VSINSTALLDIR
   299    326       CALL :fn_UnsetVariable WindowsPhoneKitDir
   300    327       CALL :fn_UnsetVariable WindowsSdkDir
   301    328       CALL :fn_UnsetVariable WindowsSdkDir_35
   302    329       CALL :fn_UnsetVariable WindowsSdkDir_old
   303    330       CALL :fn_UnsetVariable WindowsSDK_ExecutablePath_x86
................................................................................
   381    408                 ECHO Cannot build, Windows SDK not found for platform %%P.
   382    409                 GOTO errors
   383    410               )
   384    411             )
   385    412           )
   386    413   
   387    414           REM
   388         -        REM NOTE: When using MSVC 2012 and/or 2013, the native SDK path cannot
   389         -        REM       simply use the "lib" sub-directory beneath the location
          415  +        REM NOTE: When using MSVC 2012, 2013, or 2015, the native SDK path
          416  +        REM       cannot simply be the "lib" sub-directory beneath the location
   390    417           REM       specified in the WindowsSdkDir environment variable because
   391    418           REM       that location does not actually contain the necessary library
   392    419           REM       files for x86.  This must be done for each iteration because
   393    420           REM       it relies upon the WindowsSdkDir environment variable being
   394    421           REM       set by the batch file used to setup the MSVC environment.
   395    422           REM
   396    423           IF DEFINED SET_NSDKLIBPATH (
................................................................................
   401    428             IF DEFINED WindowsPhoneKitDir (
   402    429               CALL :fn_CopyVariable WindowsPhoneKitDir NSDKLIBPATH
   403    430               CALL :fn_AppendVariable NSDKLIBPATH \lib\x86
   404    431             ) ELSE IF DEFINED WindowsSdkDir (
   405    432               CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH
   406    433   
   407    434               REM
   408         -            REM NOTE: The Windows 8.1 SDK has a slightly different directory
   409         -            REM       naming convention.
          435  +            REM NOTE: The Windows 8.x and Windows 10 SDKs have a slightly
          436  +            REM       different directory naming conventions.
   410    437               REM
   411         -            IF DEFINED USE_WINV63_NSDKLIBPATH (
          438  +            IF DEFINED USE_WINV100_NSDKLIBPATH (
          439  +              CALL :fn_AppendVariable NSDKLIBPATH \..\10\lib\10.0.10030.0\um\x86
          440  +            ) ELSE IF DEFINED USE_WINV63_NSDKLIBPATH (
   412    441                 CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86
   413    442               ) ELSE IF "%VisualStudioVersion%" == "12.0" (
          443  +              CALL :fn_AppendVariable NSDKLIBPATH \..\8.0\lib\win8\um\x86
          444  +            ) ELSE IF "%VisualStudioVersion%" == "14.0" (
   414    445                 CALL :fn_AppendVariable NSDKLIBPATH \..\8.0\lib\win8\um\x86
   415    446               ) ELSE (
   416    447                 CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86
   417    448               )
   418    449             )
   419    450           )
          451  +
          452  +        REM
          453  +        REM NOTE: When using MSVC 2015, setting the Universal CRT library path
          454  +        REM       for x86 may be required as well.  This must also be done for
          455  +        REM       each iteration because it relies upon the UniversalCRTSdkDir
          456  +        REM       environment variable being set by the batch file used to
          457  +        REM       setup the MSVC environment.
          458  +        REM
          459  +        IF DEFINED SET_NUCRTLIBPATH (
          460  +          IF DEFINED UniversalCRTSdkDir (
          461  +            CALL :fn_CopyVariable UniversalCRTSdkDir NUCRTLIBPATH
          462  +            CALL :fn_AppendVariable NUCRTLIBPATH \lib\winv10.0\ucrt\x86
          463  +          )
          464  +        )
   420    465   
   421    466           REM
   422    467           REM NOTE: Unless prevented from doing so, invoke NMAKE with the MSVC
   423    468           REM       makefile to clean any stale build output from previous
   424    469           REM       iterations of this loop and/or previous runs of this batch
   425    470           REM       file, etc.
   426    471           REM