Work in progress on making VSIX packages for the Visual Studio 2015 CTP.

FossilOrigin-Name: 8469d651a0442a2bc572a869a0457a6ea8c06bc7

Makefile.msc

@@ -288,6 +288,11 @@ BCC = $(BCC) -FAcs
 #
 !IF $(USE_NATIVE_LIBPATHS)!=0
 NLTLIBPATHS = "/LIBPATH:$(NCRTLIBPATH)" "/LIBPATH:$(NSDKLIBPATH)"
+
+!IFDEF NUCRTLIBPATH
+NUCRTLIBPATH = $(NUCRTLIBPATH:\\=\)
+NLTLIBPATHS = $(NLTLIBPATHS) "/LIBPATH:$(NUCRTLIBPATH)"
+!ENDIF
 !ENDIF
 
 # C compiler and options for use in building executables that

manifest

@@ -1,9 +1,9 @@
-C The\ssqlite3_trace()\scallback\sdoes\snot\stry\sto\sexpand\sparameters\sin\sstatements\nthat\shave\sno\sparameter.
+C Work\sin\sprogress\son\smaking\sVSIX\spackages\sfor\sthe\sVisual\sStudio\s2015\sCTP.
-D 2015-04-18T19:20:14.612
+D 2015-04-19T06:18:10.467
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc a19bceec468fa18bb54df52257b1a2211e69172d
+F Makefile.msc 513abdaff333b04ef68775ec25ceb6053b4ecafd
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
 F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
@@ -1196,7 +1196,7 @@ F test/without_rowid6.test db0dbf03c49030aa3c1ba5f618620334bd2baf5f
 F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
 F test/zeroblob.test fb3c0e4ab172d386954deda24c03f500e121d80d
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
-F tool/build-all-msvc.bat 72e05bc8deca39a547884485c086b915f50a91ed x
+F tool/build-all-msvc.bat 62f4f74b55781757d5b20e12651650d5d94ef2cf x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -1251,7 +1251,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2eed41fda068f2cbac55e63d7c1875ddaa331508
+P 917e3c36293a1bf052a16116c93e5037ed712f96
-R fe8a360bbce7dedd87d096d07c896e4c
+R db56dc9284c6212139225593eec3e32c
-U drh
+T *branch * vsix2015
-Z 768a04b82f6060145bfe8edb7197ea08
+T *sym-vsix2015 *
+T -sym-trunk *
+U mistachkin
+Z af05882e14ca6800d4b8b20f52645692

manifest.uuid

@@ -1 +1 @@
-917e3c36293a1bf052a16116c93e5037ed712f96
+8469d651a0442a2bc572a869a0457a6ea8c06bc7

tool/build-all-msvc.bat

@@ -217,8 +217,20 @@ SET TOOLPATH=%gawk.exe_PATH%;%tclsh85.exe_PATH%
 %_VECHO% ToolPath = '%TOOLPATH%'
 
 REM
-REM NOTE: Check for MSVC 2012/2013 because the Windows SDK directory handling
+REM NOTE: Setting the Windows SDK library path is only required for MSVC
-REM       is slightly different for those versions.
+REM       2012, 2013, and 2015.
+REM
+CALL :fn_UnsetVariable SET_NSDKLIBPATH
+
+REM
+REM NOTE: Setting the Universal CRT library path is only required for MSVC
+REM       2015.
+REM
+CALL :fn_UnsetVariable SET_NUCRTLIBPATH
+
+REM
+REM NOTE: Check for MSVC 2012, 2013, and 2015 specially because the Windows
+REM       SDK directory handling is slightly different for those versions.
 REM
 IF "%VisualStudioVersion%" == "11.0" (
   REM
@@ -236,8 +248,22 @@ IF "%VisualStudioVersion%" == "11.0" (
   IF NOT DEFINED NSDKLIBPATH (
     SET SET_NSDKLIBPATH=1
   )
-) ELSE (
+) ELSE IF "%VisualStudioVersion%" == "14.0" (
-  CALL :fn_UnsetVariable SET_NSDKLIBPATH
+  REM
+  REM NOTE: If the Windows SDK library path has already been set, do not set
+  REM       it to something else later on.
+  REM
+  IF NOT DEFINED NSDKLIBPATH (
+    SET SET_NSDKLIBPATH=1
+  )
+
+  REM
+  REM NOTE: If the Universal CRT library path has already been set, do not set
+  REM       it to something else later on.
+  REM
+  IF NOT DEFINED NUCRTLIBPATH (
+    SET SET_NUCRTLIBPATH=1
+  )
 )
 
 REM
@@ -294,6 +320,7 @@ FOR %%P IN (%PLATFORMS%) DO (
     CALL :fn_UnsetVariable LIB
     CALL :fn_UnsetVariable LIBPATH
     CALL :fn_UnsetVariable Platform
+    CALL :fn_UnsetVariable UniversalCRTSdkDir
     REM CALL :fn_UnsetVariable VCINSTALLDIR
     CALL :fn_UnsetVariable VSINSTALLDIR
     CALL :fn_UnsetVariable WindowsPhoneKitDir
@@ -385,8 +412,8 @@ FOR %%P IN (%PLATFORMS%) DO (
         )
 
         REM
-        REM NOTE: When using MSVC 2012 and/or 2013, the native SDK path cannot
+        REM NOTE: When using MSVC 2012, 2013, or 2015, the native SDK path
-        REM       simply use the "lib" sub-directory beneath the location
+        REM       cannot simply be 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
@@ -405,19 +432,37 @@ FOR %%P IN (%PLATFORMS%) DO (
             CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH
 
             REM
-            REM NOTE: The Windows 8.1 SDK has a slightly different directory
+            REM NOTE: The Windows 8.x and Windows 10 SDKs have a slightly
-            REM       naming convention.
+            REM       different directory naming conventions.
             REM
-            IF DEFINED USE_WINV63_NSDKLIBPATH (
+            IF DEFINED USE_WINV100_NSDKLIBPATH (
+              CALL :fn_AppendVariable NSDKLIBPATH \..\10\lib\10.0.10030.0\um\x86
+            ) ELSE IF DEFINED USE_WINV63_NSDKLIBPATH (
               CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86
             ) ELSE IF "%VisualStudioVersion%" == "12.0" (
               CALL :fn_AppendVariable NSDKLIBPATH \..\8.0\lib\win8\um\x86
+            ) ELSE IF "%VisualStudioVersion%" == "14.0" (
+              CALL :fn_AppendVariable NSDKLIBPATH \..\8.0\lib\win8\um\x86
             ) ELSE (
               CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86
             )
           )
         )
 
+        REM
+        REM NOTE: When using MSVC 2015, setting the Universal CRT library path
+        REM       for x86 may be required as well.  This must also be done for
+        REM       each iteration because it relies upon the UniversalCRTSdkDir
+        REM       environment variable being set by the batch file used to
+        REM       setup the MSVC environment.
+        REM
+        IF DEFINED SET_NUCRTLIBPATH (
+          IF DEFINED UniversalCRTSdkDir (
+            CALL :fn_CopyVariable UniversalCRTSdkDir NUCRTLIBPATH
+            CALL :fn_AppendVariable NUCRTLIBPATH \lib\winv10.0\ucrt\x86
+          )
+        )
+
         REM
         REM NOTE: Unless prevented from doing so, invoke NMAKE with the MSVC
         REM       makefile to clean any stale build output from previous