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, RELEASE-20C-BRANCH has been updated via 50b8f96365ae8fb57e0dd70a01185fff20c19156 (commit) via 14435ceb9d456422906a70076ce4354cdcd98fec (commit) from 5de45b3d05925f6eae2ebbc61526a3e54f44bbb4 (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 50b8f96365ae8fb57e0dd70a01185fff20c19156 Author: Raymond Toy <toy.raymond@gmail.com> Date: Sun Oct 30 15:32:18 2011 -0700 Solaris sh doesn't have test -e. Use -d instead. diff --git a/tools/create-target.sh b/tools/create-target.sh index d4fc614..b923678 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -81,7 +81,7 @@ esac diag "Settings: bld_dir=$bld_dir lisp_variant=$lisp_variant ${motif_variant:+motif_variant=$motif_variant}" # Create a directory tree that mirrors the source directory tree -[ -e "$bld_dir" ] && quit "Exists: `ls -ld $bld_dir`" +[ -d "$bld_dir" ] && quit "Exists: `ls -ld $bld_dir`" mkdir -p "$bld_dir" (cd src && find . -name .git -prune -o -type d -print) | (cd $bld_dir && xargs mkdir -p) || quit "Can't create target directories" commit 14435ceb9d456422906a70076ce4354cdcd98fec Author: Raymond Toy <toy.raymond@gmail.com> Date: Sun Oct 30 15:31:56 2011 -0700 Solaris /bin/sh doesn't like ${VERSION:+ -v "$VERSION"}. Simplify it. diff --git a/tools/build-all.sh b/tools/build-all.sh index 3b69e1c..e9d137f 100755 --- a/tools/build-all.sh +++ b/tools/build-all.sh @@ -46,7 +46,7 @@ do C) CREATE_OPT="$OPTARG" ;; o) OLDLISP="$OPTARG" ;; 8) OLD8="$OPTARG" ;; - v) VERSION="$OPTARG" ;; + v) VERSION="$OPTARG"; VERSION_SET=true ;; U) UPDATE_TRANS="-U" ;; P) UPDATE_POT="" ;; \?) usage ;; @@ -83,16 +83,19 @@ buildx86 () buildsun4 () { + if [ "$VERSION_SET" = true ]; then + VERS="-v '"$VERSION"'" + fi # Build non-unicode versions if [ -n "$OLD8" ]; then set -x - src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" + src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -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:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" + src/tools/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" set +x fi } ----------------------------------------------------------------------- Summary of changes: tools/build-all.sh | 9 ++++++--- tools/create-target.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) hooks/post-receive -- CMU Common Lisp