Commit 79c5fb07 authored by rtoy's avatar rtoy
Browse files

Add -w option to allow user to specify a different script instead of

the default build-world.sh.  (Requested by Alex G.)
parent db99ef32
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
# #
# For more information see src/BUILDING. # For more information see src/BUILDING.
# #
# $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/build.sh,v 1.31 2010/08/01 01:18:36 rtoy Exp $ # $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/build.sh,v 1.32 2010/08/31 22:24:09 rtoy Exp $
# #
ENABLE2="yes" ENABLE2="yes"
...@@ -88,7 +88,7 @@ usage () ...@@ -88,7 +88,7 @@ usage ()
echo ' -f mode FPU mode: x87, sse2, or auto. Default is auto' echo ' -f mode FPU mode: x87, sse2, or auto. Default is auto'
echo ' -P On the last build, generate cmucl.pot' echo ' -P On the last build, generate cmucl.pot'
echo " -? This help message" echo " -? This help message"
echo " -w Specify a different build-world.sh script"
exit 1 exit 1
} }
...@@ -118,11 +118,11 @@ buildit () ...@@ -118,11 +118,11 @@ buildit ()
if [ "$ENABLE" = "yes" ]; if [ "$ENABLE" = "yes" ];
then then
$TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; } $TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; }
time $TOOLDIR/build-world.sh $TARGET $OLDLISP $BOOT || { echo "Failed: $TOOLDIR/build-world.sh"; exit 1; } time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
$MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; }
if [ "$BUILD_WORLD2" = "yes" ]; if [ "$BUILD_WORLD2" = "yes" ];
then then
$TOOLDIR/build-world.sh $TARGET $OLDLISP $BOOT || { echo "Failed: $TOOLDIR/build-world.sh"; exit 1; } $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
fi fi
$TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; } $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; }
...@@ -132,7 +132,9 @@ buildit () ...@@ -132,7 +132,9 @@ buildit ()
} }
FPU_MODE= FPU_MODE=
while getopts "123Po:b:v:uB:C:i:f:?" arg BUILDWORLD="$TOOLDIR/build-world.sh"
while getopts "123Po:b:v:uB:C:i:f:w:?" arg
do do
case $arg in case $arg in
1) ENABLE2="no" ;; 1) ENABLE2="no" ;;
...@@ -148,6 +150,7 @@ do ...@@ -148,6 +150,7 @@ do
i) INTERACTIVE_BUILD="$OPTARG" ;; i) INTERACTIVE_BUILD="$OPTARG" ;;
f) FPU_MODE="-fpu $OPTARG" ;; f) FPU_MODE="-fpu $OPTARG" ;;
P) BUILD_POT=yes ;; P) BUILD_POT=yes ;;
w) BUILDWORLD="$OPTARG" ;;
\?) usage \?) usage
;; ;;
esac esac
......
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