Commit 53c51f90 authored by Raymond Toy's avatar Raymond Toy
Browse files

Merge branch 'RELEASE-20C-BRANCH' of... 

Merge branch 'RELEASE-20C-BRANCH' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl into RELEASE-20C-BRANCH
parents 9d35a2a1 8a34f6c1

code/pprint.lisp

+2 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,8 @@ When annotations are present, invoke them at the right positions." 
    (new-assem:without-scheduling pprint-with-like)

    (vm::with-fixed-allocation 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 ()

  (setf *initial-pprint-dispatch* (make-pprint-dispatch-table))

tools/build-all.sh

+6 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ do 
      C) CREATE_OPT="$OPTARG" ;;

      o) OLDLISP="$OPTARG" ;;

      8) OLD8="$OPTARG" ;;

      v) VERSION="$OPTARG" ;;

      v) VERSION="$OPTARG"; VERSION_SET=true ;;

      U) UPDATE_TRANS="-U" ;;

      P) UPDATE_POT="" ;;

      \?) usage ;;
@@ -83,16 +83,19 @@ buildx86 () 


buildsun4 ()

{

    if [ "$VERSION_SET" = true ]; then

      VERS="-v '"$VERSION"'"

    fi

    # Build non-unicode versions

    if [ -n "$OLD8" ]; then

	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

    fi

    # Build the unicode version.

    if [ -n "$OLDLISP" ]; then

	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

    fi

}

tools/create-target.sh

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ esac 
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

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

(cd src && find . -name .git -prune -o -type d -print) | (cd $bld_dir && xargs mkdir -p) ||

quit "Can't create target directories"