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 39ecf08786867b6aa353203a26b51256a541cedf (commit) via e656215ac44b80944c2ead1314d512ddbcb94ac4 (commit) via 803a8bd24679310c298c8e51264f9dbdb2cf30a7 (commit) from 15db498a83e329bfd524a40897a07a3076f390c8 (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 39ecf08786867b6aa353203a26b51256a541cedf Author: Raymond Toy <toy.raymond@gmail.com> Date: Sat Oct 8 08:44:22 2011 -0700 Remove reference to CVS. diff --git a/tools/build-all.sh b/tools/build-all.sh index 99bf4c1..c2462b4 100755 --- a/tools/build-all.sh +++ b/tools/build-all.sh @@ -29,7 +29,7 @@ usage () echo " (only applicable for build 1)" echo " -8 x Use specified Lisp to build 8-bit version." echo " (only applicable for build 1)" - echo " -U Update and overwite the CVS translations files." + echo " -U Update and overwite the translations files." echo " -P On the last build, (re)generate cmucl.pot and the" echo " translations" } commit e656215ac44b80944c2ead1314d512ddbcb94ac4 Author: Raymond Toy <toy.raymond@gmail.com> Date: Sat Oct 8 08:43:38 2011 -0700 o Let build.sh set the default version instead of setting one here. o Add -P option to control whether we update the pot files or not. diff --git a/tools/build-all.sh b/tools/build-all.sh index 6410582..99bf4c1 100755 --- a/tools/build-all.sh +++ b/tools/build-all.sh @@ -6,7 +6,7 @@ usage () { - echo "build-all.sh [bBCvU] [-o old] [-8 old8bit]" + echo "build-all.sh [-bBCvUP] [-o old] [-8 old8bit]" echo "" echo "Build all variants of cmucl for a specific architecture." echo "This means build the unicode and non-unicode variants." @@ -24,22 +24,21 @@ usage () echo ' -C [l m] Create the build directories. The args are what' echo ' you would give to create-target.sh for the lisp' echo ' and motif variant.' - echo ' -v v Use the given string as the version. Default is' - echo " today's date" + echo ' -v v Use the given string as the version.' echo " -o x Use specified Lisp to build unicode version." echo " (only applicable for build 1)" echo " -8 x Use specified Lisp to build 8-bit version." echo " (only applicable for build 1)" echo " -U Update and overwite the CVS translations files." + echo " -P On the last build, (re)generate cmucl.pot and the" + echo " translations" } -VERSION="`date '+%Y-%m-%d %H:%M:%S'`" -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" -VERSION="`date '+%Y-%m-%d %H:%M:%S'` $GIT_HASH" BASE=build CREATE_OPT="" +UPDATE_POT="-P" -while getopts "UB:b:v:C:o:8:?" arg +while getopts "PUB:b:v:C:o:8:?" arg do case $arg in b) BASE="$OPTARG" ;; @@ -49,6 +48,7 @@ do 8) OLD8="$OPTARG" ;; v) VERSION="$OPTARG" ;; U) UPDATE_TRANS="-U" ;; + P) UPDATE_POT="" ;; \?) usage ;; esac done @@ -63,20 +63,21 @@ 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 -v "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} -o "$OLD8" - src/tools/build.sh -f sse2 -b ${BASE}-8bit $bootfiles -v "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} -o "$OLD8" + 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" set +x fi # Build the unicode versions if [ -n "$OLDLISP" ]; then set -x - src/tools/build.sh -f x87 -b ${BASE} $bootfiles -v "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} -o "$OLDLISP" - src/tools/build.sh -f sse2 -b ${BASE} $bootfiles -v "$VERSION" -C "${CREATE_OPT}" ${UPDATE_TRANS} -o "$OLDLISP" + 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" set +x fi } @@ -86,13 +87,13 @@ buildsun4 () # Build non-unicode versions if [ -n "$OLD8" ]; then set -x - src/tools/build.sh -b ${BASE}-8bit $bootfiles -v "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} -o "$OLD8" + src/tools/build.sh -b ${BASE}-8bit $bootfiles "$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 -v "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} -o "$OLDLISP" + src/tools/build.sh -b ${BASE} $bootfiles "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" set +x fi } commit 803a8bd24679310c298c8e51264f9dbdb2cf30a7 Author: Raymond Toy <toy.raymond@gmail.com> Date: Sat Oct 8 08:42:08 2011 -0700 Use git describe instead of git log to get a version. diff --git a/tools/build.sh b/tools/build.sh index 85e4041..74374dd 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -43,7 +43,7 @@ version=20b SRCDIR=src TOOLDIR=$SRCDIR/tools VERSION="`date '+%Y-%m-%d %H:%M:%S'`" -GIT_HASH="`(cd src; git log -1 --pretty=format:%t 2>/dev/null)`" +GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" # Add the tree hash to the version VERSION="$VERSION $GIT_HASH" BASE=build ----------------------------------------------------------------------- Summary of changes: tools/build-all.sh | 29 +++++++++++++++-------------- tools/build.sh | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) hooks/post-receive -- CMU Common Lisp