From 50420545fc572f1ac633d38ed36c90f5be253aca Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Thu, 20 Jun 2013 18:53:33 +0000
Subject: [PATCH] VSIX tooling changes to support Visual Studio 2013.

FossilOrigin-Name: c5954c58c043fed24471fa184048e4ea0b5ba1d6
---
 manifest                |  21 ++++++++++++---------
 manifest.uuid           |   2 +-
 tool/build-all-msvc.bat |  19 ++++++++++++++++---
 tool/mkvsix.tcl         |  14 ++++++++++++++
 tool/win/sqlite.vsix    | Bin 32816 -> 32819 bytes
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/manifest b/manifest
index 4b1070228c..1d5979a7b6 100644
--- 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 225d72de72..5172b8e972 100644
--- 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 c433435779..ed05f959fe 100755
--- 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%'
 
 REM
-REM NOTE: Check for MSVC 2012 because the Windows SDK directory handling is
-REM       slightly different for that version.
+REM NOTE: Check for MSVC 2012/2013 because the Windows SDK directory handling
+REM       is slightly different for those versions.
 REM
 IF "%VisualStudioVersion%" == "11.0" (
   REM
@@ -214,6 +214,14 @@ IF "%VisualStudioVersion%" == "11.0" (
   IF NOT DEFINED NSDKLIBPATH (
     SET SET_NSDKLIBPATH=1
   )
+) ELSE IF "%VisualStudioVersion%" == "12.0" (
+  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
+  )
 ) ELSE (
   CALL :fn_UnsetVariable SET_NSDKLIBPATH
 )
@@ -351,7 +359,12 @@ FOR %%P IN (%PLATFORMS%) DO (
             CALL :fn_AppendVariable NSDKLIBPATH \lib\x86
           ) ELSE IF DEFINED WindowsSdkDir (
             CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH
-            CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86
+
+            IF "%VisualStudioVersion%" == "12.0" (
+              CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86
+            ) ELSE (
+              CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86
+            )
           )
         )
 
diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
index e9f1f818da..2de4d77bae 100644
--- 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
GIT binary patch
delta 977
zcmV;?11|iqfC96C0<g9M4Z>X1LYu9ZYDEG70KSvM0xo|zI0g!ID1tRbwxqih#h}=<
ztyPvhiTPX6cOMnSN!B(OTm1b<k)N`OES_bJV`)@{p5P}sudEp+SLsE1k-)mu#t)N*
zsQV&>FB)v6Pg_+u>up78VOvq+61DBniKSnkM;~!@ae0~KpFaU)V<cHhl3R)8QHh2W
zZD3Rmle2#p-&jZYvc=b=hY#vyJhJjmntH)S4ihxz57PuDi@8?5K{rgM-|rM5+{6-E
zP7E`YZ33c4yHUQ=auWdZvzPK9y=LObws%KgIMoqD=ey*}gM`rSN;(9s=1#f|P$LOc
z+i47_TNl*Td0`DnWw0Eu?6?Vy-Vfj}IvZ@2suzDwhU^0%Cykdy5TphMgK$f8=@HP>
zoFnB559Ra~-Xf7Q^^~L|EN>U8#C$iO)oPXcKbnh9t*b?83!gUB>P);3+IRc|H8SSC
zCG;l}x#*&8EgpYcW#G|wY=py<Abo;gPdl*Vj6KTOIvknGo<PV%@6ZR_sRE71T*rS(
zYs!DbPPyNtg0DsKC+$p~i6Hi-iNmGB)u`pg$-5{-uVYK^J(IQ1V>tuh|6o6gOaxn8
zWO1~~0o{0#T5qQb*IGaDz?m!L7MQ@aupMvgt+sQiBN5(&%%rQ4wj>zu`Sf*7+#p-0
zH{TM7E)({ztZO50DupiagHG69--aD=iat0paKN;D4jlN8jZys}A;s=Gj=PDfYwwZb
zZS@k&HXWXBaU!W1CVcFlpp>7S1H?XICf+<%tosMECI#She^Xu5LVEjd_22*i089Y@
z01p5F08>OuO<`_nW@U49E_iKhRgg_f!$1&*?}h${W$D#KZ=zjGK?{Nvq0ozZh{>cG
z*)L~jO-1tG-H^t%dwbxSecze+VsEtg1`6n`l2_TK6ktnNq1`DNxxToTVsST}%vY%4
z2?I|jBE5SIe_j_q&xHXcXTQ}EJ2@CH<f>TmsxYYkz0f$~Q)}%A9&PQEY?%E`p0{nA
zg)fZ^nWJ4kYG}8c?a;FS$0QC1?h?bEsTdnBnF&84L+FO-P4qtHhIQ18Uc+H9DEUC-
zNS;|xEval$e#wy_Ij^4%t(c|#xOQav_CdVezRUh91^F17;19C}d*1>L!d%oso2{2>
zMFIc-zLW8NHwQZqnM>tu&XX^GI{_t=YkpY)Vw1&wTmdMPB7Z&~Q(e?Tdi!qm-~a#s
zOaTA@4*(<p00000001BW008@we}5ha7GWmu<!#QBq<=dB2$SG{N(K&m00000)qBTF

delta 1007
zcmdnoz_bB~wlVRF`3F0u6s`L1#>Bv|YVu(wy?PTKzXm4Rt_0tSx-a!y4Gqk4v!|;1
zC;bcia#!7T<K)t_N5$&xgPttU>H29LX5y&pUBqL5!YcEN!A>vzOWiDHy_fQ4TsiYL
zT`?vuxLGeZC9l_5b@|Rr7f0=&Wvbd?dBt+IN3I@ynrigx2cyDlf#k*>>yxJ+H<@_f
zJG4VWExlfUo!PYa8y8+*(#-!V)TZjG?5nJo-7;!R&daB9`b_6mjrA>?ac19LPqiJL
zswQ@ZXE<lGxU`ok$F44rW^hZ_Kk8U@_Q=Gw<?7R;Z*FRrdpp^ionzr`(<mlYaj~~z
zJKWfAZs}rrb*?p}a-Q^A4O3BO{pkBGO3&Fow6EdZ78K@P->vwY;l`q}8SIRr6$TvJ
zw>Y>v?D}LG6#sDHoOOqylcw#OWf-;WQJE&U)Z6Eq<JJd%kN&wRI9WSz#+{|6=32u4
z*}uxxtGmj5zGtvgxHG3DaG6m5{+=rzUPR@$9G;?3+ce+5dc)%$*;7X%q+VZ|<8Z>|
z`32THC+BQgJhAKl6!SUtoqIRkUvekD`^)?-S3}jBZp>UZEo{=Y$H(-~t>|_7VzsU0
zUh$ec8q<s!{>y(^e8OeJQCBhd*)kWlCWmC1`|b#Pb&&r~aqHVjLNlH&`zl?%`V3R3
z%Awg4EN^vHxHoy8U#>6xjkoIcn`hZf7gJyT^-i9BVs_9Z-aik7w_V?!XuCYjaz4}I
z^rOW$zSqy(9=zY%Ze#x69iLY0D(kbj=c9hG=JutRWy?-{HTZb^-A>QHpNkq^2&X+d
zyZK3JJ>zCo)(0i^uACu`dK;4*?=UbhI5ILY@B`^!7jNIhyv(%J;u5`z+?>z}j^2kI
z1X|y>{%cQtan&V%QSZ_PtOvUSUbxyGNx9UMQ+DlUWbnj)<=d}>SZ`;)Kl^*yvdy{a
zXVtwF%2;Dko+n%gjhTE~L}07sZWiO+lKsoLH~nyMJgz+X*|etm?N6^K-%Mnj{Qj5!
zy9W+7oYyyAa=kgxwrFAM#s60(vA&Nz%(`XOKdtk>_nkk~u6nd5buz!i&aYXuIWx1C
zrS1sTY>z4qUATRPL>c>Ot*ZHl4jDzM=6}2{%e6x|u~C@o_0Eu7uC*pyYR`VoJvr0U
z%1e4$UcBXu>950Y>{pU^n*4*6F~FOdW%9myiOnk2htc!bms)dn2K!grq}H9CY*c5>
zs5UvTE|M{M@`<__M$O5p^>!|p!KVTYKoC#>;y;xbfyo7yU|?WmkYG5#s2Vg2X!P=W
QYev?|kL$hIxNAUK0b~Zrvj6}9