Experimental changes to support a Win32 VSIX package flavor.

FossilOrigin-Name: abedd7cb454aab99b62b63ed4fdd70c31ef87b0b

diff --git a/manifest b/manifest
index 6d3e751585675d3dfeb0206227cabf65db50543b..58b0335339e693ae36e80f62f8d361db2eba2bfb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\smulti-process\stester\sintegration\swith\sthe\sWin32\sAPI.
-D 2013-04-11T00:09:44.820
+C Experimental\schanges\sto\ssupport\sa\sWin32\sVSIX\spackage\sflavor.
+D 2013-04-11T00:13:46.757
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3dd3fcb87b70c78d99b2c8a03e44ec86d6ca9ce2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1024,7 +1024,7 @@ F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl a570a0b0847f5659482087f70e409ac45ce93b91
 F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
-F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9
+F tool/mkvsix.tcl 7d6b5c45521f1422bca980f13c08fc0226ecd8aa
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
 F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -1049,8 +1049,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 be7d2c5482c41baf000d7fb5dccc31b974e91064
-R 255ee63faf4906e3f01e118bd1c7af53
+F tool/win/sqlite.vsix 1cf37bf79e04fc4030f7a5acf1de64d6162e9a23
+P 0fdc743583c67a3a017b9ad812c62a5104b9aee7
+R f5ec6eca1c57a0969247b9c441fad8c1
+T *branch * vsixWin32
+T *sym-vsixWin32 *
+T -sym-trunk *
 U mistachkin
-Z 56dc3349791505b3e20ff09949e0bcd7
+Z 6f9112a4a88191e1094322a991d7d8e6

diff --git a/manifest.uuid b/manifest.uuid
index 557333d3d0e7a47b9e120b2a5ccda3cbe902b570..79c87cb33028a1d88b68b728fd2706e9f6e4950a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0fdc743583c67a3a017b9ad812c62a5104b9aee7
\ No newline at end of file
+abedd7cb454aab99b62b63ed4fdd70c31ef87b0b
\ No newline at end of file

diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
index e9f1f818daedeba0d299e3911a425de910535ab5..48602a308ee871e9221753334069581759c9e45a 100644 (file)
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@ -255,6 +255,7 @@ 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 extraSdkPath ""
   set extraFileListAttributes [appendArgs \
       "\r\n    " {AppliesTo="WindowsAppContainer"} \
@@ -263,10 +264,19 @@ if {[string equal -nocase $packageFlavor WinRT]} then {
   set shortName SQLite.WP80
   set displayName "SQLite for Windows Phone"
   set targetPlatformIdentifier "Windows Phone"
+  set targetPlatformVersion v8.0
   set extraSdkPath "\\..\\$targetPlatformIdentifier"
   set extraFileListAttributes ""
+} elseif {[string equal -nocase $packageFlavor Win32]} then {
+  set shortName SQLite.Win32
+  set displayName "SQLite for Windows"
+  set targetPlatformIdentifier Windows
+  set targetPlatformVersion v8.0
+  set extraSdkPath ""
+  set extraFileListAttributes [appendArgs \
+      "\r\n    " {AppliesTo="VisualC"}]
 } else {
-  fail "unsupported package flavor, must be \"WinRT\" or \"WP80\""
+  fail "unsupported package flavor, must be \"WinRT\", \"WP80\", or \"Win32\""
 }
 
 if {$argc >= 4} then {

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