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 1724, Mon Dec 13 20:45:51 2004 UTC revision 1725, Tue Dec 14 23:23:41 2004 UTC
# Line 21  Line 21 
21            installdir: string,            installdir: string,
22            buildcmd: string,            buildcmd: string,
23            instcmd : string -> unit,            instcmd : string -> unit,
24            unpackcmd: string option } -> unit            unpack: (string list -> bool) option } -> unit
25    
26  end = struct  end = struct
27    
# Line 149  Line 149 
149          handle _ => false          handle _ => false
150    
151      (* our main routine *)      (* our main routine *)
152      fun proc { smlnjroot, installdir, buildcmd, instcmd, unpackcmd } = let      fun proc { smlnjroot, installdir, buildcmd, instcmd, unpack } = let
153          val smlnjroot = F.fullPath smlnjroot          val smlnjroot = F.fullPath smlnjroot
154          val installdir = F.fullPath installdir          val installdir = F.fullPath installdir
155          val configdir = P.concat (smlnjroot, "config")          val configdir = P.concat (smlnjroot, "config")
# Line 214  Line 214 
214          (* fetch and unpack source trees, using auxiliary helper command          (* fetch and unpack source trees, using auxiliary helper command
215           * which takes the root directory as its first and the module           * which takes the root directory as its first and the module
216           * names to be fetched as subsequent arguments. *)           * names to be fetched as subsequent arguments. *)
217          val _ = case unpackcmd of          val _ = case unpack of
218                      NONE => ()          (* archives must exist *)                      NONE => ()          (* archives must exist *)
219                    | SOME cmd => let                    | SOME upck =>
220                          val cmdline =                        if upck (SS.listItems srcmoduleset) then ()
                             concat (cmd :: " " :: smlnjroot :: " " ::  
                                     SS.foldl (fn (f, l) => " " :: f :: l)  
                                              [] srcmoduleset)  
                     in  
                         if OS.Process.system cmdline = OS.Process.success  
                         then ()  
221                          else fail ["unpacking failed\n"]                          else fail ["unpacking failed\n"]
                     end  
222    
223          val libdir = P.concat (installdir, "lib")          val libdir = P.concat (installdir, "lib")
224          val srcdir = P.concat (smlnjroot, "src")          val srcdir = P.concat (smlnjroot, "src")

Legend:
Removed from v.1724  
changed lines
  Added in v.1725

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