[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-8-g393bee0

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  393bee0d7c4b52a32ea996d48004e4ce6f1299b8 (commit)
       via  8e025dcdc1d258fa9e2c08edb7f30a25a8de7081 (commit)
      from  701bc7eb5d81314343210d72a0b120ec3dfa0b86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 393bee0d7c4b52a32ea996d48004e4ce6f1299b8
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Mon Feb 6 22:48:12 2012 -0800

    No default version anymore; let load-world.sh specify it.

diff --git a/bin/build.sh b/bin/build.sh
index 85d70e7..5eb2a5b 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -43,10 +43,6 @@ version=20c
 SRCDIR=src
 BINDIR=bin
 TOOLDIR=$BINDIR
-VERSION="`date '+%Y-%m-%d %H:%M:%S'`"
-GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`"
-# Add the tree hash to the version
-VERSION="$VERSION $GIT_HASH"
 OLDLISPFLAGS="-noinit -nositeinit"
 OLDLISP="cmulisp"
 
@@ -112,6 +108,7 @@ esac
 
 buildit ()
 {
+    set -x
     if echo $INTERACTIVE_BUILD | grep $BUILD > /dev/null; then
 	INTERACTIVE=t
     else
@@ -142,6 +139,7 @@ buildit ()
 	$TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
 	return 0;
     fi
+    set +x
 }
 
 FPU_MODE=

commit 8e025dcdc1d258fa9e2c08edb7f30a25a8de7081
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Mon Feb 6 22:47:49 2012 -0800

    If git describe looks like a snapshot tag, just use that as the
    default version instead of adding the date to it. The tag has most of
    the desired information already, and this helps to keep
    lisp-implementation-version from having duplicate information.

diff --git a/bin/load-world.sh b/bin/load-world.sh
index 288e40c..b2fcb2e 100755
--- a/bin/load-world.sh
+++ b/bin/load-world.sh
@@ -13,7 +13,13 @@ SKIP_PCL=
 NO_PCL_FEATURE=
 # Default version is the date with the git hash.
 GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`"
-VERSION="`date '+%Y-%m-%d %H:%M:%S'`${GIT_HASH:+ $GIT_HASH}"
+
+# If the git hash looks like a snapshot tag, don't add the date.
+if expr "X${GIT_HASH}" : '^Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then
+    VERSION="${GIT_HASH}"
+else
+    VERSION="`date '+%Y-%m-%d %H:%M:%S'`${GIT_HASH:+ $GIT_HASH}"
+fi
 echo $VERSION
 
 while getopts "p" arg
@@ -40,7 +46,7 @@ if [ -n "$SKIP_PCL" ]; then
     NO_PCL_FEATURE="(pushnew :no-pcl *features*)"
 fi
 
-# If version string give, use it, otherwise use the default.
+# If version string given, use it, otherwise use the default.
 if [ -n "$2" ]; then
     VERSION="$2"
 fi

-----------------------------------------------------------------------

Summary of changes:
 bin/build.sh      |    6 ++----
 bin/load-world.sh |   10 ++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp