Add the new "snapshot-tarball" target to the unix makefiles, for building

a tarball similar to "amalgamation-tarball" but named by the SHA1 hash of
the current check-out rather than by the version number.

FossilOrigin-Name: 4f360b2ae78b3d4ccfe6c40ac6b27a00fc70cf23

diff --git a/Makefile.in b/Makefile.in
index e1293d69fa77f8c2f694cfa5f8374eee1895f076..013cf442d195b07e3ef42ed36dacf7b8d648f55c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1156,10 +1156,15 @@ checksymbols: sqlite3.lo
        nm -g --defined-only sqlite3.o | grep -v " sqlite3_" ; test $$? -ne 0
        echo '0 errors out of 1 tests'
 
-# Build the amalgamation-autoconf package.
+# Build the amalgamation-autoconf package.  The amalamgation-tarball target builds
+# a tarball named for the version number.  Ex:  sqlite-autoconf-3110000.tar.gz.
+# The snapshot-tarball target builds a tarball named by the SHA1 hash
 #
 amalgamation-tarball: sqlite3.c
-       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh
+       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --normal
+
+snapshot-tarball: sqlite3.c
+       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --snapshot
 
 # The next two rules are used to support the "threadtest" target. Building
 # threadtest runs a few thread-safety tests that are implemented in C. This

diff --git a/main.mk b/main.mk
index 149f94e2096477ba4fb50f4dd75dae685c8088cd..509f4c8273f9aac25feba23e83e1c4c4fbd17972 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -863,10 +863,15 @@ loadfts: $(TOP)/tool/loadfts.c libsqlite3.a
 checksymbols: sqlite3.o
        nm -g --defined-only sqlite3.o | grep -v " sqlite3_" ; test $$? -ne 0
 
-# Build the amalgamation-autoconf package.
+# Build the amalgamation-autoconf package.  The amalamgation-tarball target builds
+# a tarball named for the version number.  Ex:  sqlite-autoconf-3110000.tar.gz.
+# The snapshot-tarball target builds a tarball named by the SHA1 hash
 #
 amalgamation-tarball: sqlite3.c
-       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh
+       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --normal
+
+snapshot-tarball: sqlite3.c
+       TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --snapshot
 
 
 # Standard install and cleanup targets

diff --git a/manifest b/manifest
index 542977d5e3f32900803f8f1dbc3db77a92fc44a6..5d5b5a73cf84d09aab8c27e5cb087ff29ffc73d7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Update\sthe\sMSVC\sautoconf\smakefile\swith\sthe\srecent\schanges\sfrom\sthe\sprimary\sone.
-D 2016-02-09T22:00:48.288
-F Makefile.in 95ea52e9c02962e31f986fe8ea5805104c84f94b
+C Add\sthe\snew\s"snapshot-tarball"\starget\sto\sthe\sunix\smakefiles,\sfor\sbuilding\na\starball\ssimilar\sto\s"amalgamation-tarball"\sbut\snamed\sby\sthe\sSHA1\shash\sof\nthe\scurrent\scheck-out\srather\sthan\sby\sthe\sversion\snumber.
+D 2016-02-09T22:39:39.028
+F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 0fe3b22f8e29bcde0533ada7957a5f15835d797a
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@ -272,7 +272,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 37497b06d3e3acb2c71675d76627a3b2639c6db0
+F main.mk aecd0ce0646db48754e2a14523f759593f8ed072
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1382,7 +1382,7 @@ F tool/lemon.c 799e73e19a33b8dd7767a7fa34618ed2a9c2397d
 F tool/lempar.c 3ec1463a034b37d87d782be5f6b8b10a3b1ecbe7
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
-F tool/mkautoconfamal.sh a29b14d54302b33fd892958f6895582ea90e4a45
+F tool/mkautoconfamal.sh e4efcad8e94bea57c143175a8ad58e953487f185
 F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22
 F tool/mkmsvcmin.tcl d57e6efc9428605f5418d0b235721ddf7b5d9c0b
 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
@@ -1427,7 +1427,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 1135ad014aac8a4ae5169375af1b368feaa8331b
-R 9aa873b7c8d29e72fd134e7743d1eb40
-U mistachkin
-Z b7e0b8af3a354ae18e5de2ce26dd905f
+P c7242aa3e9c08e0c019388e89a785a6e59c915d5
+R 1f1da2b535c3a877742d655382e7c04d
+U drh
+Z 3b1fd5382ba0d09acf8b866801d6e0da

diff --git a/manifest.uuid b/manifest.uuid
index 96016126dcfb6072314f885f579cd97952046f9f..b78568f32501634b611d03191dee4c61b5f8b7c2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7242aa3e9c08e0c019388e89a785a6e59c915d5
\ No newline at end of file
+4f360b2ae78b3d4ccfe6c40ac6b27a00fc70cf23
\ No newline at end of file

diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index 6081a7b0ec306df28e18130fe22c878796680583..25a84b41692eaeaf1b6502d664266f4c3ac32618 100644 (file)
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -22,16 +22,26 @@ set -u
 
 TMPSPACE=./mkpkg_tmp_dir
 VERSION=`cat $TOP/VERSION`
+HASH=`sed 's/^\(..........\).*/\1/' $TOP/manifest.uuid`
 
-# Set global variable $ARTIFACT to the "3xxyyzz" string incorporated 
-# into artifact filenames. And $VERSION2 to the "3.x.y[.z]" form.
-xx=`echo $VERSION|sed 's/3\.\([0-9]*\)\..*/\1/'`
-yy=`echo $VERSION|sed 's/3\.[^.]*\.\([0-9]*\).*/\1/'`
-zz=0
-set +e
-  zz=`echo $VERSION|sed 's/3\.[^.]*\.[^.]*\.\([0-9]*\).*/\1/'|grep -v '\.'`
-set -e
-ARTIFACT=`printf "3%.2d%.2d%.2d" $xx $yy $zz`
+# If this script is given an argument of --snapshot, then generate a
+# snapshot tarball named for the current checkout SHA1 hash, rather than
+# the version number.
+#
+if test "$#" -ge 1 -a x$1 != x--snapshot
+then
+  # Set global variable $ARTIFACT to the "3xxyyzz" string incorporated 
+  # into artifact filenames. And $VERSION2 to the "3.x.y[.z]" form.
+  xx=`echo $VERSION|sed 's/3\.\([0-9]*\)\..*/\1/'`
+  yy=`echo $VERSION|sed 's/3\.[^.]*\.\([0-9]*\).*/\1/'`
+  zz=0
+  set +e
+    zz=`echo $VERSION|sed 's/3\.[^.]*\.[^.]*\.\([0-9]*\).*/\1/'|grep -v '\.'`
+  set -e
+  ARTIFACT=`printf "3%.2d%.2d%.2d" $xx $yy $zz`
+else
+  ARTIFACT=$HASH
+fi
 
 rm -rf $TMPSPACE
 cp -R $TOP/autoconf       $TMPSPACE
@@ -76,3 +86,5 @@ tar -xzf sqlite-$VERSION.tar.gz
 mv sqlite-$VERSION sqlite-autoconf-$ARTIFACT
 tar -czf sqlite-autoconf-$ARTIFACT.tar.gz sqlite-autoconf-$ARTIFACT
 mv sqlite-autoconf-$ARTIFACT.tar.gz ..
+cd ..
+ls -l sqlite-autoconf-$ARTIFACT.tar.gz