X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=install.sh;h=2e01c413a9144bac2b4e8b443b8a6e06f7b919ac;hb=829ced3e78a23ba153ba4db64e6ea6984c2313b6;hp=3f0ef26bb478d1b4723257181f8262fc4b6fb8e2;hpb=c05927ab82e234da99f8409038e7e338e36ddf8e;p=sbcl.git

diff --git a/install.sh b/install.sh
index 3f0ef26..2e01c41 100644
--- a/install.sh
+++ b/install.sh
@@ -1,20 +1,31 @@
 #!/bin/sh
+set -e
 
 # Install SBCL files into the usual places.
 
-ensure_dirs () 
+ensure_dirs ()
 {
-    for j in $*; do 
-	test -d $j || mkdir -p $j
+    for j in "$@"; do
+         test -d "$j" || mkdir -p "$j"
     done;
 }
 
-INSTALL_ROOT=${INSTALL_ROOT-/usr/local}
-MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
-INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info}
-DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl}
+. output/prefix.def
+DEFAULT_INSTALL_ROOT=$SBCL_PREFIX
 
-SBCL_SOURCE=`pwd`
+if [ "$OSTYPE" = "cygwin" -o "$OSTYPE" = "msys" ] ; then
+    RUNTIME=sbcl.exe
+    OLD_RUNTIME=sbcl.exe.old
+else
+    RUNTIME=sbcl
+    OLD_RUNTIME=sbcl.old
+fi
+INSTALL_ROOT=${INSTALL_ROOT-$DEFAULT_INSTALL_ROOT}
+MAN_DIR=${MAN_DIR-"$INSTALL_ROOT"/share/man}
+INFO_DIR=${INFO_DIR-"$INSTALL_ROOT"/share/info}
+DOC_DIR=${DOC_DIR-"$INSTALL_ROOT"/share/doc/sbcl}
+
+# Does the environment look sane?
 if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT.
    echo Aborting installation.  Unset one or reset the other, then try again
@@ -22,28 +33,47 @@ if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME="$SBCL_HOME"
    exit 1
 fi
-SBCL_HOME=$INSTALL_ROOT/lib/sbcl
+
+# Before doing anything else, make sure we have an SBCL to install
+if [ -f src/runtime/$RUNTIME ]; then
+    if [ -f output/sbcl.core ]; then
+        true
+    else
+        echo "output/sbcl.core not found, aborting installation."
+        exit 1
+    fi
+else
+    echo "src/runtime/$RUNTIME not found, aborting installation."
+    exit 1
+fi
+
+SBCL_HOME="$INSTALL_ROOT"/lib/sbcl
 export SBCL_HOME INSTALL_ROOT
-ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \
-    $BUILD_ROOT$INSTALL_ROOT/lib  \
-    $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \
-    $BUILD_ROOT$INFO_DIR $BUILD_ROOT$DOC_DIR \
-    $BUILD_ROOT$SBCL_HOME $BUILD_ROOT$SBCL_HOME/systems \
-    $BUILD_ROOT$SBCL_HOME/site-systems
+ensure_dirs "$BUILD_ROOT$INSTALL_ROOT" "$BUILD_ROOT$INSTALL_ROOT"/bin \
+    "$BUILD_ROOT$INSTALL_ROOT"/lib  \
+    "$BUILD_ROOT$MAN_DIR" "$BUILD_ROOT$MAN_DIR"/man1 \
+    "$BUILD_ROOT$INFO_DIR" "$BUILD_ROOT$DOC_DIR" \
+    "$BUILD_ROOT$DOC_DIR"/html \
+    "$BUILD_ROOT$SBCL_HOME" \
+    "$BUILD_ROOT$SBCL_HOME"/site-systems
 
 # move old versions out of the way.  Safer than copying: don't want to
 # break any running instances that have these files mapped
-test -f $BUILD_ROOT$INSTALL_ROOT/bin/sbcl && \
-    mv $BUILD_ROOT$INSTALL_ROOT/bin/sbcl $BUILD_ROOT$INSTALL_ROOT/bin/sbcl.old
-test -f $BUILD_ROOT$SBCL_HOME/sbcl.core && \
-    mv $BUILD_ROOT$SBCL_HOME/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core.old
+test -f "$BUILD_ROOT$INSTALL_ROOT"/bin/$RUNTIME && \
+ mv "$BUILD_ROOT$INSTALL_ROOT"/bin/$RUNTIME \
+    "$BUILD_ROOT$INSTALL_ROOT"/bin/$OLD_RUNTIME
+test -f "$BUILD_ROOT$SBCL_HOME"/sbcl.core && \
+    mv "$BUILD_ROOT$SBCL_HOME"/sbcl.core "$BUILD_ROOT$SBCL_HOME"/sbcl.core.old
 
-cp src/runtime/sbcl $BUILD_ROOT$INSTALL_ROOT/bin/
-cp output/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core
+cp src/runtime/$RUNTIME "$BUILD_ROOT$INSTALL_ROOT"/bin/
+cp output/sbcl.core "$BUILD_ROOT$SBCL_HOME"/sbcl.core
 
-# installing contrib 
+# installing contrib
 
-SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit /dev/null --sysinit /dev/null --disable-debugger"
+. ./sbcl-pwd.sh
+sbcl_pwd
+
+SBCL="$SBCL_PWD/src/runtime/sbcl --noinform --core $SBCL_PWD/output/sbcl.core --no-userinit --no-sysinit --disable-debugger"
 SBCL_BUILDING_CONTRIB=1
 export SBCL SBCL_BUILDING_CONTRIB
 
@@ -52,14 +82,14 @@ find_gnumake
 
 for i in contrib/*; do
     test -d $i && test -f $i/test-passed || continue;
-    INSTALL_DIR=$SBCL_HOME/`basename $i `
+    INSTALL_DIR="$SBCL_HOME"/`basename $i `
     export INSTALL_DIR
-    ensure_dirs $BUILD_ROOT$INSTALL_DIR && $GNUMAKE -C $i install
+    ensure_dirs "$BUILD_ROOT$INSTALL_DIR" && $GNUMAKE -C $i install
 done
 
 echo
 echo "SBCL has been installed:"
-echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl"
+echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/$RUNTIME"
 echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/"
 
 # Installing manual & misc bits of documentation
@@ -76,27 +106,46 @@ echo
 echo "Documentation:"
 
 # man
-cp doc/sbcl.1 $BUILD_ROOT$MAN_DIR/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1"
+cp doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1"
 
 # info
-INFO_FILE=doc/manual/sbcl.info
-test -f $INFO_FILE && cp $INFO_FILE $BUILD_ROOT$INFO_DIR/ \
-    && echo -n " info $BUILD_ROOT$INFO_DIR/sbcl.info" \
-    && ( install-info $BUILD_ROOT$INFO_DIR/sbcl.info > /dev/null 2>&1 \
-         || echo -n " (could not add to system catalog)" ) \
-    && echo
+for info in doc/manual/*.info
+do
+  cp $info "$BUILD_ROOT$INFO_DIR"/ \
+      && BN=`basename $info` \
+      && DIRFAIL=`install-info --info-dir="$BUILD_ROOT$INFO_DIR" \
+        "$BUILD_ROOT$INFO_DIR"/$BN > /dev/null 2>&1 \
+           || echo "(could not add to system catalog)"` \
+      && echo " info $BUILD_ROOT$INFO_DIR/`basename $info` [$BUILD_ROOT$INFO_DIR/dir] $DIRFAIL"
+done
+
+for info in doc/manual/*.info-*
+do
+  cp $info "$BUILD_ROOT$INFO_DIR"/ \
+      && echo " info $BUILD_ROOT$INFO_DIR/`basename $info`"
+done
 
 # pdf
-PDF_FILE=doc/manual/sbcl.pdf
-test -f $PDF_FILE && cp $PDF_FILE $BUILD_ROOT$DOC_DIR/ \
-    && echo " pdf $BUILD_ROOT$DOC_DIR/sbcl.pdf"
+for pdf in doc/manual/*.pdf
+do
+  cp $pdf "$BUILD_ROOT$DOC_DIR"/ \
+      && echo " pdf $BUILD_ROOT$DOC_DIR/`basename $pdf`"
+done
 
 # html
-HTMLS=doc/manual/sbcl
-test -d $HTMLS && cp -r $HTMLS $BUILD_ROOT$DOC_DIR/html \
-    && echo " html $BUILD_ROOT$DOC_DIR/html/index.html"
+for html in doc/manual/sbcl doc/manual/asdf
+do
+  test -d $html && cp -R -L $html "$BUILD_ROOT$DOC_DIR"/html \
+      && echo " html $BUILD_ROOT$DOC_DIR/html/`basename $html`/index.html"
+done
+
+for html in doc/manual/sbcl.html doc/manual/asdf.html
+do
+  cp $html "$BUILD_ROOT$DOC_DIR"/ \
+      && echo " html $BUILD_ROOT$DOC_DIR/`basename $html`"
+done
 
-for f in BUGS SUPPORT CREDITS COPYING NEWS
+for f in BUGS CREDITS COPYING NEWS
 do
-  cp $f $BUILD_ROOT$DOC_DIR/
+  cp $f "$BUILD_ROOT$DOC_DIR"/
 done