Date: Wednesday, October 27, 2010 @ 20:01:46 Author: rtoy Path: /project/cmucl/cvsroot/src/tools
Modified: build-all.sh
Handle -C option better, especially when given -C "" to denote the default config.
--------------+ build-all.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
Index: src/tools/build-all.sh diff -u src/tools/build-all.sh:1.1 src/tools/build-all.sh:1.2 --- src/tools/build-all.sh:1.1 Thu Oct 14 13:48:26 2010 +++ src/tools/build-all.sh Wed Oct 27 20:01:46 2010 @@ -35,14 +35,14 @@
VERSION="CVS Head `date '+%Y-%m-%d %H:%M:%S'`" BASE=build +CREATE_OPT=""
while getopts "Ub:v:C:o:8:?" arg do case $arg in b) BASE="$OPTARG" ;; B) bootfiles="$bootfiles -B $OPTARG" ;; - C) CREATE_OPT="-C $OPTARG" - CREATE_DIRS=yes ;; + C) CREATE_OPT="$OPTARG" ;; o) OLDLISP="$OPTARG" ;; 8) OLD8="$OPTARG" ;; v) VERSION="$OPTARG" ;; @@ -66,15 +66,15 @@ if [ -n "$OLD8" ]; then # Build non-unicode versions set -x - src/tools/build.sh -f x87 -b ${BASE}-8bit $bootfiles -v "$VERSION" ${CREATE_OPT} ${UPDATE_TRANS} -o "$OLD8" - src/tools/build.sh -f sse2 -b ${BASE}-8bit $bootfiles -v "$VERSION" ${CREATE_OPT} ${UPDATE_TRANS} -o "$OLD8" + 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" set +x fi # Build the unicode versions if [ -n "$OLDLISP" ]; then set -x - src/tools/build.sh -f x87 -b ${BASE} $bootfiles -v "$VERSION" ${CREATE_OPT} ${UPDATE_TRANS} -o "$OLDLISP" - src/tools/build.sh -f sse2 -b ${BASE} $bootfiles -v "$VERSION" ${CREATE_OPT} ${UPDATE_TRANS} -o "$OLDLISP" + 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" set +x fi } @@ -84,13 +84,13 @@ # Build non-unicode versions if [ -n "$OLD8" ]; then set -x - src/tools/build.sh -b ${BASE}-8bit $bootfiles -v "$VERSION" ${CREATE_OPT} ${UPDATE_TRANS} -o "$OLD8" + src/tools/build.sh -b ${BASE}-8bit $bootfiles -v "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} -o "$OLD8" set +x fi # Build the unicode version. if [ -n "$OLDLISP" ]; then set -x - src/tools/build.sh -b ${BASE} $bootfiles -v "$VERSION" ${CREATE_OPT} ${UPDATE_TRANS} -o "$OLDLISP" + src/tools/build.sh -b ${BASE} $bootfiles -v "$VERSION" -C "$CREATE_OPT" ${UPDATE_TRANS} -o "$OLDLISP" set +x fi }