October 2011 - cmucl-cvs - mailman3.common-lisp.net

[cmucl-cvs] [git] CMU Common Lisp tag amd64-merge-start created. 4e9ecf2c9b8e048132298bd1413f30852a3f8830
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, amd64-merge-start has been created at 4e9ecf2c9b8e048132298bd1413f30852a3f8830 (commit) - Log ----------------------------------------------------------------- commit 4e9ecf2c9b8e048132298bd1413f30852a3f8830 Merge: 97c8bb7 24d534c Author: cvs2git <cvs2git> Date: Tue May 18 20:23:41 2004 +0000 This commit was manufactured by cvs2svn to create tag 'amd64-merge-start'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag cold-pcl-base created. 66c531c2752733194f0a675878d9345b05168d6d
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, cold-pcl-base has been created at 66c531c2752733194f0a675878d9345b05168d6d (commit) - Log ----------------------------------------------------------------- commit 66c531c2752733194f0a675878d9345b05168d6d Merge: aa09a5a 24d534c Author: cvs2git <cvs2git> Date: Sat Mar 8 17:51:53 2003 +0000 This commit was manufactured by cvs2svn to create branch 'cold-pcl'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag amd64-dd-start created. 7607709ad2d5952085b2a6897afb1c971fe67c1d
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, amd64-dd-start has been created at 7607709ad2d5952085b2a6897afb1c971fe67c1d (commit) - Log ----------------------------------------------------------------- commit 7607709ad2d5952085b2a6897afb1c971fe67c1d Merge: f6bd301 24d534c Author: cvs2git <cvs2git> Date: Thu Oct 29 14:54:57 2009 +0000 This commit was manufactured by cvs2svn to create branch 'amd64-dd-branch'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag RELEASE_20b created. 5bdab481ffb6baccd937867c3c4d1aea14e52634
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, RELEASE_20b has been created at 5bdab481ffb6baccd937867c3c4d1aea14e52634 (commit) - Log ----------------------------------------------------------------- commit 5bdab481ffb6baccd937867c3c4d1aea14e52634 Merge: 4230ce0 0b17eea Author: cvs2git <cvs2git> Date: Mon Sep 27 19:29:53 2010 +0000 This commit was manufactured by cvs2svn to create tag 'RELEASE_20b'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag UNICODE-BASE created. 347ffd7b8cd59ecdbb4967934bd5b6e05af59c2e
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, UNICODE-BASE has been created at 347ffd7b8cd59ecdbb4967934bd5b6e05af59c2e (commit) - Log ----------------------------------------------------------------- commit 347ffd7b8cd59ecdbb4967934bd5b6e05af59c2e Merge: 1d7ae49 24d534c Author: cvs2git <cvs2git> Date: Fri Oct 4 17:11:10 2002 +0000 This commit was manufactured by cvs2svn to create branch 'UNICODE-BRANCH'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag RELEASE_18d created. a1b085e40f5b99ca54d358ab501e2e5820e3cadf
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, RELEASE_18d has been created at a1b085e40f5b99ca54d358ab501e2e5820e3cadf (commit) - Log ----------------------------------------------------------------- commit a1b085e40f5b99ca54d358ab501e2e5820e3cadf Author: pmai <pmai> Date: Thu Apr 11 00:22:57 2002 +0000 Merged missing documentation files for release tarballs from main branch. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag RELEASE_20a created. b46fffad9b3ae77310daf722c22ec231afd17882
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, RELEASE_20a has been created at b46fffad9b3ae77310daf722c22ec231afd17882 (commit) - Log ----------------------------------------------------------------- commit b46fffad9b3ae77310daf722c22ec231afd17882 Author: rtoy <rtoy> Date: Mon Sep 28 13:02:52 2009 +0000 Merge dirname fix from trunk. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag RELEASE_19f created. cff55a6b683c8b78c0df5dc93fd1ffbc9d7fe032
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, RELEASE_19f has been created at cff55a6b683c8b78c0df5dc93fd1ffbc9d7fe032 (commit) - Log ----------------------------------------------------------------- commit cff55a6b683c8b78c0df5dc93fd1ffbc9d7fe032 Author: rtoy <rtoy> Date: Tue Mar 10 16:48:36 2009 +0000 o Add note that tracing with encapsulation isn't needed on OSX/x86 anymore. o Add note that executables are not currently working on recent FreeBSD versions. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag RELEASE_18a created. cfe5a723960f1cb7477217c967607409c2c385fa
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, RELEASE_18a has been created at cfe5a723960f1cb7477217c967607409c2c385fa (commit) - Log ----------------------------------------------------------------- commit cfe5a723960f1cb7477217c967607409c2c385fa Author: cvs2git <cvs2git> Date: Sun Oct 12 19:28:42 1997 +0000 This commit was manufactured by cvs2svn to create tag 'RELEASE_18a'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag RELEASE_18c created. ed09360e74d6a4fe5344cb0f4d6090a2a3647574
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, RELEASE_18c has been created at ed09360e74d6a4fe5344cb0f4d6090a2a3647574 (commit) - Log ----------------------------------------------------------------- commit ed09360e74d6a4fe5344cb0f4d6090a2a3647574 Author: cvs2git <cvs2git> Date: Thu Nov 16 15:50:24 2000 +0000 This commit was manufactured by cvs2svn to create tag 'RELEASE_18c'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag RELEASE_18b created. 095fe72e079ccb454577e338008ef761181c82ed
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, RELEASE_18b has been created at 095fe72e079ccb454577e338008ef761181c82ed (commit) - Log ----------------------------------------------------------------- commit 095fe72e079ccb454577e338008ef761181c82ed Author: cvs2git <cvs2git> Date: Sun Jul 19 01:46:12 1998 +0000 This commit was manufactured by cvs2svn to create tag 'RELEASE_18b'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag PRE_LINKAGE_TABLE created. dcf3d1c9bd50f7b3f2ad4ebb83b97241efaeb4f4
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, PRE_LINKAGE_TABLE has been created at dcf3d1c9bd50f7b3f2ad4ebb83b97241efaeb4f4 (commit) - Log ----------------------------------------------------------------- commit dcf3d1c9bd50f7b3f2ad4ebb83b97241efaeb4f4 Merge: 08395aa 24d534c Author: cvs2git <cvs2git> Date: Tue Aug 27 19:01:41 2002 +0000 This commit was manufactured by cvs2svn to create tag 'PRE_LINKAGE_TABLE'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag LINKAGE_TABLE created. 64797bcbe7a46a7256325eac9df3aa7a9edb074a
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, LINKAGE_TABLE has been created at 64797bcbe7a46a7256325eac9df3aa7a9edb074a (commit) - Log ----------------------------------------------------------------- commit 64797bcbe7a46a7256325eac9df3aa7a9edb074a Merge: bf84be0 24d534c Author: cvs2git <cvs2git> Date: Tue Aug 27 22:18:36 2002 +0000 This commit was manufactured by cvs2svn to create tag 'LINKAGE_TABLE'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp tag GIT-CONVERSION created. ecb7ebf28d11a43a783befe7d6268644896216e5
by Raymond Toy 11 Oct '11

