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

[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 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 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 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