From 00b638bb6f2e0fb2bdcff933111d46139ede35bd Mon Sep 17 00:00:00 2001 From: mistachkin Date: Fri, 18 Apr 2014 00:08:13 +0000 Subject: [PATCH] Preliminary changes to support building VSIX packages for Windows Phone 8.1. FossilOrigin-Name: a1b2f28ba85b043df68875f5d3446140db4f2cb0 --- manifest | 19 +++++++++++-------- manifest.uuid | 2 +- tool/mkvsix.tcl | 25 ++++++++++++++++++++----- tool/win/sqlite.vsix | Bin 32825 -> 32820 bytes 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index a1452995b3..eea66b0d82 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sSQLITE_TESTCTRL_BYTEORDER\stest\scontrol\sto\sinterrogate\sSQLite's\snotion\nof\sthe\sprocessor\sbyte\sorder\sand\swhether\sthe\sbyte\sorder\sis\sknown\sat\scompile-time\nor\sdetermined\sat\srun-time. -D 2014-04-18T00:06:02.110 +C Preliminary\schanges\sto\ssupport\sbuilding\sVSIX\spackages\sfor\sWindows\sPhone\s8.1. +D 2014-04-18T00:08:13.436 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 6477fb9dab838b7eea1eed50658ff1cda04850b5 +F tool/mkvsix.tcl df937e1fadbd98995c701002b2a4b0187a04f6ff F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c @@ -1159,8 +1159,11 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891 F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 -F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P c6fa8d0d82805be230f672eabccdfa5680d4ddfd -R f2d9932522491a86ed313bf5e3a1693d -U drh -Z 4f6d25a564bc084e4d5fbc71ec75b6b1 +F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e +P 9c6961967ae00e563ebe2859eaf2639a79f2cb01 +R cd982f22bbf931205d39222b6f2ba26d +T *branch * vsixWinPhone81 +T *sym-vsixWinPhone81 * +T -sym-trunk * +U mistachkin +Z 0f515f990cd1ad75013b0794d9a0c168 diff --git a/manifest.uuid b/manifest.uuid index c03388d6de..f9d51641f8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9c6961967ae00e563ebe2859eaf2639a79f2cb01 \ No newline at end of file +a1b2f28ba85b043df68875f5d3446140db4f2cb0 \ No newline at end of file diff --git a/tool/mkvsix.tcl b/tool/mkvsix.tcl index 65fa731245..3268efdee7 100644 --- a/tool/mkvsix.tcl +++ b/tool/mkvsix.tcl @@ -256,7 +256,8 @@ if {[string equal -nocase $packageFlavor WinRT]} then { set displayName "SQLite for Windows Runtime" set targetPlatformIdentifier Windows set targetPlatformVersion v8.0 - set minVsVersion 11.0 + set minVsVersion [appendArgs \ + "\r\n " {MinVSVersion="11.0"}] set extraSdkPath "" set extraFileListAttributes [appendArgs \ "\r\n " {AppliesTo="WindowsAppContainer"} \ @@ -266,7 +267,8 @@ if {[string equal -nocase $packageFlavor WinRT]} then { set displayName "SQLite for Windows Runtime (Windows 8.1)" set targetPlatformIdentifier Windows set targetPlatformVersion v8.1 - set minVsVersion 12.0 + set minVsVersion [appendArgs \ + "\r\n " {MinVSVersion="12.0"}] set extraSdkPath "" set extraFileListAttributes [appendArgs \ "\r\n " {AppliesTo="WindowsAppContainer"} \ @@ -276,7 +278,17 @@ if {[string equal -nocase $packageFlavor WinRT]} then { set displayName "SQLite for Windows Phone" set targetPlatformIdentifier "Windows Phone" set targetPlatformVersion v8.0 - set minVsVersion 11.0 + set minVsVersion [appendArgs \ + "\r\n " {MinVSVersion="11.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" + set targetPlatformIdentifier "WindowsPhoneApp" + set targetPlatformVersion v8.1 + set minVsVersion [appendArgs \ + "\r\n " {MinVSVersion="12.0"}] set extraSdkPath "\\..\\$targetPlatformIdentifier" set extraFileListAttributes "" } elseif {[string equal -nocase $packageFlavor Win32]} then { @@ -284,13 +296,16 @@ if {[string equal -nocase $packageFlavor WinRT]} then { set displayName "SQLite for Windows" set targetPlatformIdentifier Windows set targetPlatformVersion v8.0 - set minVsVersion 11.0 + set minVsVersion [appendArgs \ + "\r\n " {MinVSVersion="11.0"}] set extraSdkPath "" set extraFileListAttributes [appendArgs \ "\r\n " {AppliesTo="VisualC"} \ "\r\n " {DependsOn="Microsoft.VCLibs, version=11.0"}] } else { - fail "unsupported package flavor, must be one of: WinRT WinRT81 WP80 Win32" + fail [appendArgs \ + "unsupported package flavor, must be one of: " \ + "WinRT WinRT81 WP80 WP81 Win32"] } if {$argc >= 4} then { diff --git a/tool/win/sqlite.vsix b/tool/win/sqlite.vsix index ac4afb3f4bc2aa7c4419376732e5a7b3910d1070..de4d0a1f96ad3b53b899a7bcfbba53f23a1d4990 100644 GIT binary patch delta 313 zc-q_9z_g`-X#;mvJwwApm)J!YpWS9)U@&K7VBiPR!7kpuiFui6sl_FF6}dT~6a2jo zI|v+o-&)t6dh)7E{-WNc3s?_!DSTNZmt>Ub_HDlL=4C;j?%owz{q~OBpL=`Ejc4bt z4UBi_xi|HflKpkAn77g;vxD3-&+BcSb>ByQv#L~u!?c$!OLw~R)i3*1w?=1*)os)N zMHiGmy6o%Rs-xZgtpD-3$uhy({sr%&;$Qix#E81y|87|?C33!Dt$*s(*I&Nx89jwAp8 delta 327 zc-jF+0l5COfC9OI0OuO<`_nW@U49E_iKh zRgg_f!$1&*?}h${W$D#KZ=zjGK?{Nvq0ozZh{>cG*)L~jO-1tG-H^t%dwbxSecze+ zVsEtg1`6n`l2_TK6ktnNq1`DNxxToTVsST}%vY%42?I|jBE5SIe_j_q&xHXcXTQ}E zJ2@CHTmsxYYkz0f$~Q)}%A9&PQEY?%E`p0{nAg)fZ^nWJ4kYG}8c?a;FS$0QC1 z?h?bEsTdnBnF&84L+FO-P4qtHhIQ18Uc+H9DEUC-NS;|xEval$e#wy_Ij^4%t(c|# zxOQav_CdVezRUh93HcbB;15ts0|b-5e;BhRdp`sXQ(e?Tdi!qm-~a#sOp|ecFb5W4 ZChz5K&XcHrI{^-px001^@mD~UT -- 2.47.3