Skip to content
Snippets Groups Projects
Commit 22a72422 authored by Raymond Toy's avatar Raymond Toy
Browse files
parents 9de92cad 77e3035a
No related branches found
No related tags found
No related merge requests found
...@@ -1945,7 +1945,8 @@ When annotations are present, invoke them at the right positions." ...@@ -1945,7 +1945,8 @@ When annotations are present, invoke them at the right positions."
(new-assem:without-scheduling pprint-with-like) (new-assem:without-scheduling pprint-with-like)
(vm::with-fixed-allocation pprint-with-like) (vm::with-fixed-allocation pprint-with-like)
(kernel::number-dispatch pprint-with-like) (kernel::number-dispatch pprint-with-like)
(stream::with-stream-class pprint-with-like))) (stream::with-stream-class pprint-with-like)
(lisp::with-array-data pprint-with-like)))
(defun pprint-init () (defun pprint-init ()
(setf *initial-pprint-dispatch* (make-pprint-dispatch-table)) (setf *initial-pprint-dispatch* (make-pprint-dispatch-table))
......
...@@ -46,7 +46,7 @@ do ...@@ -46,7 +46,7 @@ do
C) CREATE_OPT="$OPTARG" ;; C) CREATE_OPT="$OPTARG" ;;
o) OLDLISP="$OPTARG" ;; o) OLDLISP="$OPTARG" ;;
8) OLD8="$OPTARG" ;; 8) OLD8="$OPTARG" ;;
v) VERSION="$OPTARG" ;; v) VERSION="$OPTARG"; VERSION_SET=true ;;
U) UPDATE_TRANS="-U" ;; U) UPDATE_TRANS="-U" ;;
P) UPDATE_POT="" ;; P) UPDATE_POT="" ;;
\?) usage ;; \?) usage ;;
...@@ -83,16 +83,19 @@ buildx86 () ...@@ -83,16 +83,19 @@ buildx86 ()
buildsun4 () buildsun4 ()
{ {
if [ "$VERSION_SET" = true ]; then
VERS="-v '"$VERSION"'"
fi
# 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:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -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:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" src/tools/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP"
set +x set +x
fi fi
} }
......
...@@ -40,6 +40,7 @@ uname_m=`uname -m 2>/dev/null` ...@@ -40,6 +40,7 @@ uname_m=`uname -m 2>/dev/null`
i386) lisp_variant=x86_darwin ;; i386) lisp_variant=x86_darwin ;;
esac esac
;; ;;
NetBSD) lisp_variant=x86_netbsd ;;
*) quit "Unsupported OS: $uname_s";; *) quit "Unsupported OS: $uname_s";;
esac esac
} }
...@@ -80,7 +81,7 @@ esac ...@@ -80,7 +81,7 @@ esac
diag "Settings: 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 # Create a directory tree that mirrors the source directory tree
[ -e "$bld_dir" ] && quit "Exists: `ls -ld $bld_dir`" [ -d "$bld_dir" -o -f "$bld_dir" ] && quit "Exists: `ls -ld $bld_dir`"
mkdir -p "$bld_dir" mkdir -p "$bld_dir"
(cd src && find . -name .git -prune -o -type d -print) | (cd $bld_dir && xargs mkdir -p) || (cd src && find . -name .git -prune -o -type d -print) | (cd $bld_dir && xargs mkdir -p) ||
quit "Can't create target directories" quit "Can't create target directories"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment