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

diff --git a/install.sh b/install.sh
index 3f0ef26..51f8634 100644
--- a/install.sh
+++ b/install.sh
@@ -1,11 +1,12 @@
 #!/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;
 }
 
@@ -14,6 +15,7 @@ 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?
 SBCL_SOURCE=`pwd`
 if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT.
@@ -22,26 +24,51 @@ if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME="$SBCL_HOME"
    exit 1
 fi
+
+# Before doing anything else, make sure we have an SBCL to install
+if [ -f src/runtime/sbcl ]; then
+    if [ -f output/sbcl.core ]; then
+        true
+    else
+        echo "output/sbcl.core not found, aborting installation."
+        exit 1
+    fi
+else
+    echo "src/runtime/sbcl 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$DOC_DIR/html \
+    $BUILD_ROOT$SBCL_HOME \
     $BUILD_ROOT$SBCL_HOME/site-systems
 
+if [ "$OSTYPE" = "msys" ]
+then 
+    RUNTIME=sbcl.exe
+    OLD_RUNTIME=sbcl_old.exe
+else
+    RUNTIME=sbcl
+    OLD_RUNTIME=sbcl.old
+fi
+
 # 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$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
 
-# installing contrib 
+# installing contrib
 
 SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit /dev/null --sysinit /dev/null --disable-debugger"
 SBCL_BUILDING_CONTRIB=1
@@ -79,22 +106,28 @@ echo "Documentation:"
 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/ \
+      && echo -n " info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir" \
+      && ( install-info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir > /dev/null 2>&1 \
+           || echo -n " (could not add to system catalog)" ) \
+      && echo
+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 f in BUGS SUPPORT CREDITS COPYING NEWS
 do