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/branches/rt-transition/system/smlnj/installer/generic-install.sml
ViewVC logotype

Diff of /sml/branches/rt-transition/system/smlnj/installer/generic-install.sml

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

revision 3978, Mon Dec 8 14:10:40 2014 UTC revision 3979, Wed Dec 10 14:29:02 2014 UTC
# Line 165  Line 165 
165    
166          (* ------------------------------ *)          (* ------------------------------ *)
167    
168          datatype action =          datatype action
169              RegLib of { anchor: string, relname: string, dir: string,            = RegLib of { anchor: string, relname: string, dir: string,
170                          altanchor: string option }                          altanchor: string option }
171                        * bool (* true = only on Unix *)                        * bool (* true = only on Unix *)
172            | Anchor of { anchor: string, path: string }            | Anchor of { anchor: string, path: string }
# Line 233  Line 233 
233          (* ------------------------------ *)          (* ------------------------------ *)
234    
235          (* parse the targets file *)          (* parse the targets file *)
236          fun loop (ml, allsrc) =          fun loop (ml, srcReqs, allsrc) =
237              case getInputTokens s of              case getInputTokens s of
238                  NONE => (TextIO.closeIn s; (ml, allsrc))                  NONE => (TextIO.closeIn s; (ml, srcReqs, allsrc))
239                | SOME [x as ("dont_move_libraries" | "move_libraries")] =>                | SOME [x as ("dont_move_libraries" | "move_libraries")] =>
240                    (warn ["\"", x, "\" no longer supported",                    (warn ["\"", x, "\" no longer supported",
241                           " (installer always moves libraries)\n"];                           " (installer always moves libraries)\n"];
242                     loop (ml, allsrc))                     loop (ml, srcReqs, allsrc))
243                | SOME ["request", "src-smlnj"] => loop (ml, true)                | SOME ["request", "src-smlnj"] => loop (ml, srcReqs, true)
244                | SOME ["request", module] => loop (module :: ml, allsrc)                | SOME ["request", module] => if SM.inDomain(actions, module)
245                | SOME [] => loop (ml, allsrc)                    then loop (module :: ml, srcReqs, allsrc)
246                      else loop (ml, module :: srcReqs, allsrc) (* assume a src module *)
247                  | SOME [] => loop (ml, srcReqs, allsrc)
248                | SOME l => fail ["ill-formed targets line: ", tokenLine l, "\n"]                | SOME l => fail ["ill-formed targets line: ", tokenLine l, "\n"]
249    
250          val (modules, allsrc) = loop ([], false)          val (modules, srcReqs, allsrc) = loop ([], [], false)
251    
252          (* now resolve dependencies; get full list of modules          (* now resolve dependencies; get full list of modules
253           * in correct build order: *)           * in correct build order: *)
254          val modules = resolve (modules, depfile)          val modules = resolve (modules, depfile)
255          val moduleset = SS.addList (SS.empty, modules)          val moduleset = SS.addList (SS.empty, modules)
256          val srcmoduleset = if allsrc then SS.union (moduleset, allmoduleset)          val srcmoduleset = if allsrc then SS.union (moduleset, allmoduleset)
257                             else moduleset                             else SS.addList (moduleset, srcReqs)
258    
259          (* fetch and unpack source trees, using auxiliary helper command          (* fetch and unpack source trees, using auxiliary helper command
260           * which takes the root directory as its first and the module           * which takes the root directory as its first and the module

Legend:
Removed from v.3978  
changed lines
  Added in v.3979

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