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 /sml/trunk/src/system/smlnj/installer/libinstall.sml
ViewVC logotype

Diff of /sml/trunk/src/system/smlnj/installer/libinstall.sml

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

revision 1408, Tue Oct 28 22:28:00 2003 UTC revision 1409, Mon Nov 3 22:00:35 2003 UTC
# Line 18  Line 18 
18      (* all filenames that are passed as arguments use native syntax: *)      (* all filenames that are passed as arguments use native syntax: *)
19      val proc :      val proc :
20          { smlnjroot: string,          { smlnjroot: string,
21              installdir: string,
22            buildcmd: string,            buildcmd: string,
23            instcmd : string -> unit,            instcmd : string -> unit,
24            unpackcmd: string option } -> unit            unpackcmd: string option } -> unit
# Line 121  Line 122 
122          handle _ => false          handle _ => false
123    
124      (* our main routine *)      (* our main routine *)
125      fun proc { smlnjroot, buildcmd, instcmd, unpackcmd } = let      fun proc { smlnjroot, installdir, buildcmd, instcmd, unpackcmd } = let
126          val smlnjroot = F.fullPath smlnjroot          val smlnjroot = F.fullPath smlnjroot
127            val installdir = F.fullPath installdir
128          val configdir = P.concat (smlnjroot, "config")          val configdir = P.concat (smlnjroot, "config")
129    
130          (* dependency file: config/dependencies *)          (* dependency file: config/dependencies *)
# Line 173  Line 175 
175                          else fail ["unpacking failed\n"]                          else fail ["unpacking failed\n"]
176                      end                      end
177    
178          val libdir = P.concat (smlnjroot, "lib")          val libdir = P.concat (installdir, "lib")
179          val srcdir = P.concat (smlnjroot, "src")          val srcdir = P.concat (smlnjroot, "src")
180          val bindir = P.concat (smlnjroot, "bin")          val bindir = P.concat (installdir, "bin")
181          val heapdir = P.concat (bindir, ".heap")          val heapdir = P.concat (bindir, ".heap")
182          val cm_pathconfig = P.concat (libdir, "pathconfig")          val cm_pathconfig = P.concat (libdir, "pathconfig")
183    
# Line 355  Line 357 
357            | one "pgraph-util" =            | one "pgraph-util" =
358              (r ("pgraph-util.cm", "pgraph-util.cm", "cm/pgraph"))              (r ("pgraph-util.cm", "pgraph-util.cm", "cm/pgraph"))
359            | one "mlrisc" =            | one "mlrisc" =
360              (a ("Control.cm", "lib/SMLNJ-MLRISC");              (a ("Control.cm", P.concat (libdir, "SMLNJ-MLRISC"));
361               a ("Lib.cm", "lib/SMLNJ-MLRISC");               a ("Lib.cm", P.concat (libdir, "SMLNJ-MLRISC"));
362               a ("Visual.cm", "lib/SMLNJ-MLRISC");               a ("Visual.cm", P.concat (libdir, "SMLNJ-MLRISC"));
363               a ("MLRISC.cm", "lib/SMLNJ-MLRISC");               a ("MLRISC.cm", P.concat (libdir, "SMLNJ-MLRISC"));
364               a ("MLTREE.cm", "lib/SMLNJ-MLRISC");               a ("MLTREE.cm", P.concat (libdir, "SMLNJ-MLRISC"));
365               a ("Graphs.cm", "lib/SMLNJ-MLRISC");               a ("Graphs.cm", P.concat (libdir, "SMLNJ-MLRISC"));
366               a ("IA32.cm", "lib/SMLNJ-MLRISC");               a ("IA32.cm", P.concat (libdir, "SMLNJ-MLRISC"));
367               a ("Peephole.cm", "src/MLRISC/cm");               a ("Peephole.cm", "src/MLRISC/cm");
368               r' ("OTHER-MLRISC", "RA.cm", "MLRISC/cm", "SMLNJ-MLRISC");               r' ("OTHER-MLRISC", "RA.cm", "MLRISC/cm", "SMLNJ-MLRISC");
369               r' ("OTHER-MLRISC", "Peephole.cm", "MLRISC/cm", "SMLNJ-MLRISC");               r' ("OTHER-MLRISC", "Peephole.cm", "MLRISC/cm", "SMLNJ-MLRISC");

Legend:
Removed from v.1408  
changed lines
  Added in v.1409

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