11 Oct '11

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 tag, GIT-CONVERSION has been created at ecb7ebf28d11a43a783befe7d6268644896216e5 (commit) - Log ----------------------------------------------------------------- commit ecb7ebf28d11a43a783befe7d6268644896216e5 Merge: 05a46af 24d534c Author: cvs2git <cvs2git> Date: Sat Sep 3 15:04:40 2011 +0000 This commit was manufactured by cvs2svn to create tag 'GIT-CONVERSION'. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. 1e5b21e28d58b1b16a36111967e2ee77464cafbd
by Raymond Toy 11 Oct '11

11 Oct '11

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 1e5b21e28d58b1b16a36111967e2ee77464cafbd (commit) from fce6baff8422e8de9c3f4b33e557c55e3e34ebee (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 1e5b21e28d58b1b16a36111967e2ee77464cafbd Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Oct 10 21:54:17 2011 -0700 Handle the case where Git describe prints nothing. In this case, just use the original file comment. diff --git a/compiler/main.lisp b/compiler/main.lisp index 7bfce70..58af043 100644 --- a/compiler/main.lisp +++ b/compiler/main.lisp @@ -1127,11 +1127,13 @@ in the user USER-INFO slot of STREAM-SOURCE-LOCATIONs.") (setf (default-directory) cwd)))) (generate-comment (file-info) (let* ((name (pathname (source-info-stream file-info))) - (proc (run-git name))) - (if (and proc (zerop (process-exit-code proc))) + (proc (run-git name)) + comment) + (if (and proc (zerop (process-exit-code proc)) + (setf comment (read-line (process-output proc) nil nil))) (format nil "$Header: ~A ~A $" (enough-namestring name) - (read-line (process-output proc))) + comment) (second form))))) (cond ((file-info-comment file) (compiler-warning _N"Ignoring extra file comment:~% ~S." form)) ----------------------------------------------------------------------- Summary of changes: compiler/main.lisp | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. fce6baff8422e8de9c3f4b33e557c55e3e34ebee
by Raymond Toy 11 Oct '11

11 Oct '11

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(a)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(a)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(a)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

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. 5079827f9d27e143f3a48ab5006ec42f71f0815c
by Alex Goncharov 10 Oct '11

10 Oct '11

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 5079827f9d27e143f3a48ab5006ec42f71f0815c (commit) from a0559708e0f703f88c7bb731689e85e3c9f0b88c (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 5079827f9d27e143f3a48ab5006ec42f71f0815c Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sun Oct 9 22:10:30 2011 -0400 compile-file: rephrase the doc string for the :Load argument. diff --git a/compiler/main.lisp b/compiler/main.lisp index eafe6e3..7bfce70 100644 --- a/compiler/main.lisp +++ b/compiler/main.lisp @@ -1807,8 +1807,8 @@ in the user USER-INFO slot of STREAM-SOURCE-LOCATIONs.") :Output-File The name of the fasl to output, NIL for none, T for the default. :Load - Load the compiled file; T here requires :Output-File to be T, as well. - The default is NIL. + Load the compiled file; T here requires :Output-File to be non-NIL, as well. + The default for :Load is NIL. :Error-File The name of the error listing file, NIL for none (the default), T for .err. ----------------------------------------------------------------------- Summary of changes: compiler/main.lisp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. a0559708e0f703f88c7bb731689e85e3c9f0b88c
by Alex Goncharov 09 Oct '11

09 Oct '11

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 a0559708e0f703f88c7bb731689e85e3c9f0b88c (commit) from e04778be14f6bba6a489a8bae37e39dee50bebe8 (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 a0559708e0f703f88c7bb731689e85e3c9f0b88c Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sun Oct 9 19:04:55 2011 -0400 compile-file: add a doc string for the :Load argument. diff --git a/compiler/main.lisp b/compiler/main.lisp index 2a02cf0..eafe6e3 100644 --- a/compiler/main.lisp +++ b/compiler/main.lisp @@ -1806,6 +1806,9 @@ in the user USER-INFO slot of STREAM-SOURCE-LOCATIONs.") input file name. Other options available via keywords: :Output-File The name of the fasl to output, NIL for none, T for the default. + :Load + Load the compiled file; T here requires :Output-File to be T, as well. + The default is NIL. :Error-File The name of the error listing file, NIL for none (the default), T for .err. ----------------------------------------------------------------------- Summary of changes: compiler/main.lisp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. e04778be14f6bba6a489a8bae37e39dee50bebe8
by Alex Goncharov 09 Oct '11

09 Oct '11

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 e04778be14f6bba6a489a8bae37e39dee50bebe8 (commit) via ef0137913f8e6bcbe6bc7931d25f5c30cbb91857 (commit) from 39ecf08786867b6aa353203a26b51256a541cedf (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 e04778be14f6bba6a489a8bae37e39dee50bebe8 Merge: ef01379 39ecf08 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sun Oct 9 18:57:29 2011 -0400 Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl commit ef0137913f8e6bcbe6bc7931d25f5c30cbb91857 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sun Oct 9 18:57:10 2011 -0400 Remove .gitignore: no need for it for now diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d3e83a9..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -contrib/asdf/asdf.*f ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) delete mode 100644 .gitignore hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. 39ecf08786867b6aa353203a26b51256a541cedf
by Raymond Toy 08 Oct '11

08 Oct '11

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(a)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(a)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(a)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

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. 15db498a83e329bfd524a40897a07a3076f390c8
by Alex Goncharov 08 Oct '11

08 Oct '11

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(a)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

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. d452655e2ee178a879d8e3b6caaec5469d99cf2a
by Alex Goncharov 08 Oct '11

08 Oct '11

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, dynamic-stack-alloc has been updated via d452655e2ee178a879d8e3b6caaec5469d99cf2a (commit) from 6cb062ff4035b266b9c430ffc4112385e35dce3c (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 d452655e2ee178a879d8e3b6caaec5469d99cf2a Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sat Oct 8 07:38:31 2011 -0400 Diagnostics: consistently use Can't intead of Failed. diff --git a/tools/create-target.sh b/tools/create-target.sh index 7ec3a84..7c0854c 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -43,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 @@ -107,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 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. 6cb062ff4035b266b9c430ffc4112385e35dce3c
by Alex Goncharov 08 Oct '11

08 Oct '11

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, dynamic-stack-alloc has been updated via 6cb062ff4035b266b9c430ffc4112385e35dce3c (commit) from df7a92e034bde0593b71878da6ec25b83e67f696 (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 6cb062ff4035b266b9c430ffc4112385e35dce3c Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sat Oct 8 07:32:40 2011 -0400 Fixing setenv.lisp location diff --git a/tools/create-target.sh b/tools/create-target.sh index a546349..7ec3a84 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -107,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 "Failed create setenv.lisp" ----------------------------------------------------------------------- Summary of changes: tools/create-target.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. df7a92e034bde0593b71878da6ec25b83e67f696
by Alex Goncharov 08 Oct '11

08 Oct '11

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, dynamic-stack-alloc has been updated via df7a92e034bde0593b71878da6ec25b83e67f696 (commit) from a252d16802013852583ed6741cde6d8268d6ae06 (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 df7a92e034bde0593b71878da6ec25b83e67f696 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Sat Oct 8 07:19:39 2011 -0400 Trivial improvements to 'tools/create-target.sh' (to be merged to 'master'). diff --git a/tools/create-target.sh b/tools/create-target.sh index 48481dd..a546349 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" ] || { @@ -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" ----------------------------------------------------------------------- Summary of changes: tools/create-target.sh | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch dynamic-stack-alloc updated. a252d16802013852583ed6741cde6d8268d6ae06
by Alex Goncharov 08 Oct '11

08 Oct '11

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, dynamic-stack-alloc has been updated via a252d16802013852583ed6741cde6d8268d6ae06 (commit) from 905107407b190f0bf1de0f5c90c3a588bd907dcf (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 a252d16802013852583ed6741cde6d8268d6ae06 Author: Alex Goncharov <alex-goncharov(a)comcast.net> Date: Fri Oct 7 21:55:27 2011 -0400 1. Add .gitignore. 2. Rewrite tools/create-target.sh (merge from master) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d3e83a9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +contrib/asdf/asdf.*f diff --git a/tools/create-target.sh b/tools/create-target.sh index 3a3d9d3..48481dd 100755 --- a/tools/create-target.sh +++ b/tools/create-target.sh @@ -1,146 +1,107 @@ #!/bin/sh -LISP_VARIANT= -MOTIF_VARIANT= -TARGET_DIR= - +quit() { echo "$@" >&2; exit 1; } usage() { - echo "Usage: `basename $0` target-dir [lisp-variant [motif-variant]]" + echo "Usage: `basename $0` TARGET-DIR [LISP-VARIANT [MOTIF-VARIANT]]" echo "" - echo "Creates a directory structure in TARGET-DIR for use in compiling" - echo "CMUCL. If the lisp-variant is not given, uname is used to select" - echo "a version, if possible. If motif-variant is not given, one is" - echo "determined from the lisp-variant." + 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:" - ( cd src/lisp/ ; ls -1 Config.* ) | sed 's;^Config[.];;g' | \ - pr -3at -o 8 - echo "Possible Motif-variants:" - ( cd src/motif/server/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 - exit 1 + echo "Possible LISP-VARIANTs (don't trust what you see):" + ( 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):" + ( cd src/motif/server/ && ls -1 Config.* ) | sed 's;^Config[.];;g' | pr -3at -o 8 || quit "Can't list lisp-variants" + exit 2 } -TARGET_DIR="$1" -case $TARGET_DIR in build-*) :;; *) usage; exit 2;; esac -[ -d $ "$TARGET_DIR" ] && echo "Error: Directory $1 exists already -- better remove it..." # && exit 2 - -if [ $# = 1 ]; then - # Only target directory given. Try to deduce the lisp-variant - case `uname -s` in - SunOS) - case `uname -m` in - i86pc) LISP_VARIANT=x86_solaris_sunc ;; - sun*) LISP_VARIANT=sparc_gcc ;; - esac - ;; - Linux) LISP_VARIANT=x86_linux ;; - Darwin) case `uname -m` in - ppc) LISP_VARIANT=ppc_darwin ;; - i386) LISP_VARIANT=x86_darwin ;; +bld_dir=$1 lisp_variant=$2 motif_variant=$3 +exec 2>&1 + +case $bld_dir in build-*) :;; *) usage;; esac +uname_s=`uname -s` +uname_m=`uname -m 2>/dev/null` +[ -n "$lisp_variant" ] || { + case $uname_s in + Linux) lisp_variant=x86_linux ;; + FreeBSD) lisp_variant=x86_freebsd ;; + SunOS) + case $uname_m in + i86pc) lisp_variant=x86_solaris_sunc ;; + sun*) lisp_variant=sparc_gcc ;; + esac + ;; + Darwin) + case $uname_m in + ppc) lisp_variant=ppc_darwin ;; + i386) lisp_variant=x86_darwin ;; esac ;; - FreeBSD|freebsd) LISP_VARIANT=x86_freebsd ;; - # Please fill in some other common systems - *) echo "Sorry, please specify the desired Lisp variant." - exit 1 ;; + *) quit "Unsupported OS: $uname_s";; esac -elif [ $# = 2 ]; then - # Target directory and lisp-variant given - LISP_VARIANT="$2" -elif [ $# = 3 ]; then - # Target directory, lisp-variant, and motif variant given - LISP_VARIANT="$2" - MOTIF_VARIANT="$3" -else - usage -fi - - -# Make sure the given variants exist -if [ ! -f src/lisp/Config.$LISP_VARIANT ]; then - echo "No such lisp-variant could be found: Config.$LISP_VARIANT" - exit 1 -fi +} +[ -n "$lisp_variant" ] || quit "Failed to determine lisp_variant" +[ -f src/lisp/Config.$lisp_variant ] || quit "Config.$lisp_variant not found" + +case $lisp_variant in + *linux*) lvshort=linux;; + *freebsd*) lvshort=freebsd;; + *solaris*) lvshort=solaris;; + *) lvshort=unknown;; +esac -# From the given variant, try to derive a motif variant -if [ "$MOTIF_VARIANT" = "" ]; then - case $LISP_VARIANT in - alpha_linux) MOTIF_VARIANT=alpha_linux ;; - alpha_osf1) MOTIF_VARIANT=alpha_osf1 ;; - x86_freebsd|FreeBSD*|freebsd*) MOTIF_VARIANT=FreeBSD ;; - NetBSD*) MOTIF_VARIANT=NetBSD ;; - OpenBSD*) MOTIF_VARIANT=OpenBSD ;; - *_darwin) MOTIF_VARIANT=Darwin ;; - sun4_solaris_gcc|sparc_gcc) MOTIF_VARIANT=solaris ;; - sun4_solaris_sunc|sparc_sunc|x86_solaris_sunc) MOTIF_VARIANT=solaris_sunc ;; - sun4c*) MOTIF_VARIANT=sun4c_411 ;; - hp700*) MOTIF_VARIANT=hpux_cc ;; - pmax_mach) MOTIF_VARIANT=pmax_mach ;; - sgi*) MOTIF_VARIANT=irix ;; - x86_linux|linux*) MOTIF_VARIANT=x86 ;; - esac -elif [ ! -f src/motif/server/Config.$MOTIF_VARIANT ]; then - echo "No such motif-variant could be found: Config.$MOTIF_VARIANT" - exit 1 -fi +# Beats me why we care about Motif today but let it be, other than on FreeBSD, +# where the config file is wrong anyway. (agoncharov, 2011-10-07) +case $uname_s in + FreeBSD) :;; # Free + *) # Enjoy + [ -n "$motif_variant" ] || { + case $lisp_variant in + NetBSD*) motif_variant=NetBSD ;; + OpenBSD*) motif_variant=OpenBSD ;; + *_darwin) motif_variant=Darwin ;; + sun4_solaris_gcc|sparc_gcc) motif_variant=solaris ;; + sun4_solaris_sunc|sparc_sunc|x86_solaris_sunc) motif_variant=solaris_sunc ;; + sun4c*) motif_variant=sun4c_411 ;; + hp700*) motif_variant=hpux_cc ;; + pmax_mach) motif_variant=pmax_mach ;; + sgi*) motif_variant=irix ;; + x86_linux|linux*) motif_variant=x86 ;; + esac + } + [ -f src/motif/server/Config.$motif_variant ] || quit "No such motif-variant could be found: Config.$motif_variant" + ;; +esac # Tell user what's we've configured -echo "Lisp = $LISP_VARIANT" -echo "Motif = $MOTIF_VARIANT" +echo "bld_dir=$bld_dir lisp_variant=$lisp_variant ${motif_variant:+motif_variant=$motif_variant}" # Create a directory tree that mirrors the source directory tree -TARGET="`echo $TARGET_DIR | sed 's:/*$::'`" -echo TARGET_DIR=$TARGET_DIR TARGET=$TARGET -find -L src -type d -print | sed "s:^src:$TARGET:g" | xargs -t mkdir -p +[ -e "$bld_dir" ] && quit "delete this: `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" + +top_dir=$PWD +cd $bld_dir/lisp || quit "Can't cd $bld_dir/lisp" # Link Makefile and Config files -(cd $TARGET/lisp && { - ln -s ../../src/lisp/GNUmakefile ../../src/lisp/Config.$LISP_VARIANT ../../src/lisp/Config.*_common . - ln -s Config.$LISP_VARIANT Config - } || { echo "Can't cd $TARGET/lisp"; exit 1; } +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 + ln -s ../../../src/motif/server/GNUmakefile ./Makefile + ln -s ../../../src/motif/server/Config.$motif_variant ./Config ) -# Create empty initial map file -echo 'Map file for lisp version 0' > $TARGET/lisp/lisp.nm - -# Create dummy internals.h so we get warned to recompile -echo '#error You need to run genesis (via build-world.sh) before compiling the startup code!' > $TARGET/lisp/internals.h - -SETENV=src/tools/setenv-scripts - -# Create sample setenv.lisp file -cat $SETENV/base-features.lisp > $TARGET/setenv.lisp - -# Put in some platform specific items -case $LISP_VARIANT in - *linux*) - gcname=":gencgc" - sed "s;@@gcname@@;$gcname;" $SETENV/linux-features.lisp >> $TARGET/setenv.lisp - ;; - *OpenBSD*) - case $LISP_VARIANT in - *_gencgc*) gcname=":gencgc" ;; - *) gcname=":cgc" ;; - esac - sed "s;@@gcname@@;$gcname;" $SETENV/openbsd-features.lisp >> $TARGET/setenv.lisp - ;; - *FreeBSD*|*freebsd*) - gcname=":gencgc" - sed "s;@@gcname@@;$gcname;" $SETENV/freebsd-features.lisp >> $TARGET/setenv.lisp - ;; - *solaris*) - cat $SETENV/solaris-features.lisp >> $TARGET/setenv.lisp - ;; - *) - sed "s;@@LISP@@;$LISP_VARIANT;" $SETENV/unknown.lisp >> $TARGET/setenv.lisp - ;; -esac - - -# Do Motif setup -if [ "$MOTIF_VARIANT" != "" ] -then - ( cd $TARGET/motif/server ; ln -s ../../../src/motif/server/GNUmakefile ./Makefile ) - ( cd $TARGET/motif/server ; ln -s ../../../src/motif/server/Config.$MOTIF_VARIANT ./Config ) -fi +echo 'Map file for lisp version 0' > lisp.nm # Empty initial map file +echo '#error You need to run genesis (via build-world.sh) before compiling the startup code!' > internals.h +( + setenv_dir=$top_dir/src/tools/setenv-scripts + cat $setenv_dir/base-features.lisp + case $lvshort in + linux|freebsd) gcname=":gencgc"; sed "s;@@gcname@@;$gcname;" $setenv_dir/$lvshort-features.lisp >> setenv.lisp;; + solaris) cat $setenv_dir/solaris-features.lisp;; + *) sed "s;@@LISP@@;$lisp_variant;" $setenv_dir/unknown.lisp;; + esac +) > setenv.lisp || quit "Failed create setenv.lisp" ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + tools/create-target.sh | 213 ++++++++++++++++++++---------------------------- 2 files changed, 88 insertions(+), 126 deletions(-) create mode 100644 .gitignore hooks/post-receive -- CMU Common Lisp

1 0