[cmucl-cvs] [git] CMU Common Lisp branch rearrange-dir updated. release-20c-15-gf389de8

[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, rearrange-dir has been updated
       via  f389de8f2e3dea95e3c5905a60853be380f6094b (commit)
       via  1dcbb5c068d0a2bf10f6e36bb1c77d6ca7c264f9 (commit)
       via  30f2e52433028cb9502f0b8b987e318c5d8c2fde (commit)
      from  e3281db3226d7180bb5c6ba6c6754d8045d29ed3 (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 f389de8f2e3dea95e3c5905a60853be380f6094b
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Fri Nov 4 22:42:16 2011 -0700

    Ignore linux and sparc build directories.

diff --git a/.gitignore b/.gitignore
index 2a6211a..c122cd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 # Ignore default build directories
 darwin-[234]
 darwin-8bit-[234]
+linux-[234]
+linux-8bit-[234]
+sparc-[234]
+sparc-8bit-[234]
 
 # Ignore files generated by TeX
 src/docs/cmu-user/*.aux

commit 1dcbb5c068d0a2bf10f6e36bb1c77d6ca7c264f9
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Fri Nov 4 22:40:45 2011 -0700

    If -b is not given, try to choose a suitable name from the OS type.

diff --git a/bin/build-all.sh b/bin/build-all.sh
index 937396c..8aa4c84 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -18,6 +18,8 @@ usage ()
     echo ""
     echo "    -b d      Basename of the different build directories."
     echo "               ${d}-2, ${d}-3, ${d}-4 for unicode"
+    echo "               If -b is not given, a suitable name is chosen"
+    echo "               based on the OS."
     echo "               ${d}-8bit-2, ${d}-8bit-3, ${d}-8bit-4 for non-unicode"
     echo "    -B file   Use file as a boot file.  Maybe be specified more than once"
     echo "               The file is relative to the bootfiles/<version> directory"
@@ -34,7 +36,6 @@ usage ()
     echo "               translations"
 }
 
-BASE=build
 CREATE_OPT=""
 UPDATE_POT="-P"
 
@@ -53,9 +54,20 @@ do
     esac
 done
 
-if [ "$BASE" = "" ]; then
-    echo "-b option required"
-    exit 1
+# If -b not given, try to derive one instead of just using "build".
+if [ -z "$BASE" ]; then
+    case `uname -s` in
+      Darwin) # We only support darwin-x86 now.  No ppc available anymore.
+	  BASE=darwin ;;
+      SunOS)
+	  case `uname -m` in
+	    sun4u) BASE=sparc ;;
+	    i86pc) BASE=sol-x86 ;;
+	  esac ;;
+      Linux) BASE=linux ;;
+      # Add support for FreeBSD and NetBSD?  Otherwise default to just build.
+      *) BASE=build ;;
+    esac
 fi
 
 if [ "$OLDLISP" = "" -a "$OLD8" = "" ]; then
diff --git a/bin/build.sh b/bin/build.sh
index 00c7fc6..537354b 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -47,7 +47,6 @@ 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"
-BASE=build
 OLDLISPFLAGS="-noinit -nositeinit"
 OLDLISP="cmulisp"
 
@@ -78,7 +77,7 @@ usage ()
     echo "    -o x      Use specified Lisp to build.  Default is cmulisp"
     echo "               (only applicable for build 1)"
     echo '    -b d      The different build directories are named ${d}-2, ${d}-3 ${d}-4'
-    echo '               with a default of "build"'
+    echo '               If -b is not given, a suitable name based on the OS is used.' 
     echo '    -v v      Use the given string as the version.  Default is'
     echo "               today's date"
     echo "    -u        Don't build CLX, CLM, or Hemlock"
@@ -174,6 +173,24 @@ do
     esac
 done
 
+# If -b not given, try to derive one instead of just using "build".
+if [ -z "$BASE" ]; then
+    case `uname -s` in
+      Darwin) # We only support darwin-x86 now.  No ppc available anymore.
+	  BASE=darwin ;;
+      SunOS)
+	  case `uname -m` in
+	    sun4u) BASE=sparc ;;
+	    i86pc) BASE=sol-x86 ;;
+	  esac ;;
+      Linux) BASE=linux ;;
+      # Add support for FreeBSD and NetBSD?  Otherwise default to just build.
+      *) BASE=build ;;
+    esac
+fi
+
+echo base = $BASE
+
 bootfiles_dir=$SRCDIR/bootfiles/$version
 if [ -n "$bootfiles" ]; then
     for file in $bootfiles; do

commit 30f2e52433028cb9502f0b8b987e318c5d8c2fde
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Fri Nov 4 22:40:06 2011 -0700

    Ignore darwin build directories.

diff --git a/.gitignore b/.gitignore
index 453b96e..2a6211a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+# Ignore default build directories
+darwin-[234]
+darwin-8bit-[234]
+
+# Ignore files generated by TeX
 src/docs/cmu-user/*.aux
 src/docs/cmu-user/*.cdx
 src/docs/cmu-user/*.cnd

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

Summary of changes:
 .gitignore       |    9 +++++++++
 bin/build-all.sh |   20 ++++++++++++++++----
 bin/build.sh     |   21 +++++++++++++++++++--
 3 files changed, 44 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp