From: mistachkin <mistachkin@noemail.net>
Date: Sat, 12 Oct 2013 02:31:34 +0000 (+0000)
Subject: Permit the creation of VSIX packages for Win32.
X-Git-Tag: version-3.8.1~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ed02a6dcb2f29b60bef4e0b9321db23b85bfe3b;p=thirdparty%2Fsqlite.git

Permit the creation of VSIX packages for Win32.

FossilOrigin-Name: 035d03e94252f31025b39da49d8401933352fb77
---

0ed02a6dcb2f29b60bef4e0b9321db23b85bfe3b
diff --cc manifest
index 888c047bd8,58b0335339..00e6569186
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sUnicode\scharacter\sencoding\sissues\son\sWindows.
- D 2013-10-12T00:56:21.621
 -C Experimental\schanges\sto\ssupport\sa\sWin32\sVSIX\spackage\sflavor.
 -D 2013-04-11T00:13:46.757
++C Permit\sthe\screation\sof\sVSIX\spackages\sfor\sWin32.
++D 2013-10-12T02:31:34.870
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 3dd3fcb87b70c78d99b2c8a03e44ec86d6ca9ce2
 +F Makefile.in e2d28ec95bd17ab4f3b6ee40b7102e9d7a0857b9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc a244e5b5ba2493625db95b4d46b79201ea868bfe
 +F Makefile.msc a08b5f4ed4f760bae4eae4e723371487c5378983
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 -F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
 +F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -1084,19 -1015,16 +1084,19 @@@ F tool/fragck.tcl 5265a95126abcf6ab357f
  F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
  F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
  F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 -F tool/lemon.c 680980c7935bfa1edec20c804c9e5ba4b1dd96f5
 +F tool/lemon.c 796930d5fc2036c7636f3f1ee12f9ae03719a2eb
  F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 +F tool/logest.c 7ad625cac3d54012b27d468b7af6612f78b9ba75
 +F tool/mkautoconfamal.sh f8d8dbf7d62f409ebed5134998bf5b51d7266383
  F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 +F tool/mkpragmatab.tcl ceaaeebcd882864caefe4176592ca6fa4648fab1
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 -F tool/mksqlite3c.tcl a570a0b0847f5659482087f70e409ac45ce93b91
 +F tool/mksqlite3c.tcl d8dc444d403019167260e5578f5c362741f03696
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
- F tool/mkvsix.tcl f3312df26fd9938a27fa0a845ec96bea84b0c16b
 -F tool/mkvsix.tcl 7d6b5c45521f1422bca980f13c08fc0226ecd8aa
++F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1121,9 -1048,12 +1121,9 @@@ F tool/symbols.sh fec58532668296d7c7dc4
  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 1cf37bf79e04fc4030f7a5acf1de64d6162e9a23
 -P 0fdc743583c67a3a017b9ad812c62a5104b9aee7
 -R f5ec6eca1c57a0969247b9c441fad8c1
 -T *branch * vsixWin32
 -T *sym-vsixWin32 *
 -T -sym-trunk *
 +F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 +F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 1be0a3adaba2914c65c46fbebc4906ae4e70f899
- R ca24bf11e504ff21d9315944c9b4b854
++P c9310c9a2bad11f1d033a57b33ea7aed43a8238d abedd7cb454aab99b62b63ed4fdd70c31ef87b0b
++R 070d15876134de221199198e15ca3595
  U mistachkin
- Z ae94ccc0d8018ab65fe4f23e4fae4aa0
 -Z 6f9112a4a88191e1094322a991d7d8e6
++Z 2c05f3c55946fe5fa8d9a3ccbc09acf7
diff --cc manifest.uuid
index d6f3901595,79c87cb330..ad8ea59cef
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c9310c9a2bad11f1d033a57b33ea7aed43a8238d
 -abedd7cb454aab99b62b63ed4fdd70c31ef87b0b
++035d03e94252f31025b39da49d8401933352fb77
diff --cc tool/mkvsix.tcl
index 77ec4b15c6,48602a308e..65fa731245
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@@ -276,11 -265,18 +276,21 @@@ if {[string equal -nocase $packageFlavo
    set displayName "SQLite for Windows Phone"
    set targetPlatformIdentifier "Windows Phone"
    set targetPlatformVersion v8.0
 +  set minVsVersion 11.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 minVsVersion 11.0
+   set extraSdkPath ""
+   set extraFileListAttributes [appendArgs \
 -      "\r\n    " {AppliesTo="VisualC"}]
++      "\r\n    " {AppliesTo="VisualC"} \
++      "\r\n    " {DependsOn="Microsoft.VCLibs, version=11.0"}]
  } else {
-   fail "unsupported package flavor, must be \"WinRT\", \"WinRT81\", or \"WP80\""
 -  fail "unsupported package flavor, must be \"WinRT\", \"WP80\", or \"Win32\""
++  fail "unsupported package flavor, must be one of: WinRT WinRT81 WP80 Win32"
  }
  
  if {$argc >= 4} then {