Move Makefile.min.msc into the autoconf subdir where it belongs and change

its name to Makefile.msc.  Adjust build scripts accordingly.

FossilOrigin-Name: 12eb8db79697ef55228c78011d275f36f58271e1

diff --git a/Makefile.min.msc b/autoconf/Makefile.msc
similarity index 99%
rename from Makefile.min.msc
rename to autoconf/Makefile.msc
index e2187efad3cb3eb661b8e711920fb269b20b8138..fce62b2b8ac764c279017125993bb9836f41d4fe 100644 (file)
--- a/Makefile.min.msc
+++ b/autoconf/Makefile.msc
@@ -1,7 +1,8 @@
 #### DO NOT EDIT ####
 # This makefile is automatically generated from the Makefile.msc at
-# the root of the canonical SQLite source tree using the
-# tool/mkmsvcmin.tcl script.
+# the root of the canonical SQLite source tree (not the
+# amalgamation tarball) using the tool/mkmsvcmin.tcl
+# script.
 #
 
 #

diff --git a/manifest b/manifest
index 2076ff35e1fc66dcd081c9ae4b2c0e31cd7fd8f4..9a914fa3d32bf5b68ca5cfc454f61db9c239671a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,7 @@
-C Minor\scoding\sstyle\stweaks\sfor\sthe\smkmsvcmin\stool.
-D 2016-01-23T20:16:40.624
+C Move\sMakefile.min.msc\sinto\sthe\sautoconf\ssubdir\swhere\sit\sbelongs\sand\schange\nits\sname\sto\sMakefile.msc.\s\sAdjust\sbuild\sscripts\saccordingly.
+D 2016-01-23T20:34:27.088
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.min.msc cbbc5e37bfe74583cce7c2585319620b7516e6ed
 F Makefile.msc 6fca5455aaecbd14479f33f091aa19df2d3d2969
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
@@ -12,6 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 1c1657650775960804945dc392e14d9e43c5ed84
+F autoconf/Makefile.msc 68ed752a809b611d97b95d8572a34fe6fd1196f1 w Makefile.min.msc
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt c9265657b6ca8c4de1e148e8c0c4c29d60ec860c
 F autoconf/configure.ac 7b1ea0dcaf49fafba262ce4b0ee8cb3281b555d1
@@ -1377,9 +1377,9 @@ F tool/lemon.c 799e73e19a33b8dd7767a7fa34618ed2a9c2397d
 F tool/lempar.c 3ec1463a034b37d87d782be5f6b8b10a3b1ecbe7
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
-F tool/mkautoconfamal.sh add1d703074e7edb2d8423441c7e245271c5c8cb
+F tool/mkautoconfamal.sh a29b14d54302b33fd892958f6895582ea90e4a45
 F tool/mkkeywordhash.c 06ec0b78bd4fa68c12d90ef2bdfe76b039133ff8
-F tool/mkmsvcmin.tcl c1f92b52505fe4a026e7b57fffe49b439b11b71b
+F tool/mkmsvcmin.tcl 93167a9e73383465b5716aa8dfa407409fccef1d
 F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
 F tool/mkopcodeh.tcl e04177031532b7aa9379ded50e820231ac4abd6e
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@ -1421,7 +1421,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e420f3dc93a0e3364f0773950b7a125f5221a109
-R 0e64448b1af0ccd7100284f6f222657e
-U mistachkin
-Z 38e3fbc9582e760d49d364916a96f186
+P c15e0fc4be08b92547bea1f1cac65581ef497409
+R ffa1a98b2b7806021300568489ac1126
+U drh
+Z ba6195ff75ad05f3ae39571f4a1714e5

diff --git a/manifest.uuid b/manifest.uuid
index 6bcba645b0d4baa62e64b6dbe8159f200988e086..e3e08e4e7c2131850fa6ef258cb2bb36447f1fdc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c15e0fc4be08b92547bea1f1cac65581ef497409
\ No newline at end of file
+12eb8db79697ef55228c78011d275f36f58271e1
\ No newline at end of file

diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index d368cd226bdf035b13a60a903d5a713c094e322e..6081a7b0ec306df28e18130fe22c878796680583 100644 (file)
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -41,7 +41,6 @@ cp sqlite3ext.h           $TMPSPACE
 cp $TOP/sqlite3.1         $TMPSPACE
 cp $TOP/sqlite3.pc.in     $TMPSPACE
 cp $TOP/src/shell.c       $TMPSPACE
-cp $TOP/Makefile.min.msc  $TMPSPACE/Makefile.msc
 cp $TOP/src/sqlite3.rc    $TMPSPACE
 
 cat $TMPSPACE/configure.ac |

diff --git a/tool/mkmsvcmin.tcl b/tool/mkmsvcmin.tcl
index d0143ddd868584502abf795685ad1e50090ee05a..de01490c978817019918d8bca8956a924637fa3b 100644 (file)
--- a/tool/mkmsvcmin.tcl
+++ b/tool/mkmsvcmin.tcl
@@ -9,7 +9,7 @@
 if {$argc==0} {
   set basedir [file dir [file dir [file normalize $argv0]]]
   set fromFileName [file join $basedir Makefile.msc]
-  set toFileName [file join $basedir Makefile.min.msc]
+  set toFileName [file join $basedir autoconf Makefile.msc]
 } else {
   set fromFileName [lindex $argv 0]
   if {![file exists $fromFileName]} {
@@ -75,8 +75,9 @@ $(LIBRESOBJS):        $(TOP)\sqlite3.rc rcver.vc $(SQLITE3H)
 set data "#### DO NOT EDIT ####\n"
 append data "# This makefile is automatically "
 append data "generated from the [file tail $fromFileName] at\n"
-append data "# the root of the canonical SQLite source tree using the\n"
-append data "# tool/[file tail $argv0] script.\n#\n\n"
+append data "# the root of the canonical SQLite source tree (not the\n"
+append data "# amalgamation tarball) using the tool/[file tail $argv0]\n"
+append data "# script.\n#\n\n"
 append data [readFile $fromFileName]
 
 regsub -all -- {# <<mark>>\n.*?# <</mark>>\n} \