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/internal/versiontool.sml
ViewVC logotype

Diff of /sml/trunk/src/system/smlnj/internal/versiontool.sml

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

revision 1699, Tue Nov 16 04:39:28 2004 UTC revision 1700, Tue Nov 16 22:12:26 2004 UTC
# Line 40  Line 40 
40      fun bumpRelease (file, r) =      fun bumpRelease (file, r) =
41          if !bump_release then putRelease (file, r + 1) else ()          if !bump_release then putRelease (file, r + 1) else ()
42    
43      fun gen { template, target, vfile, rfile } =      fun gen { template, target, vfile, release } =
44          let val version = getVersion vfile          let val version = getVersion vfile
             val release = getRelease rfile  
45              val version' = case release of              val version' = case release of
46                                 NONE => version                                 NONE => version
47                               | SOME r => version @ [r]                               | SOME r => version @ [r]
# Line 61  Line 60 
60                          | SOME c => (TextIO.output1 (ts, c); loop ())                          | SOME c => (TextIO.output1 (ts, c); loop ())
61                          | NONE => TextIO.output1 (ts, #"%"))                          | NONE => TextIO.output1 (ts, #"%"))
62                    | SOME c => (TextIO.output1 (ts, c); loop ())                    | SOME c => (TextIO.output1 (ts, c); loop ())
63          in bumpRelease (rfile, getOpt (release, ~1));          in
64             loop ();             loop ();
65             TextIO.closeIn ss;             TextIO.closeIn ss;
66             TextIO.closeOut ts             TextIO.closeOut ts
# Line 87  Line 86 
86                      val template = Tools.nativeSpec templatep                      val template = Tools.nativeSpec templatep
87                      val vfile = Tools.nativePreSpec versionfilepp                      val vfile = Tools.nativePreSpec versionfilepp
88                      val rfile = Tools.nativePreSpec releasefilepp                      val rfile = Tools.nativePreSpec releasefilepp
89                        val release = getRelease rfile
90                      fun newerThanTarget f = Tools.outdated tool ([target], f)                      fun newerThanTarget f = Tools.outdated tool ([target], f)
91                  in if List.exists newerThanTarget [template, vfile, rfile] then                  in if List.exists newerThanTarget [template, vfile, rfile] then
92                         gen { template = template, target = target,                         gen { template = template, target = target,
93                               vfile = vfile, rfile = rfile }                               vfile = vfile, release = release }
94                     else ();                     else ();
95                       bumpRelease (rfile, getOpt (release, ~1));
96                     ({ smlfiles = [(targetp, { share = Sharing.DONTCARE,                     ({ smlfiles = [(targetp, { share = Sharing.DONTCARE,
97                                                setup = (NONE, NONE),                                                setup = (NONE, NONE),
98                                                split = NONE,                                                split = NONE,

Legend:
Removed from v.1699  
changed lines
  Added in v.1700

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