[Sbcl-commits] CVS: sbcl INSTALL, 1.33, 1.34 NEWS, 1.1776, 1.1777 install.sh, 1.35, 1.36 make.sh, 1.51, 1.52 slam.sh, 1.15, 1.16 version.lisp-expr, 1.4959, 1.4960

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31571

Modified Files:
	INSTALL NEWS install.sh make.sh slam.sh version.lisp-expr 
Log Message:
1.0.41.45: make.sh command-line parsing

 Based on patches by Daniel Herring:

 * Simple --option and --option=arg command-line parser in make.sh.

 * Supported options:

   ** --xc-host=<command> to specify XC host option instead of a
      positional argument. (Incompatible change!)

   ** --prefix=<path> to specify a non-standard install location for
      both build and install.sh.

      Addresses https://bugs.launchpad.net/sbcl/+bug/550889

   ** --help

 Semi-related minor cleanup:

 * Use --no-userinit and --no-sysinit instead of version.lisp-expr as
   the default inits for self-building: they have been around long
   enough now that it should not stop anyone from building, and makes
   for a somewhat less magical looking "//Build options: ..." line in
   the build log.


Index: INSTALL
===================================================================
RCS file: /cvsroot/sbcl/sbcl/INSTALL,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- INSTALL	8 Aug 2010 01:14:39 -0000	1.33
+++ INSTALL	15 Aug 2010 13:59:00 -0000	1.34
@@ -34,7 +34,11 @@
     $ INSTALL_ROOT=/home/me sh install.sh
 
   In other words, "install.sh" installs SBCL under the directory named
-  by the environment variable "INSTALL_ROOT".
+  by the environment variable INSTALL_ROOT.
+
+  If INSTALL_ROOT is not specified, SBCL is installed into location
+  configured at build-time: for official binary distributions under
+  "/usr/local" directory.
 
   If you install SBCL from binary distribution in other location than
   "/usr/local", see section 1.2, "Finding ancillary files".
@@ -114,13 +118,21 @@
 
     $ sh make.sh
 
+  To configure SBCL to install to a non-standard location, you can use
+  the --prefix option:
+
+    $ sh make.sh --prefix=/opt/mysbcl
+
+  This also sets the default SBCL_HOME to prefix/lib/sbcl/ for the
+  built binaries.
+
   If you don't already have an SBCL binary installed as "sbcl" on your
   system, you'll need to tell make.sh what Lisp to use as the
   cross-compilation host. For example, to use CMUCL (assuming has
   been installed under its default name "lisp") as the
   cross-compilation host:
 
-    $ sh make.sh 'lisp -batch -noinit'
+    $ sh make.sh --xc-host='lisp -batch -noinit'
 
   The build may take a long time, especially on older hardware. A
   successful build ends with a message beginning: "The build seems to

Index: NEWS
===================================================================
RCS file: /cvsroot/sbcl/sbcl/NEWS,v
retrieving revision 1.1776
retrieving revision 1.1777
diff -u -d -r1.1776 -r1.1777
--- NEWS	10 Aug 2010 10:59:04 -0000	1.1776
+++ NEWS	15 Aug 2010 13:59:00 -0000	1.1777
@@ -1,6 +1,12 @@
 ;;;; -*- coding: utf-8; fill-column: 78 -*-
 changes relative to sbcl-1.0.41
-  * optimization: the default implementation of
+  * build changes
+    ** Cross-compilation host is now specified to make.sh using
+       command-line argument --xc-host=<command> instead of a positional
+       argument. (thanks to Daniel Herring)
+    ** Install location can be specified to make.sh using command-line
+       argument --prefix=<path>. (lp#550889s, thanks to Daniel Herring)
+  * optimization: The default implementation of
     COMPUTE-DISCRIMINATING-FUNCTION does much less wasted work.
   * enhancement: Explicit memory barrier operations are now available for use
     by multithreaded code.  See documentation for details.

Index: install.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/install.sh,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- install.sh	15 Dec 2009 16:09:02 -0000	1.35
+++ install.sh	15 Aug 2010 13:59:00 -0000	1.36
@@ -10,12 +10,13 @@
     done;
 }
 
+. output/prefix.def
+DEFAULT_INSTALL_ROOT=$SBCL_PREFIX
+
 if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ] ; then
-    DEFAULT_INSTALL_ROOT="$PROGRAMFILES/sbcl"
     RUNTIME=sbcl.exe
     OLD_RUNTIME=sbcl.exe.old
 else
-    DEFAULT_INSTALL_ROOT=/usr/local
     RUNTIME=sbcl
     OLD_RUNTIME=sbcl.old
 fi

Index: make.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make.sh,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- make.sh	12 Apr 2009 14:03:08 -0000	1.51
+++ make.sh	15 Aug 2010 13:59:00 -0000	1.52
@@ -1,6 +1,10 @@
 #!/bin/sh
 set -e
 
+LANG=C
+LC_ALL=C
+export LANG LC_ALL
+
 # "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
 # starting from the same source to end up in the same result. That's
