Preliminary changes to support building VSIX packages for Windows 8.0 and Windows...

FossilOrigin-Name: 3bf97c811a25babf760f256245c756ed6710f8ba

diff --git a/manifest b/manifest
index eea66b0d827e023937301f1f26f41007f44e9078..df82a686b4a0c474423533c6e65d8e037a0bcc75 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Preliminary\schanges\sto\ssupport\sbuilding\sVSIX\spackages\sfor\sWindows\sPhone\s8.1.
-D 2014-04-18T00:08:13.436
+C Preliminary\schanges\sto\ssupport\sbuilding\sVSIX\spackages\sfor\sWindows\s8.0\sand\sWindows\sPhone\s8.0\susing\sVisual\sStudio\s2013.
+D 2014-04-21T18:00:11.146
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1132,7 +1132,7 @@ F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl ed5b4e9ca8bf209ff401059a16362f37710fd8b8
 F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
-F tool/mkvsix.tcl df937e1fadbd98995c701002b2a4b0187a04f6ff
+F tool/mkvsix.tcl 0d439bb042d0f889210afa91674fe7bf07131d39
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
 F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -1160,10 +1160,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
-P 9c6961967ae00e563ebe2859eaf2639a79f2cb01
-R cd982f22bbf931205d39222b6f2ba26d
-T *branch * vsixWinPhone81
-T *sym-vsixWinPhone81 *
-T -sym-trunk *
+P a1b2f28ba85b043df68875f5d3446140db4f2cb0
+R c68a023e71ddd46ca56f8a556c77ce10
 U mistachkin
-Z 0f515f990cd1ad75013b0794d9a0c168
+Z aa4cbe46e2e91580e28bf4f7ed1db0b0

diff --git a/manifest.uuid b/manifest.uuid
index f9d51641f8b63d2328012eeb16c924eeaf8204d1..0f284be18699e69b4a3e288ac91f266c48e10d50 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a1b2f28ba85b043df68875f5d3446140db4f2cb0
\ No newline at end of file
+3bf97c811a25babf760f256245c756ed6710f8ba
\ No newline at end of file

diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl
index 3268efdee7ca79b4d65f3f7ed550943665d6d3d8..787326f0f1ff6bce16c814ee5551707694053a8e 100644 (file)
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@ -262,6 +262,17 @@ if {[string equal -nocase $packageFlavor WinRT]} then {
   set extraFileListAttributes [appendArgs \
       "\r\n    " {AppliesTo="WindowsAppContainer"} \
       "\r\n    " {DependsOn="Microsoft.VCLibs, version=11.0"}]
+} elseif {[string equal -nocase $packageFlavor WinRT_2013]} then {
+  set shortName SQLite.WinRT.2013
+  set displayName "SQLite for Windows Runtime (2013)"
+  set targetPlatformIdentifier Windows
+  set targetPlatformVersion v8.0
+  set minVsVersion [appendArgs \
+      "\r\n    " {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 WinRT81]} then {
   set shortName SQLite.WinRT81
   set displayName "SQLite for Windows Runtime (Windows 8.1)"
@@ -282,6 +293,15 @@ if {[string equal -nocase $packageFlavor WinRT]} then {
       "\r\n    " {MinVSVersion="11.0"}]
   set extraSdkPath "\\..\\$targetPlatformIdentifier"
   set extraFileListAttributes ""
+} elseif {[string equal -nocase $packageFlavor WP80_2013]} then {
+  set shortName SQLite.WP80.2013
+  set displayName "SQLite for Windows Phone (2013)"
+  set targetPlatformIdentifier "Windows Phone"
+  set targetPlatformVersion v8.0
+  set minVsVersion [appendArgs \
+      "\r\n    " {MinVSVersion="12.0"}]
+  set extraSdkPath "\\..\\$targetPlatformIdentifier"
+  set extraFileListAttributes ""
 } elseif {[string equal -nocase $packageFlavor WP81]} then {
   set shortName SQLite.WP81
   set displayName "SQLite for Windows Phone 8.1"
@@ -305,7 +325,7 @@ if {[string equal -nocase $packageFlavor WinRT]} then {
 } else {
   fail [appendArgs \
       "unsupported package flavor, must be one of: " \
-      "WinRT WinRT81 WP80 WP81 Win32"]
+      "WinRT WinRT_2013 WinRT81 WP80 WP80_2013 WP81 Win32"]
 }
 
 if {$argc >= 4} then {