SCM Repository

[smlnj] Diff of /sml/trunk/config/install.sh

[smlnj] / sml / trunk / config / install.sh

Diff of /sml/trunk/config/install.sh

-revision 515, Sun Jan  9 09:59:14 2000 UTC
+revision 537, Fri Feb 18 17:20:16 2000 UTC
 Line 2
  #
  # Copyright (c) 1994 AT&T Bell Laboratories.
  #
- # installation script for SML/NJ and related tools; this is a temporary
+ # Installation script for SML/NJ and related tools; this is a temporary
  # placeholder until the configuration tool is finished.
  #
+ # Significant changes to accommodate (and take advantage of) the new CM
- #set -x
+ # by M.Blume (2/2000).
+ #
  #
  # get the target list
-Line 27
+Line 28
  cp config/preloads preloads.standard
  #
- # some OSs have make in strange places
+ # Some OSs have make in strange places, but most of the time it is
+ # simply on the PATH:
  #
  MAKE=make
- #
- # check for ksh
- #
- # ksh causes some people problems so we will always use /bin/sh
- #
- #echo "checking for ksh"
- #if [ -x /bin/ksh ]; then
- #  SHELL=/bin/ksh
- #elif [ -x /usr/local/bin/ksh ]; then
- #  SHELL=/usr/local/bin/ksh
- #else
    SHELL=/bin/sh
- #fi
  echo Using shell $SHELL.
  #
-Line 68
+Line 58
  LOCALPATHCONFIG=$INSTALLDIR/pathconfig # a temporary pathconfig file
  #
- # the paths to ml-yacc, ml-burg, and ml-lex; needed to configure CM
+ # the path to the dir where ml-yacc, ml-burg, ml-lex, and ml-build live
  #
- YACCPATH=$BINDIR/ml-yacc
+ TOOLDIR=$BINDIR
- LEXPATH=$BINDIR/ml-lex
- BURGPATH=$BINDIR/ml-burg
  #
  # set the CM configuration variables (these are environment variables
  # that will be queried by the bootstrap code)
  # Especially important is CM_PATHCONFIG_DEFAULT.
  #
- CM_YACC_DEFAULT=$YACCPATH
- CM_LEX_DEFAULT=$LEXPATH
- CM_BURG_DEFAULT=$BURGPATH
  CM_PATHCONFIG_DEFAULT=$LIBDIR/pathconfig
- export CM_YACC_DEFAULT CM_LEX_DEFAULT CM_BURG_DEFAULT CM_PATHCONFIG_DEFAULT
+ export CM_PATHCONFIG_DEFAULT
  #
  # the release version that we are installing
-Line 116
+Line 101
  #     different suffixes to determine what kind of de-compression is to
  #     be used)
  unpack() {
-     if [ ! -d $2/$3 ]; then
+     if [ -d $2/$3 ]; then
-         echo Unpacking $1 source files.
+         echo "The $1 source tree already exists."
+     else
+         echo "Unpacking $1 source archive."
          cd $2
          if [ -r $4.tar.Z ] ; then
              zcat $4.tar.Z | tar -xf -
-Line 132
+Line 119
          elif [ -r $4.tz ] ; then
              zcat $4.tz | tar -xf -
          else
-             echo "!!! The $1 source files are missing."
+             echo "!!! The $1 source archive is missing."
              exit 1
          fi
          if [ ! -d $2/$3 ]; then
-             echo "!!! Unable to unpack $1 source files."
+             echo "!!! Unable to unpack $1 source archive."
              exit 1
          fi
      fi
-Line 156
+Line 143
  movelibs() {
      for lib in `/bin/ls $1/CM/$ARCH-unix` ; do
          case $lib in
-         *.cm)
+         *.cm | *.cmi)
              if [ $lib != $2 ] ; then
                  echo "! Warning:" $lib specified relative to $2
              fi
-Line 245
+Line 232
      makedir $dir
  done
  #
  # install the script that tests the architecture, and make sure that it works
  #
  if [ -x $BINDIR/.arch-n-opsys ]; then
    echo Script $BINDIR/.arch-n-opsys already exists.
  else
-   cat $CONFIGDIR/_arch-n-opsys | sed -e "s,@SHELL@,$SHELL,g" > $BINDIR/.arch-n-opsys
+     cat $CONFIGDIR/_arch-n-opsys \
+     | sed -e "s,@SHELL@,$SHELL,g" > $BINDIR/.arch-n-opsys
    chmod 555 $BINDIR/.arch-n-opsys
    if [ ! -x $BINDIR/.arch-n-opsys ]; then
-     echo "!!! Installation of $BINDIR/.arch-n-opsys failed for some reason."
+         echo "!!! Installation of $BINDIR/.arch-n-opsys failed."
      exit 1
    fi
  fi
  ARCH_N_OPSYS=`$BINDIR/.arch-n-opsys`
  if [ "$?" != "0" ]; then
    echo "!!! Script $BINDIR/.arch-n-opsys fails on this machine."
-Line 269
+Line 257
  fi
  eval $ARCH_N_OPSYS
- if [ -x $BINDIR/.run-sml ]; then
+ #
-   echo Script $BINDIR/.run-sml already exists.
+ # Function to install a "driver" script...
- else
+ #   This takes care of patching the source of the script with the SHELL,
-   cat $CONFIGDIR/_run-sml | \
+ #   BINDIR, and VERSION variables to use.
-     sed -e "s,@SHELL@,$SHELL,g" -e "s,@BINDIR@,$BINDIR," -e "s,@VERSION@,$VERSION," \
+ #
-     > $BINDIR/.run-sml
+ installdriver() {
-   chmod 555 $BINDIR/.run-sml
+     dsrc=$1
-   if [ ! -x $BINDIR/.run-sml ]; then
+     ddst=$2
-     echo "!!! Installation of $BINDIR/.run-sml failed for some reason."
+     if [ -x $BINDIR/$ddst ]; then
+         echo Script $BINDIR/$ddst already exists.
+     else
+         cat $CONFIGDIR/$dsrc | \
+         sed -e "s,@SHELL@,$SHELL,g" \
+             -e "s,@BINDIR@,$BINDIR," \
+             -e "s,@VERSION@,$VERSION," \
+             > $BINDIR/$ddst
+         chmod 555 $BINDIR/$ddst
+         if [ ! -x $BINDIR/$ddst ]; then
+             echo "!!! Installation of $BINDIR/${ddst} failed."
      exit 1
    fi
  fi
+ }
+ installdriver _run-sml .run-sml
+ installdriver _link-sml .link-sml
+ installdriver _ml-build ml-build
  #
  # set some architecture dependent run-time system flags
  #
  case $ARCH in
-   mips*) ALLOC=1M ;;
+     mips*)
+         ALLOC=1M
+         ;;
    x86)
      ALLOC=256k
    ;;
-Line 297
+Line 302
      ALLOC=512k
    ;;
  esac
  case $OPSYS in
    solaris)
      MAKE=/usr/ccs/bin/make
-Line 317
+Line 323
  BOOT_FILES=sml.boot.$ARCH-unix
  #
+ # files to be deleted after we are done...
+ #
+ tmpfiles=""
+ tmpfiles="$tmpfiles $ROOT/preloads.standard"
+ tmpfiles="$tmpfiles $ROOT/$LIBLIST"
+ tmpfiles="$tmpfiles $ROOT/$LOCALPATHCONFIG"
+ tmpfiles="$tmpfiles $ROOT/$LIBMOVESCRIPT"
+ #
+ # also remove the boot dir because it won't have anything interesting in
+ # it after we are successful...
+ #
+ tmpfiles="$tmpfiles $ROOT/$BOOT_FILES"
+ #
+ # make sure we always clean up after ourselves...
+ #
+ trap 'rm -rf $tmpfiles' 0 1 2 3 15
+ #
  # build the run-time system
  #
  unpack "run-time" $SRCDIR runtime $ROOT/$VERSION-runtime
- if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+ if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+     echo Run-time system already exists.
+ else
    cd $SRCDIR/runtime/objs
    echo Compiling the run-time system.
    $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
-Line 341
+Line 367
    echo Heap image $HEAPDIR/sml.$HEAP_SUFFIX already exists.
  else
    unpack bin $ROOT $BOOT_FILES $ROOT/$VERSION-$BOOT_FILES
-   cd $ROOT
+     cd $ROOT/$BOOT_FILES
-   if $RUNDIR/run.$ARCH-$OPSYS @SMLheap=sml \
+     if $BINDIR/.link-sml @SMLheap=$ROOT/sml @SMLboot=BOOTLIST @SMLalloc=$ALLOC
-         @SMLboot=$ROOT/$BOOT_FILES @SMLrtpid=`cat $BOOT_FILES/RTPID` \
-         @SMLalloc=$ALLOC
    then
+         cd $ROOT
      if [ -r sml.$HEAP_SUFFIX ]; then
          mv sml.$HEAP_SUFFIX $HEAPDIR
          cd $BINDIR
          ln -s .run-sml sml
          #
          # Now move all stable libraries to #LIBDIR and generate
          # the pathconfig file.
          #
          cd $ROOT/$BOOT_FILES
          for lib in *.cm ; do
              echo $lib $LIBDIR/$lib >>$CM_PATHCONFIG_DEFAULT
-Line 396
+Line 419
          ;;
        ml-yacc)
          standalone ml-yacc ML-Yacc src
+         echo ml-yacc $TOOLDIR >>$CM_PATHCONFIG_DEFAULT
          ;;
        ml-lex)
          standalone ml-lex ML-Lex
+         echo ml-lex $TOOLDIR >>$CM_PATHCONFIG_DEFAULT
          ;;
        ml-burg)
          standalone ml-burg ML-Burg
+         echo ml-burg $TOOLDIR >>$CM_PATHCONFIG_DEFAULT
          ;;
        smlnj-lib)
          unpack "SML/NJ Library" $SRCDIR smlnj-lib $ROOT/$VERSION-smlnj-lib
-Line 461
+Line 487
      echo "!!! Something went wrong when compiling the libraries."
      exit 1
  fi
- rm -f $LIBLIST $LOCALPATHCONFIG
  #
  # Finally, move the libraries to their final locations...
-Line 470
+Line 495
  if [ -r $LIBMOVESCRIPT ] ; then
      echo Moving libraries to $LIBDIR.
      . $LIBMOVESCRIPT
-     rm -f $LIBMOVESCRIPT
  fi
- #
+ exit 0
- # Get rid of preloads.standard
- #
- rm -f $ROOT/preloads.standard

 Legend:



Removed from v.515
 


changed lines


 
Added in v.537
 Legend:



Removed from v.515
 


changed lines


 
Added in v.537
-Removed from v.515
+Added in v.537

root@smlnj-gforge.cs.uchicago.edu	ViewVC Help
Powered by ViewVC 1.0.0