@@ -16,34 +20,128 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-# The value of SBCL_XC_HOST should be a command to invoke the
-# cross-compilation Lisp system in such a way that it reads commands
-# from standard input, and terminates when it reaches end of file on
-# standard input. Some suitable values are:
-#   "sbcl"        to use an existing SBCL binary as a cross-compilation host
-#   "sbcl --sysinit /dev/null --userinit /dev/null"
-#                 to use an existing SBCL binary as a cross-compilation host
-#                 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 --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
-#                 (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"
-#                 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
-# the present "sh make.sh foolisp".
+print_help="no"
+
+# 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. --no-foos
+# have now been available long enough that this should not stop anyone
+# from building.
+if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ]
+then
+    SBCL_PREFIX="$PROGRAMFILES/sbcl"
+else
+    SBCL_PREFIX="/usr/local"
+fi
+SBCL_XC_HOST="sbcl --disable-debugger --no-userinit --no-sysinit"
+export SBCL_XC_HOST
+
+# Parse command-line options.
+for option
+do
+  # Split --foo=bar into --foo and bar.
+  case $option in
+      *=*)
+        optarg=`expr "X$option" : '[^=]*=\(.*\)'`
+        option=`expr "X$option" : 'X\([^=]*\)=.*'`
+	;;
+      *)
+        optarg=""
+	;;
+  esac
+
+  case $option in
+      --help | -help | -h)
+	  print_help="yes" ;;
+      --prefix)
+	  SBCL_PREFIX=$optarg ;;
+      --xc-host)
+	  SBCL_XC_HOST=$optarg ;;
+
+  *)
+    echo "Unknown command-line option to $0: $option"
+    print_help="yes"
+  esac
+done
+
+if test "$print_help" = "yes"
+then
+  cat <<EOF
+\`make.sh' drives the SBCL build.
+
+Usage: $0 [OPTION]...
+
+  Important: make.sh does not currently control the entirety of the
+  build: configuration file customize-target-features.lisp and certain
+  environment variables play a role as well. see file INSTALL for
+  details.
+
+Options:
+  -h, --help           Display this help and exit.
+
+  --prefix=<path>      Specify the install location.
+
+      Script install.sh installs SBCL under the specified prefix
+      path: runtime as prefix/bin/sbcl, additional files under
+      prefix/lib/sbcl, and documentation under prefix/share.
+
+      This option also affects the binaries: built-in default for
+      SBCL_HOME is: prefix/lib/sbcl/
+
+      Default prefix is: /usr/local
+
+  --xc-host=<string>   Specify the Common Lisp compilation host.
+
+      The string provided should be a command to invoke the
+      cross-compilation Lisp system in such a way, that it reads
+      commands from standard input, and terminates when it reaches end
+      of file on standard input.
+
+      Examples:
+
+       "sbcl --disable-debugger --no-sysinit --no-userinit"
+                  Use an existing SBCL binary as a cross-compilation
+                  host 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. Also disable the debugger instead of
+                  waiting endlessly for a programmer to help it out
+                  with input on *DEBUG-IO*. (This is the default.)
+
+       "sbcl"
+                  Use an existing SBCL binary as a cross-compilation
+                  host, including your initialization files and
+                  building with the debugger enabled. Not recommended
+                  for casual users.
+
+       "lisp -noinit -batch"
+                  Use an existing CMU CL binary as a cross-compilation
+                  host when you have weird things in your .cmucl-init
+                  file.
+
+       "openmcl --batch"
+                  Use an OpenMCL binary as a cross-compilation host.
+
+       "clisp"
+                  Use a CLISP binary as a cross-compilation host.
+                  Note: historically clisp hosted builds have been
+                  frequently broken. While reports of this are always
+                  appreciated, bootstrapping another host is
+                  recommended.
+EOF
+  exit
+fi
+
+build_started=`date`
+echo "//Starting build: $build_started"
+# Apparently option parsing succeeded. Print out the results.
+echo "//Options: --prefix='$SBCL_PREFIX' --xc-host='$SBCL_XC_HOST'"
+
+# Save prefix for make and install.sh.
+echo "SBCL_PREFIX='$SBCL_PREFIX'" > output/prefix.def
+
 # FIXME: Tweak this script, and the rest of the system, to support
 # a second bootstrapping pass in which the cross-compilation host is
 # known to be SBCL itself, so that the cross-compiler can do some
@@ -53,29 +151,12 @@
 # whether the cross-compilation host returns suitable values from
 # UPGRADED-ARRAY-ELEMENT-TYPE?)
 
-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

Index: slam.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/slam.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- slam.sh	1 Mar 2010 16:51:17 -0000	1.15
+++ slam.sh	15 Aug 2010 13:59:00 -0000	1.16
@@ -80,7 +80,7 @@
            CORE="-core"
            ;;
     sbcl)  LISP="sbcl"
-           INIT="--sysinit version.lisp-expr --userinit version.lisp-expr"
+           INIT="--no-sysinit --no-userinit"
            CORE="--core"
            ;;
     clisp) LISP="clisp"

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.4959
retrieving revision 1.4960
diff -u -d -r1.4959 -r1.4960
--- version.lisp-expr	11 Aug 2010 14:59:01 -0000	1.4959
+++ version.lisp-expr	15 Aug 2010 13:59:00 -0000	1.4960
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.41.44"
+"1.0.41.45"