[cmucl-cvs] [git] CMU Common Lisp branch master updated. 15db498a83e329bfd524a40897a07a3076f390c8

[Alex Goncharov]

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  15db498a83e329bfd524a40897a07a3076f390c8 (commit)
      from  4be42bd6d9718524eab70a3cdc9ba8f457d83b86 (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 15db498a83e329bfd524a40897a07a3076f390c8
Author: Alex Goncharov <alex-goncharov at comcast.net>
Date:   Sat Oct 8 07:49:24 2011 -0400

    tools/create-target.sh: merge from dynamic-stack-alloc

diff --git a/tools/create-target.sh b/tools/create-target.sh
index 48481dd..7c0854c 100755
--- a/tools/create-target.sh
+++ b/tools/create-target.sh
@@ -1,24 +1,27 @@
 #!/bin/sh
 
-quit() { echo "$@" >&2; exit 1; }
+diag() { echo "($prgm_name) $@" >&2; }
+quit() { diag "not OK: $@"; exit 1; }
 usage() {
-    echo "Usage: `basename $0` TARGET-DIR [LISP-VARIANT [MOTIF-VARIANT]]"
+    echo "Usage: $prgm_name TARGET-DIR [LISP-VARIANT [MOTIF-VARIANT]]"
     echo ""
     echo "Creates a directory structure in TARGET-DIR for use in building CMUCL."
     echo "A simple logic is used to find the optional -VARIANT parameters."
     echo ""
     # List possible values for lisp-variant and motif-variant
-    echo "Possible LISP-VARIANTs (don't trust what you see):"
+    echo "Possible LISP-VARIANTs:"
     ( cd src/lisp/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants"
-    echo "Possible MOTIF-VARIANTs (don't trust what you see):"
+    echo "Possible MOTIF-VARIANTs:"
     ( cd src/motif/server/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants"
     exit 2
 }
 
-bld_dir=$1 lisp_variant=$2 motif_variant=$3
+##--
+prgm_name=`basename $0` bld_dir=$1 lisp_variant=$2 motif_variant=$3
 exec 2>&1
 
-case $bld_dir in build-*) :;; *) usage;; esac
+[ -n "$bld_dir" ] || usage
+
 uname_s=`uname -s`
 uname_m=`uname -m 2>/dev/null`
 [ -n "$lisp_variant" ] || {
@@ -40,7 +43,7 @@ uname_m=`uname -m 2>/dev/null`
 	*) quit "Unsupported OS: $uname_s";;
     esac
 }
-[ -n "$lisp_variant" ] || quit "Failed to determine lisp_variant"
+[ -n "$lisp_variant" ] || quit "Can't determine lisp_variant"
 [ -f src/lisp/Config.$lisp_variant ] || quit "Config.$lisp_variant not found"
 
 case $lisp_variant in
@@ -74,10 +77,10 @@ case $uname_s in
 esac
 
 # Tell user what's we've configured
-echo "bld_dir=$bld_dir lisp_variant=$lisp_variant ${motif_variant:+motif_variant=$motif_variant}"
+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 "delete this: `ls -ld $bld_dir`"
+[ -e "$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"
@@ -104,4 +107,4 @@ echo '#error You need to run genesis (via build-world.sh) before compiling the s
 	solaris) cat $setenv_dir/solaris-features.lisp;;
 	*) sed "s;@@LISP@@;$lisp_variant;" $setenv_dir/unknown.lisp;;
     esac
-) > setenv.lisp || quit "Failed create setenv.lisp"
+) > ../setenv.lisp || quit "Can't create setenv.lisp"

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

Summary of changes:
 tools/create-target.sh |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp