VSIX tooling changes to support Visual Studio 2013.

FossilOrigin-Name: c5954c58c043fed24471fa184048e4ea0b5ba1d6

diff --git a/manifest b/manifest
index 4b1070228cfd8ab331c0390965caddb0a94c5a43..1d5979a7b64592cacfd9691ca84583e638c6522a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sposix_fallocate()\sfor\sall\ssystems,\sall\sthe\stime,\sunless\sthe\nHAVE_POSIX_FALLOCATE\scompile-time\smacro\sis\ssupplied.
-D 2013-06-20T14:07:37.671
+C VSIX\stooling\schanges\sto\ssupport\sVisual\sStudio\s2013.
+D 2013-06-20T18:53:33.003
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1048,7 +1048,7 @@ F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 209d7ed441f44cc5299e4ebffbef06fd5aabfefd
-F tool/build-all-msvc.bat c55f64ca200308fb5fa5c1ee751ea95a13977b5a x
+F tool/build-all-msvc.bat 38623a30fd58288fda5cc7f7df2682aaab75c9d5 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -1067,7 +1067,7 @@ F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl a61fe62a2895ca6458c463fccf1211ca1c000fcf
 F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
-F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9
+F tool/mkvsix.tcl b28d7e1dbce2e69ff2cf2043ff363b08939f3178
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
 F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -1092,8 +1092,11 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 2b2ade92788be623af6f57e37d98994be2cec142
-R 4c8df645fee7190a620dee659859568b
-U drh
-Z 4cfe85260540c90b4ee0898bd7491d71
+F tool/win/sqlite.vsix ff59777ec70801730169ae1b576f4fd0f320c30a
+P b674462243138fcee192ef05d434665e30c681c4
+R c7ac56de3bf31222ff450ec13703ae2c
+T *branch * vsix2013
+T *sym-vsix2013 *
+T -sym-trunk *
+U mistachkin
+Z 23c3e117a2a1cdf9be8d5e81d565dca9

diff --git a/manifest.uuid b/manifest.uuid
index 225d72de721e817656e494f7c3a49d6e729d77f2..5172b8e97288fc53fd5eba4a3de7bd74d4c59537 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b674462243138fcee192ef05d434665e30c681c4
\ No newline at end of file
+c5954c58c043fed24471fa184048e4ea0b5ba1d6
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index c43343577935d77d07faa26ff2b58e8630fbf5fa..ed05f959fe6294eba746518e0f1190331448023f 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -203,8 +203,8 @@ SET TOOLPATH=%gawk.exe_PATH%;%tclsh85.exe_PATH%
 %_VECHO% ToolPath = '%TOOLPATH%'\r
 \r
 REM\r
-REM NOTE: Check for MSVC 2012 because the Windows SDK directory handling is\r
-REM       slightly different for that version.\r
+REM NOTE: Check for MSVC 2012/2013 because the Windows SDK directory handling\r
+REM       is slightly different for those versions.\r
 REM\r
 IF "%VisualStudioVersion%" == "11.0" (\r
   REM\r
@@ -214,6 +214,14 @@ IF "%VisualStudioVersion%" == "11.0" (
   IF NOT DEFINED NSDKLIBPATH (\r
     SET SET_NSDKLIBPATH=1\r
   )\r
+) ELSE IF "%VisualStudioVersion%" == "12.0" (\r
+  REM\r
+  REM NOTE: If the Windows SDK library path has already been set, do not set\r
+  REM       it to something else later on.\r
+  REM\r
+  IF NOT DEFINED NSDKLIBPATH (\r
+    SET SET_NSDKLIBPATH=1\r
+  )\r
 ) ELSE (\r
   CALL :fn_UnsetVariable SET_NSDKLIBPATH\r
 )\r
@@ -351,7 +359,12 @@ FOR %%P IN (%PLATFORMS%) DO (
             CALL :fn_AppendVariable NSDKLIBPATH \lib\x86\r
           ) ELSE IF DEFINED WindowsSdkDir (\r
             CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH\r
-            CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86\r
+\r
+            IF "%VisualStudioVersion%" == "12.0" (\r
+              CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86\r
+            ) ELSE (\r
+              CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86\r
+            )\r
           )\r
         )\r
 \r

diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
index e9f1f818daedeba0d299e3911a425de910535ab5..2de4d77bae17a6b207ed7a13706da8068bd829fc 100644 (file)
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@ -255,14 +255,28 @@ if {[string equal -nocase $packageFlavor WinRT]} then {
   set shortName SQLite.WinRT
   set displayName "SQLite for Windows Runtime"
   set targetPlatformIdentifier Windows
+  set targetPlatformVersion v8.0
+  set minVsVersion 11.0
   set extraSdkPath ""
   set extraFileListAttributes [appendArgs \
       "\r\n    " {AppliesTo="WindowsAppContainer"} \
       "\r\n    " {DependsOn="Microsoft.VCLibs, version=11.0"}]
+} elseif {[string equal -nocase $packageFlavor WinRT81]} then {
+  set shortName SQLite.WinRT81
+  set displayName "SQLite for Windows Runtime (Windows 8.1)"
+  set targetPlatformIdentifier Windows
+  set targetPlatformVersion v8.1
+  set minVsVersion 12.0
+  set extraSdkPath ""
+  set extraFileListAttributes [appendArgs \
+      "\r\n    " {AppliesTo="WindowsAppContainer"} \
+      "\r\n    " {DependsOn="Microsoft.VCLibs, version=12.0"}]
 } elseif {[string equal -nocase $packageFlavor WP80]} then {
   set shortName SQLite.WP80
   set displayName "SQLite for Windows Phone"
   set targetPlatformIdentifier "Windows Phone"
+  set targetPlatformVersion v8.0
+  set minVsVersion 11.0
   set extraSdkPath "\\..\\$targetPlatformIdentifier"
   set extraFileListAttributes ""
 } else {

diff --git a/tool/win/sqlite.vsix b/tool/win/sqlite.vsix
index 93eefac2dbbd9da8a901fc215cc94629002b5723..99c7f35f4e19a2df1aa08392fc86089bba993eca 100644 (file)
Binary files a/tool/win/sqlite.vsix and b/tool/win/sqlite.vsix differ