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 1/7] 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


From 9894742beb7633046581777862e62f2ae9e63fdf Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Thu, 20 Jun 2013 19:07:58 +0000
Subject: [PATCH 2/7] Use the target platorm version in the VS props file as
 well.

FossilOrigin-Name: ce5a8cc1cf663546ebdce08bef7d957ed4d341c6
---
 manifest             |  15 ++++++---------
 manifest.uuid        |   2 +-
 tool/win/sqlite.vsix | Bin 32819 -> 32825 bytes
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 1d5979a7b6..ddd91a5c6e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C VSIX\stooling\schanges\sto\ssupport\sVisual\sStudio\s2013.
-D 2013-06-20T18:53:33.003
+C Use\sthe\starget\splatorm\sversion\sin\sthe\sVS\sprops\sfile\sas\swell.
+D 2013-06-20T19:07:58.086
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1092,11 +1092,8 @@ 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 ff59777ec70801730169ae1b576f4fd0f320c30a
-P b674462243138fcee192ef05d434665e30c681c4
-R c7ac56de3bf31222ff450ec13703ae2c
-T *branch * vsix2013
-T *sym-vsix2013 *
-T -sym-trunk *
+F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
+P c5954c58c043fed24471fa184048e4ea0b5ba1d6
+R 7752ef9980936689becf7e3beb7b8742
 U mistachkin
-Z 23c3e117a2a1cdf9be8d5e81d565dca9
+Z 3aee8dea98fb53abe6ab78ab5ec0f41a
diff --git a/manifest.uuid b/manifest.uuid
index 5172b8e972..5e6ac03230 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c5954c58c043fed24471fa184048e4ea0b5ba1d6
\ No newline at end of file
+ce5a8cc1cf663546ebdce08bef7d957ed4d341c6
\ No newline at end of file
diff --git a/tool/win/sqlite.vsix b/tool/win/sqlite.vsix
index 99c7f35f4e19a2df1aa08392fc86089bba993eca..ac4afb3f4bc2aa7c4419376732e5a7b3910d1070 100644
GIT binary patch
delta 560
zcmV-00?+-kfC9OI0+6*4=U~)A;p3DiwE+MChXeosG?9TSk?;+F#Z*me+dvS#7y2KB
zaB&2!)@?4OkrYbQme3N69eUc!S{g}P?}xfOa&1EYdsZ7cc0kD`gxqHK&CYvocBJHd
zD@CvYW4Tso_%WV^0jNTkT-9mVVfEp2c%Hp|lgy3&0|f@IT-h{i5Zf<=*rEZ+Y%F<U
zwAB^Hg_fj*4G7(Tf+5nbIxb4`X*N3zU7H|qjd}!kKaB2Lf7BncV$Eu}(5m8fXBav)
zfy+vcUe}aPP9A{KG)U86It{ZNR$ZNtu@2Ae?pwbs#R3E{3yx#~$hdfd#X-lTdt#cG
zst{cXbB0akc)uGa;h#3^W&U%aHAa-i@#F@!XxOq`_htWoDV^LPGd18`Fs!tZzwdU!
zA>XzLs*l}$+ZWnK8@zH&{k6?~VGfqp>Y7WS^g>Ii)dLrlUP0$L#hDXzq%lg!QMNbn
zi?0kbyH_>gc*mY2^2na!+A~JIsX_B#YRC?z4$rl005Ipa6>QgQ$d2{A4-R?~^4OKf
zcj6L3=1_4w<#*2mhoP#qkA3#FyjxEua%e%7?!)I`Gy7L?gwt5?)!Dm~@giq$9N06F
zfvOM31tnzor?~hQP)h>@li__Bv&aIOdJX4b)I#Colqa<T004)RZhch;i?i8Y>21!F
y%6&TlvXcgWX8|jdZhlz-Xp_i(TmdeVC4XE30eX{ze_sI(ljDC%1{8b%0000%Fbp67

delta 551
zcmV+?0@(ezfC96C0+6*4K!;aB{6X)(uK@r6UjzUEG?9TSk?;+Fy;Mz4+dvS#SL%OQ
zS*e1h)|-|KDz;ID+X{gYN;vLiV~_16`(bv+Ara!gvo=NvlHr2jHnVU1-kaI+#wQyk
z$r`K^Mkm3~XciFAxhaIMlAy)%$5C*Se*F?(S#tw95?`)e64Z#zZ%SQWgW@hyBDcnw
z5~JKGTEH5lX~0r{<(93G1^qRf9R{9;5Kq)0xczTU+w@1>A<tL5f>WbQQMHz%cSC$u
z2<&}L+2r5_7*0u&km)o?Gg!7&Ovf1B%idFeti&87a0gyw4#<UkL&Zb;qkChTXF8W{
z0aqOB)a(AUT)~~Ot3`G`HwHt-qG)mt8?<~;th%xX#@0uF(TuUb8wB0$g0FRqP3~Q7
zEM9tohb|iy#m5;qQR!=;fU#4fl+iC7Gj<8B=a<Lcz@DElrhD15;R~^}+-^V3u-6zH
zbNGZvj-|2cn%fF6>>3#S4Gj$0u7TY(ENTGEgli<<b{^7wKi|pDPfTC?<n_BgLr@u%
zLian>1G@n->Qx{2*`MNR?YPXK0bTeXT7XO4trQ4{krd10ZwKQ=zP)kaS&0r(T{vzi
zro&s|<43cy0=0S#K!;aB{6X)(uK@r6Uz2owRR<r5!#aAg&6Ci5I|8f%lg<JdlO=vm
p0VR`kepvxxlg@rz0VtCze_R6ld6S8MUjYb{>3>QF4txLr004C813CZz


From 463f348f2ca660446da64b9abe842da22f59e432 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Fri, 21 Jun 2013 07:54:39 +0000
Subject: [PATCH 3/7] Update comments and package flavor error message.

FossilOrigin-Name: 9d1b96182af08a73de9dd0327965b96a6d48ac11
---
 manifest        | 12 ++++++------
 manifest.uuid   |  2 +-
 tool/mkvsix.tcl | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index ddd91a5c6e..dd4ae69898 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\starget\splatorm\sversion\sin\sthe\sVS\sprops\sfile\sas\swell.
-D 2013-06-20T19:07:58.086
+C Update\scomments\sand\spackage\sflavor\serror\smessage.
+D 2013-06-21T07:54:39.197
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -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 b28d7e1dbce2e69ff2cf2043ff363b08939f3178
+F tool/mkvsix.tcl f3312df26fd9938a27fa0a845ec96bea84b0c16b
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
 F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P c5954c58c043fed24471fa184048e4ea0b5ba1d6
-R 7752ef9980936689becf7e3beb7b8742
+P ce5a8cc1cf663546ebdce08bef7d957ed4d341c6
+R 94b717d64d889391ffc6225632038588
 U mistachkin
-Z 3aee8dea98fb53abe6ab78ab5ec0f41a
+Z 99783f3b22c024a372aa90c126538916
diff --git a/manifest.uuid b/manifest.uuid
index 5e6ac03230..64464643dd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ce5a8cc1cf663546ebdce08bef7d957ed4d341c6
\ No newline at end of file
+9d1b96182af08a73de9dd0327965b96a6d48ac11
\ No newline at end of file
diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
index 2de4d77bae..77ec4b15c6 100644
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@ -65,12 +65,12 @@
 # argument is optional and if present must contain the name of the directory
 # containing the root of the source tree for SQLite.  The third argument is
 # optional and if present must contain the flavor the VSIX package to build.
-# Currently, the only supported package flavors are "WinRT" and "WP80".  The
-# fourth argument is optional and if present must be a string containing a list
-# of platforms to include in the VSIX package.  The format of the platform list
-# string is "platform1,platform2,platform3".  Typically, when on Windows, this
-# script is executed using commands similar to the following from a normal
-# Windows command prompt:
+# Currently, the only supported package flavors are "WinRT", "WinRT81", and
+# "WP80".  The fourth argument is optional and if present must be a string
+# containing a list of platforms to include in the VSIX package.  The format
+# of the platform list string is "platform1,platform2,platform3".  Typically,
+# when on Windows, this script is executed using commands similar to the
+# following from a normal Windows command prompt:
 #
 #                         CD /D C:\dev\sqlite\core
 #                         tclsh85 tool\mkvsix.tcl C:\Temp
@@ -280,7 +280,7 @@ if {[string equal -nocase $packageFlavor WinRT]} then {
   set extraSdkPath "\\..\\$targetPlatformIdentifier"
   set extraFileListAttributes ""
 } else {
-  fail "unsupported package flavor, must be \"WinRT\" or \"WP80\""
+  fail "unsupported package flavor, must be \"WinRT\", \"WinRT81\", or \"WP80\""
 }
 
 if {$argc >= 4} then {

From da5b1cd4464caa8433a82084dbfd19e0329c0e2a Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Wed, 10 Jul 2013 19:39:02 +0000
Subject: [PATCH 4/7] More changes to support MSVC 18.

FossilOrigin-Name: 29c458e2c21f7c8db727fe8dbd4d154918b53a4e
---
 Makefile.msc  |  9 +++++++++
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 206f1680d4..95dc01cb69 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -445,6 +445,15 @@ LTLIBOPTS = /MACHINE:$(PLATFORM)
 #
 !IF $(FOR_WINRT)!=0
 LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
+!IF $(_MSC_VER)==1800
+!IF "$(PLATFORM)"=="x86"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store"
+!ELSEIF "$(PLATFORM)"=="x64"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\amd64"
+!ELSEIF "$(PLATFORM)"=="arm"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\arm"
+!ENDIF
+!ENDIF
 !ENDIF
 
 # If either debugging or symbols are enabled, enable PDBs.
diff --git a/manifest b/manifest
index dd4ae69898..1685f222b7 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Update\scomments\sand\spackage\sflavor\serror\smessage.
-D 2013-06-21T07:54:39.197
+C More\schanges\sto\ssupport\sMSVC\s18.
+D 2013-07-10T19:39:02.664
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
+F Makefile.msc 751c3d495c159a15e46a35e523e02f5ae1dffeeb
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P ce5a8cc1cf663546ebdce08bef7d957ed4d341c6
-R 94b717d64d889391ffc6225632038588
+P 9d1b96182af08a73de9dd0327965b96a6d48ac11
+R dce12cbb8dc011a7157a4fc9c756a0b9
 U mistachkin
-Z 99783f3b22c024a372aa90c126538916
+Z b25307feb6067015ecfaf839e3826c1b
diff --git a/manifest.uuid b/manifest.uuid
index 64464643dd..d8a4992d74 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d1b96182af08a73de9dd0327965b96a6d48ac11
\ No newline at end of file
+29c458e2c21f7c8db727fe8dbd4d154918b53a4e
\ No newline at end of file

From 6cdc63d4e395009af781353d05896e1599499d51 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Wed, 10 Jul 2013 19:53:49 +0000
Subject: [PATCH 5/7] Use the VisualStudioVersion variable instead of _MSC_VER.

FossilOrigin-Name: 603e9db817d457e59e329ad55ac3f1e567759b32
---
 Makefile.msc  |  2 +-
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 95dc01cb69..9b0b17732e 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -445,7 +445,7 @@ LTLIBOPTS = /MACHINE:$(PLATFORM)
 #
 !IF $(FOR_WINRT)!=0
 LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
-!IF $(_MSC_VER)==1800
+!IF "$(VisualStudioVersion)"=="12.0"
 !IF "$(PLATFORM)"=="x86"
 LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store"
 !ELSEIF "$(PLATFORM)"=="x64"
diff --git a/manifest b/manifest
index 1685f222b7..815508a92f 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C More\schanges\sto\ssupport\sMSVC\s18.
-D 2013-07-10T19:39:02.664
+C Use\sthe\sVisualStudioVersion\svariable\sinstead\sof\s_MSC_VER.
+D 2013-07-10T19:53:49.176
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 751c3d495c159a15e46a35e523e02f5ae1dffeeb
+F Makefile.msc 2c391a8c3e3e941df2670499225e56a2665b6743
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 9d1b96182af08a73de9dd0327965b96a6d48ac11
-R dce12cbb8dc011a7157a4fc9c756a0b9
+P 29c458e2c21f7c8db727fe8dbd4d154918b53a4e
+R 1fc16d780ab429b1ac8777f58708e855
 U mistachkin
-Z b25307feb6067015ecfaf839e3826c1b
+Z c5cda1e51e4d22d5432eaa97bb145bf4
diff --git a/manifest.uuid b/manifest.uuid
index d8a4992d74..65cf1538bc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29c458e2c21f7c8db727fe8dbd4d154918b53a4e
\ No newline at end of file
+603e9db817d457e59e329ad55ac3f1e567759b32
\ No newline at end of file

From 4eaa1295c9408fe4eb15ffd898a85b071dba7935 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Wed, 10 Jul 2013 21:33:25 +0000
Subject: [PATCH 6/7] More corrects to VS 2013 integration.

FossilOrigin-Name: 7a8b0e362b529d54231453046f22e90e651ecdc5
---
 Makefile.msc  | 10 ++++++----
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 9b0b17732e..8e77e14a76 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -447,11 +447,13 @@ LTLIBOPTS = /MACHINE:$(PLATFORM)
 LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
 !IF "$(VisualStudioVersion)"=="12.0"
 !IF "$(PLATFORM)"=="x86"
-LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store"
 !ELSEIF "$(PLATFORM)"=="x64"
-LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\amd64"
-!ELSEIF "$(PLATFORM)"=="arm"
-LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\arm"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store\amd64"
+!ELSEIF "$(PLATFORM)"=="ARM"
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store\arm"
+!ELSE
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store"
 !ENDIF
 !ENDIF
 !ENDIF
diff --git a/manifest b/manifest
index 815508a92f..1183d08667 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Use\sthe\sVisualStudioVersion\svariable\sinstead\sof\s_MSC_VER.
-D 2013-07-10T19:53:49.176
+C More\scorrects\sto\sVS\s2013\sintegration.
+D 2013-07-10T21:33:25.856
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 2c391a8c3e3e941df2670499225e56a2665b6743
+F Makefile.msc d45c66f73ed79474d5c3df44a48a9f06cdfd942f
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 29c458e2c21f7c8db727fe8dbd4d154918b53a4e
-R 1fc16d780ab429b1ac8777f58708e855
+P 603e9db817d457e59e329ad55ac3f1e567759b32
+R f9815c19281fc25d64f0e7d7244efa66
 U mistachkin
-Z c5cda1e51e4d22d5432eaa97bb145bf4
+Z fdae0f9dfe136531de23272d34a5b71e
diff --git a/manifest.uuid b/manifest.uuid
index 65cf1538bc..30c1bd2520 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-603e9db817d457e59e329ad55ac3f1e567759b32
\ No newline at end of file
+7a8b0e362b529d54231453046f22e90e651ecdc5
\ No newline at end of file

From 60bdad7f54afcab0c0ae61c3be432c5c9427ef5c Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Thu, 11 Jul 2013 03:09:45 +0000
Subject: [PATCH 7/7] Environment variable names in nmake must be in all
 uppercase.

FossilOrigin-Name: 0328e873f2f98ac0aed93ec07ba7e14228cc10e0
---
 Makefile.msc  |  2 +-
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 8e77e14a76..f2aa94644c 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -445,7 +445,7 @@ LTLIBOPTS = /MACHINE:$(PLATFORM)
 #
 !IF $(FOR_WINRT)!=0
 LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
-!IF "$(VisualStudioVersion)"=="12.0"
+!IF "$(VISUALSTUDIOVERSION)"=="12.0"
 !IF "$(PLATFORM)"=="x86"
 LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store"
 !ELSEIF "$(PLATFORM)"=="x64"
diff --git a/manifest b/manifest
index 1183d08667..3f096864ca 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C More\scorrects\sto\sVS\s2013\sintegration.
-D 2013-07-10T21:33:25.856
+C Environment\svariable\snames\sin\snmake\smust\sbe\sin\sall\suppercase.
+D 2013-07-11T03:09:45.896
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc d45c66f73ed79474d5c3df44a48a9f06cdfd942f
+F Makefile.msc 1b432129f87a6a4258f9b9e01ba5ccda0b19851a
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 603e9db817d457e59e329ad55ac3f1e567759b32
-R f9815c19281fc25d64f0e7d7244efa66
+P 7a8b0e362b529d54231453046f22e90e651ecdc5
+R ff249db1b0f16f46ad7ee4ebeeb16b40
 U mistachkin
-Z fdae0f9dfe136531de23272d34a5b71e
+Z 80027817d1c05a21c407e2d8f86e9a15
diff --git a/manifest.uuid b/manifest.uuid
index 30c1bd2520..aaeecb4f34 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a8b0e362b529d54231453046f22e90e651ecdc5
\ No newline at end of file
+0328e873f2f98ac0aed93ec07ba7e14228cc10e0
\ No newline at end of file