From: mistachkin <mistachkin@noemail.net>
Date: Sun, 28 Oct 2012 19:35:55 +0000 (+0000)
Subject: Merge VSIX tooling and packaging enhancements to trunk.
X-Git-Tag: version-3.7.15~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecf42d52d84b9f9930136932a75c6ad5b48ba32a;p=thirdparty%2Fsqlite.git

Merge VSIX tooling and packaging enhancements to trunk.

FossilOrigin-Name: 99f27d642fbaba02264a470977cde38c3a526d13
---

ecf42d52d84b9f9930136932a75c6ad5b48ba32a
diff --cc manifest
index 6da9677186,de656b8305..07c8e90ffe
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sa\s32-bit\sinteger\soverflow\sproblem\sthat\scould\scause\san\serror\sin\sa\sCREATE\sINDEX\sstatement\sthat\swrites\smore\sthan\s16GB\sof\sdata.
- D 2012-10-26T19:22:45.500
 -C Translate\sthe\sDebug/Release\sproject\sconfigurations\sto\sthe\sDebug/Retail\sVSIX\spackage\sconfigurations.
 -D 2012-10-24T00:47:59.405
++C Merge\sVSIX\stooling\sand\spackaging\senhancements\sto\strunk.
++D 2012-10-28T19:35:55.072
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
+ F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1d8a5d3cf33b8b8d3247c99367a37af384cc7ebd
+ F Makefile.msc 911b8188f5d67801035a113e063c3023a617525d
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
@@@ -995,7 -995,7 +995,7 @@@ F tool/mksqlite3c-noext.tcl 8bce31074e4
  F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
  F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
- F tool/mkvsix.tcl c5e0d52592fb07a17626cd54e5f71295fb4d1b55
 -F tool/mkvsix.tcl 0c7febb4115fd278ff5764f59bf5111172d78d1b
++F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1020,8 -1020,8 +1020,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P ac1d5d8a553d8ba76a332eed9d563ce7f04a7a37
- R 3459aaea2ca2a903a1c6e2fb4e6f5b42
- U dan
- Z ba6f72d8caf0a404fc1f08cc5da9f7c5
+ F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
 -P 023217ea9eea4fea5d3be7707599c6980d4b76f7
 -R df31fe3fba4c339b050d48573a558d63
++P e24ba5bee4424e99d0859ef652164ae1397a2378 5023a7adcac2022a4a2009183d9d9e0f6b46952b
++R 2f269b564c50576f53b5801166a85a63
+ U mistachkin
 -Z d50bfe888efa984ae49286b522083a84
++Z 36e5e06b13ff5e0a8276b5cdb5553525
diff --cc manifest.uuid
index 124132407c,f84fda97f6..11d958431a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e24ba5bee4424e99d0859ef652164ae1397a2378
 -5023a7adcac2022a4a2009183d9d9e0f6b46952b
++99f27d642fbaba02264a470977cde38c3a526d13
diff --cc tool/mkvsix.tcl
index 750453ab94,dcf195ee0e..e9f1f818da
--- a/tool/mkvsix.tcl
+++ b/tool/mkvsix.tcl
@@@ -247,7 -306,7 +302,8 @@@ if {![file exists $templateFile] || 
  }
  
  set currentDirectory [pwd]
- set outputFile [file join $currentDirectory sqlite-output.vsix]
 -set outputFile [file join $currentDirectory sqlite-$packageFlavor-output.vsix]
++set outputFile [file join $currentDirectory [appendArgs sqlite- \
++    $packageFlavor -output.vsix]]
  
  if {[file exists $outputFile]} then {
    fail [appendArgs "output file \"" $outputFile "\" already exists"]