X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make.sh;h=12e77610dadd4930df5f16650c6745cca057b614;hb=57eae6573811f44abe167a9015116d95371543bb;hp=73b3295c56e5c4a98e74f431c820d790597bd3af;hpb=34dd23563d2f5cf05c72b971da0d0b065a09bf2a;p=sbcl.git diff --git a/make.sh b/make.sh index 73b3295..12e7761 100755 --- a/make.sh +++ b/make.sh @@ -1,4 +1,5 @@ -'#!/bin/sh +#!/bin/sh +set -e # "When we build software, it's a good idea to have a reliable method # for getting an executable from it. We want any two reconstructions @@ -25,15 +26,20 @@ # even though you have stuff in your initialization files # which makes it behave in such a non-standard way that # it keeps the build from working -# "sbcl --noprogrammer" +# "sbcl --disable-debugger" # to use an existing SBCL binary as a cross-compilation host -# and tell it to handle errors as best it can by itself, -# without trying to use *DEBUG-IO* to ask for help from -# the programmer +# and tell it to handle errors as best it can by itself +# (probably by dying with an error code) instead of waiting +# endlessly for a programmer to help it out with input +# on *DEBUG-IO* # "lisp -batch" to use an existing CMU CL binary as a cross-compilation host -# "lisp -noinit -batch" +# "lisp -noinit -batch" # to use an existing CMU CL binary as a cross-compilation host # when you have weird things in your .cmucl-init file +# "openmcl --batch" +# to use an OpenMCL binary as a cross-compilation host +# "clisp" +# to use a CLISP binary as a cross-compilation host # # FIXME: Make a more sophisticated command line parser, probably # accepting "sh make.sh --xc-host foolisp" instead of the @@ -44,15 +50,43 @@ # optimizations (especially specializable arrays) that it doesn't # know how to implement how in a portable way. (Or maybe that wouldn't # require a second pass, just testing at build-the-cross-compiler time -# whether the cross-compilation host returns suitable values from +# whether the cross-compilation host returns suitable values from # UPGRADED-ARRAY-ELEMENT-TYPE?) -export SBCL_XC_HOST="${1:-sbcl --noprogrammer}" + +LANG=C +LC_ALL=C +export LANG LC_ALL + +build_started=`date` +echo "//starting build: $build_started" + +if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ] ; then + DEVNULL=NUL +else + DEVNULL=/dev/null +fi +# The classic form here was to use --userinit $DEVNULL --sysinit +# $DEVNULL, but that doesn't work on Win32 because SBCL doesn't handle +# device names properly. We still need $DEVNULL to be NUL on Win32 +# because it's used elsewhere (such as canonicalize-whitespace), so we +# need an alternate solution for the init file overrides. It turns +# out that version.lisp-expr has no side effects from evaluation, so +# we may as well use that. +SBCL_XC_HOST="${1:-sbcl --disable-debugger --userinit version.lisp-expr --sysinit version.lisp-expr}" +export DEVNULL +export SBCL_XC_HOST echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\" +. ./find-gnumake.sh +find_gnumake + # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host # and target machines. -sh make-config.sh || exit 1 +sh make-config.sh + +# Enforce the source policy for no bogus whitespace +tools-for-build/canonicalize-whitespace # The make-host-*.sh scripts are run on the cross-compilation host, # and the make-target-*.sh scripts are run on the target machine. In @@ -66,17 +100,49 @@ sh make-config.sh || exit 1 # identify the target architecture). # On the host system: # SBCL_XC_HOST= sh make-host-1.sh -# Copy src/runtime/sbcl.h from the host system to the target system. +# Copy src/runtime/genesis/*.h from the host system to the target +# system. # On the target system: # sh make-target-1.sh -# Copy src/runtime/sbcl.nm from the target system to the host system. +# Copy src/runtime/sbcl.nm and output/stuff-groveled-from-headers.lisp +# from the target system to the host system. # On the host system: # SBCL_XC_HOST= sh make-host-2.sh # Copy output/cold-sbcl.core from the host system to the target system. # On the target system: -# sh make-host-2.sh -sh make-host-1.sh || exit 1 -sh make-target-1.sh || exit 1 -sh make-host-2.sh || exit 1 -sh make-target-2.sh || exit 1 -date +# sh make-target-2.sh +# sh make-target-contrib.sh +# Or, if you can set up the files somewhere shared (with NFS, AFS, or +# whatever) between the host machine and the target machine, the basic +# procedure above should still work, but you can skip the "copy" steps. +time sh make-host-1.sh +time sh make-target-1.sh +time sh make-host-2.sh +time sh make-target-2.sh +time sh make-target-contrib.sh + +NCONTRIBS=`find contrib -name Makefile -print | wc -l` +NPASSED=`find contrib -name test-passed -print | wc -l` +echo +echo "The build seems to have finished successfully, including $NPASSED (out of $NCONTRIBS)" +echo "contributed modules. If you would like to run more extensive tests on" +echo "the new SBCL, you can try:" +echo +echo " cd tests && sh ./run-tests.sh" +echo +echo " (All tests should pass on x86/Linux, x86/FreeBSD4, and ppc/Darwin. On" +echo " other platforms some failures are currently expected; patches welcome" +echo " as always.)" +echo +echo "To build documentation:" +echo +echo " cd doc/manual && make" +echo +echo "To install SBCL (more information in INSTALL):" +echo +echo " sh install.sh" + +build_finished=`date` +echo +echo "//build started: $build_started" +echo "//build finished: $build_finished"