Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /config/releases/release-110.72/install.sh
ViewVC logotype

Diff of /config/releases/release-110.72/install.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

sml/trunk/config/install.sh revision 1923, Thu Apr 20 15:28:53 2006 UTC config/trunk/install.sh revision 2721, Tue Jun 12 16:43:58 2007 UTC
# Line 77  Line 77 
77  CONFIGDIR=$ROOT/config  CONFIGDIR=$ROOT/config
78  HEAPDIR=$BINDIR/.heap           # where heap images live  HEAPDIR=$BINDIR/.heap           # where heap images live
79  RUNDIR=$BINDIR/.run             # where executables (i.e., the RTS) live  RUNDIR=$BINDIR/.run             # where executables (i.e., the RTS) live
80  SRCDIR=$ROOT/src                # where the source tree is rooted  BASEDIR=$ROOT/base              # where the base source tree is rooted
81  LIBDIR=$INSTALLDIR/lib          # where libraries live  LIBDIR=$INSTALLDIR/lib          # where libraries live
82    
83  #  #
# Line 206  Line 206 
206  #  #
207  # create the various sub directories  # create the various sub directories
208  #  #
209  for dir in "$BINDIR" "$HEAPDIR" "$RUNDIR" "$LIBDIR" "$SRCDIR" ; do  for dir in "$BINDIR" "$HEAPDIR" "$RUNDIR" "$LIBDIR" "$BASEDIR" ; do
210      makedir "$dir"      makedir "$dir"
211  done  done
212    
# Line 228  Line 228 
228          cat "$CONFIGDIR"/"$dsrc" | \          cat "$CONFIGDIR"/"$dsrc" | \
229          sed -e "s,@SHELL@,$SHELL,g" \          sed -e "s,@SHELL@,$SHELL,g" \
230              -e "s,@BINDIR@,$BINDIR," \              -e "s,@BINDIR@,$BINDIR," \
231                -e "s,@LIBDIR@,$LIBDIR," \
232              -e "s,@VERSION@,$VERSION," \              -e "s,@VERSION@,$VERSION," \
233              -e "s,@CMDIRARC@,${CM_DIR_ARC:-dummy}," \              -e "s,@CMDIRARC@,${CM_DIR_ARC:-dummy}," \
234              > "$BINDIR"/"$ddst"              > "$BINDIR"/"$ddst"
# Line 295  Line 296 
296          MAKE=/usr/ccs/bin/make          MAKE=/usr/ccs/bin/make
297          ;;          ;;
298      linux)      linux)
299          EXTRA_DEFS=`$CONFIGDIR/chk-global-names.sh`          EXTRA_DEFS=`"$CONFIGDIR/chk-global-names.sh"`
300          if [ "$?" != "0" ]; then          if [ "$?" != "0" ]; then
301              complain "$this: !!! Problems checking for underscores in asm names."              complain "$this: !!! Problems checking for underscores in asm names."
302          fi          fi
# Line 316  Line 317 
317      vsay $this: Run-time system already exists.      vsay $this: Run-time system already exists.
318  else  else
319      "$CONFIGDIR"/unpack "$ROOT" runtime      "$CONFIGDIR"/unpack "$ROOT" runtime
320      cd "$SRCDIR"/runtime/objs      cd "$BASEDIR"/runtime/objs
321      echo $this: Compiling the run-time system.      echo $this: Compiling the run-time system.
322      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
323      if [ -x run.$ARCH-$OPSYS ]; then      if [ -x run.$ARCH-$OPSYS ]; then
# Line 335  Line 336 
336          complain "$this: !!! Run-time system build failed for some reason."          complain "$this: !!! Run-time system build failed for some reason."
337      fi      fi
338  fi  fi
339  cd "$SRCDIR"  cd "$BASEDIR"
340    
341  #  #
342  # boot the base SML system  # boot the base SML system
# Line 420  Line 421 
421  if [ $nolib = false ] ; then  if [ $nolib = false ] ; then
422      echo $this: Installing other libraries and programs:      echo $this: Installing other libraries and programs:
423      export ROOT INSTALLDIR CONFIGDIR BINDIR      export ROOT INSTALLDIR CONFIGDIR BINDIR
424        CM_TOLERATE_TOOL_FAILURES=true
425        export CM_TOLERATE_TOOL_FAILURES
426      if "$BINDIR"/sml -m \$smlnj/installer.cm      if "$BINDIR"/sml -m \$smlnj/installer.cm
427      then      then
428          vsay $this: Installation complete.          vsay $this: Installation complete.

Legend:
Removed from v.1923  
changed lines
  Added in v.2721

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