From: Gábor M. <me...@us...> - 2008-10-31 09:56:23
|
Update of /cvsroot/sbcl/sbcl In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19432 Modified Files: run-sbcl.sh version.lisp-expr Log Message: 1.0.22.1: run-sbcl.sh improvements - make run-sbcl.sh executable - don't require it to be started from the top of the source dir ... so that "~/sbcl/run-sbcl.sh" is a drop in replacement for "sbcl". Index: run-sbcl.sh =================================================================== RCS file: /cvsroot/sbcl/sbcl/run-sbcl.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- run-sbcl.sh 6 Oct 2008 09:16:47 -0000 1.3 +++ run-sbcl.sh 31 Oct 2008 09:56:15 -0000 1.4 @@ -1,6 +1,6 @@ +#!/bin/sh # A simple shell-script to run the freshly build SBCL without -# installing it. Expects to be run from the top of the SBCL source -# tree. +# installing it. # This software is part of the SBCL system. See the README file for # more information. @@ -20,24 +20,16 @@ echo "installation. Except for --help and --core, accepts all the same" echo "command-line options as SBCL does." echo - echo "Expects the current directory to be the topmost directory of the SBCL" - echo "source tree or binary tarball." - echo exit 1 fi -if [ -f sbcl-pwd.sh -a -x src/runtime/sbcl -a -f output/sbcl.core ]; then - . ./sbcl-pwd.sh - sbcl_pwd - echo "(running SBCL from: $SBCL_PWD)" - SBCL_HOME=$SBCL_PWD/contrib src/runtime/sbcl --core output/sbcl.core "$@" -elif [ -f run-sbcl.sh -a -f version.lisp-expr ]; then - echo "No built SBCL here ($(pwd)): run 'sh make.sh' first!" - exit 1 +BASE=`dirname "$0"` + +if [ -x "$BASE"/src/runtime/sbcl -a -f "$BASE"/output/sbcl.core ]; then + echo "(running SBCL from: $BASE)" + SBCL_HOME="$BASE"/contrib \ + "$BASE"/src/runtime/sbcl --core "$BASE"/output/sbcl.core "$@" else - echo "No SBCL here ($(pwd))!" - echo - echo "run-sbcl.sh needs to be run from the top of the SBCL source tree or" - echo "binary tarball." + echo "No built SBCL here ($BASE): run 'sh make.sh' first!" exit 1 fi Index: version.lisp-expr =================================================================== RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v retrieving revision 1.4142 retrieving revision 1.4143 diff -u -d -r1.4142 -r1.4143 --- version.lisp-expr 30 Oct 2008 21:58:46 -0000 1.4142 +++ version.lisp-expr 31 Oct 2008 09:56:15 -0000 1.4143 @@ -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.22" +"1.0.22.1" |