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 fce6baff8422e8de9c3f4b33e557c55e3e34ebee (commit) via 8c5abd162d1cbee840088eee055f064bf9c1e283 (commit) via 6758988de6238d627c018601adfa137e9321e69d (commit) from 5079827f9d27e143f3a48ab5006ec42f71f0815c (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 fce6baff8422e8de9c3f4b33e557c55e3e34ebee Author: Raymond Toy <toy.raymond@gmail.com> Date: Mon Oct 10 21:02:43 2011 -0700 Cleanup version stuff and fix bug. o Add git hash to default version o Remove CVS o Fix bug where the default version wasn't actually used when a version string wasn't given. diff --git a/tools/load-world.sh b/tools/load-world.sh index 672a357..288e40c 100755 --- a/tools/load-world.sh +++ b/tools/load-world.sh @@ -11,8 +11,10 @@ usage() SKIP_PCL= NO_PCL_FEATURE= -# Default version is the date. -VERSION="CVS Head `date '+%Y-%m-%d %H:%M:%S'`" +# 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}" +echo $VERSION while getopts "p" arg do @@ -40,7 +42,7 @@ fi # If version string give, use it, otherwise use the default. if [ -n "$2" ]; then - VERSION=$2 + VERSION="$2" fi $TARGET/lisp/lisp -core $TARGET/lisp/kernel.core <<EOF @@ -57,6 +59,6 @@ $TARGET/lisp/lisp -core $TARGET/lisp/kernel.core <<EOF $NO_PCL_FEATURE (load "target:tools/worldload") -$2 +$VERSION EOF commit 8c5abd162d1cbee840088eee055f064bf9c1e283 Author: Raymond Toy <toy.raymond@gmail.com> Date: Mon Oct 10 20:56:47 2011 -0700 Just expand the VERSION everywhere instead of trying to be smart and doing it once. Shell quoting is a pain. diff --git a/tools/build-all.sh b/tools/build-all.sh index c2462b4..3b69e1c 100755 --- a/tools/build-all.sh +++ b/tools/build-all.sh @@ -63,21 +63,20 @@ if [ "$OLDLISP" = "" -a "$OLD8" = "" ]; then exit 1 fi -VERSION=${VERSION:+-v "$VERSION"} buildx86 () { if [ -n "$OLD8" ]; then # Build non-unicode versions set -x - src/tools/build.sh -f x87 -b ${BASE}-8bit $bootfiles "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" - src/tools/build.sh -f sse2 -b ${BASE}-8bit $bootfiles "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" + src/tools/build.sh -f x87 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" + src/tools/build.sh -f sse2 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" set +x fi # Build the unicode versions if [ -n "$OLDLISP" ]; then set -x - src/tools/build.sh -f x87 -b ${BASE} $bootfiles "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" - src/tools/build.sh -f sse2 -b ${BASE} $bootfiles "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" + src/tools/build.sh -f x87 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" + src/tools/build.sh -f sse2 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" set +x fi } @@ -87,13 +86,13 @@ buildsun4 () # Build non-unicode versions if [ -n "$OLD8" ]; then set -x - src/tools/build.sh -b ${BASE}-8bit $bootfiles "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" + src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" set +x fi # Build the unicode version. if [ -n "$OLDLISP" ]; then set -x - src/tools/build.sh -b ${BASE} $bootfiles "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" + src/tools/build.sh -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" set +x fi } commit 6758988de6238d627c018601adfa137e9321e69d Author: Raymond Toy <toy.raymond@gmail.com> Date: Mon Oct 10 18:59:55 2011 -0700 Change to correct directory before symlinking the Config and Makefile for motif. diff --git a/tools/create-target.sh b/tools/create-target.sh index 7c0854c..e420f5c 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -92,7 +92,7 @@ cd $bld_dir/lisp || quit "Can't cd $bld_dir/lisp" ln -s ../../src/lisp/GNUmakefile ../../src/lisp/Config.$lisp_variant ../../src/lisp/Config.*_common . ln -s Config.$lisp_variant Config [ -n "$motif_variant" ] && ( - cd motif/server || quit "Can't cd motif/server" # We will still continue in the outer shell + cd ../motif/server || quit "Can't cd motif/server" # We will still continue in the outer shell ln -s ../../../src/motif/server/GNUmakefile ./Makefile ln -s ../../../src/motif/server/Config.$motif_variant ./Config ) ----------------------------------------------------------------------- Summary of changes: tools/build-all.sh | 13 ++++++------- tools/create-target.sh | 2 +- tools/load-world.sh | 10 ++++++---- 3 files changed, 13 insertions(+), 12 deletions(-) hooks/post-receive -- CMU Common Lisp