Commit 987c3f20 authored by Alex Goncharov's avatar Alex Goncharov
parents c78ad0fa 1e5b21e2
...@@ -1126,11 +1126,13 @@ ...@@ -1126,11 +1126,13 @@
(setf (default-directory) cwd)))) (setf (default-directory) cwd))))
(generate-comment (file-info) (generate-comment (file-info)
(let* ((name (pathname (source-info-stream file-info))) (let* ((name (pathname (source-info-stream file-info)))
(proc (run-git name))) (proc (run-git name))
(if (and proc (zerop (process-exit-code proc))) comment)
(if (and proc (zerop (process-exit-code proc))
(setf comment (read-line (process-output proc) nil nil)))
(format nil "$Header: ~A ~A $" (format nil "$Header: ~A ~A $"
(enough-namestring name) (enough-namestring name)
(read-line (process-output proc))) comment)
(second form))))) (second form)))))
(cond ((file-info-comment file) (cond ((file-info-comment file)
(compiler-warning _N"Ignoring extra file comment:~% ~S." form)) (compiler-warning _N"Ignoring extra file comment:~% ~S." form))
......
...@@ -63,21 +63,20 @@ if [ "$OLDLISP" = "" -a "$OLD8" = "" ]; then ...@@ -63,21 +63,20 @@ if [ "$OLDLISP" = "" -a "$OLD8" = "" ]; then
exit 1 exit 1
fi fi
VERSION=${VERSION:+-v "$VERSION"}
buildx86 () buildx86 ()
{ {
if [ -n "$OLD8" ]; then if [ -n "$OLD8" ]; then
# Build non-unicode versions # Build non-unicode versions
set -x 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 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" -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 set +x
fi fi
# Build the unicode versions # Build the unicode versions
if [ -n "$OLDLISP" ]; then if [ -n "$OLDLISP" ]; then
set -x 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 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" -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 set +x
fi fi
} }
...@@ -87,13 +86,13 @@ buildsun4 () ...@@ -87,13 +86,13 @@ buildsun4 ()
# Build non-unicode versions # Build non-unicode versions
if [ -n "$OLD8" ]; then if [ -n "$OLD8" ]; then
set -x 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 set +x
fi fi
# Build the unicode version. # Build the unicode version.
if [ -n "$OLDLISP" ]; then if [ -n "$OLDLISP" ]; then
set -x 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 set +x
fi fi
} }
......
...@@ -92,7 +92,7 @@ cd $bld_dir/lisp || quit "Can't cd $bld_dir/lisp" ...@@ -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 ../../src/lisp/GNUmakefile ../../src/lisp/Config.$lisp_variant ../../src/lisp/Config.*_common .
ln -s Config.$lisp_variant Config ln -s Config.$lisp_variant Config
[ -n "$motif_variant" ] && ( [ -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/GNUmakefile ./Makefile
ln -s ../../../src/motif/server/Config.$motif_variant ./Config ln -s ../../../src/motif/server/Config.$motif_variant ./Config
) )
......
...@@ -11,8 +11,10 @@ usage() ...@@ -11,8 +11,10 @@ usage()
SKIP_PCL= SKIP_PCL=
NO_PCL_FEATURE= NO_PCL_FEATURE=
# Default version is the date. # Default version is the date with the git hash.
VERSION="CVS Head `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:+ $GIT_HASH}"
echo $VERSION
while getopts "p" arg while getopts "p" arg
do do
...@@ -40,7 +42,7 @@ fi ...@@ -40,7 +42,7 @@ fi
# If version string give, use it, otherwise use the default. # If version string give, use it, otherwise use the default.
if [ -n "$2" ]; then if [ -n "$2" ]; then
VERSION=$2 VERSION="$2"
fi fi
$TARGET/lisp/lisp -core $TARGET/lisp/kernel.core <<EOF $TARGET/lisp/lisp -core $TARGET/lisp/kernel.core <<EOF
...@@ -57,6 +59,6 @@ $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 $NO_PCL_FEATURE
(load "target:tools/worldload") (load "target:tools/worldload")
$2 $VERSION
EOF EOF
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment