Compare Revisions
This comparison shows the changes necessary to convert path
/trunk
from Rev 68 to Rev
69
(Reverse comparison).
Rev 68 ⟶ Rev 69
/src/graphviz/graphvizfn.sml
58,7 ⟶
58,7
fun exePath exe = let |
val d = OS.Path.concat (Settings.graphvizPath (), "bin") |
handle Path => OS.Path.currentArc |
in OS.Path.joinDirFile {dir=d, file=exe} end |
in OS.Path.joinDirFile {dir=d, file=Settings.adjustExe exe} end |
|
fun graphToPath Dot = exePath "dot" |
| graphToPath Neato = exePath "neato" |
/src/settings.sig
22,6 ⟶
22,8
val dtdPath : unit -> string option |
val prefix : unit -> string option |
|
val adjustExe : string -> string |
|
(* layout *) |
val graphvizPath : unit -> string |
val graphvizEngine : unit -> string |
/src/settingsrwfn.sml
42,6 ⟶
42,11
| setYOff (r as ref NONE, SOME v) = (r := SOME {xoff=0, yoff=v}) |
| setYOff (r as ref (SOME {xoff,...}), SOME v) = (r := SOME {xoff=xoff, yoff=v}) |
|
val adjustExe = (if (OS.Path.joinDirFile {dir="/", file="usr"}) = "/usr" |
then (fn (s : string) => s) |
else raise OS.Path.Path) |
handle Path => (fn s => s ^ ".exe") |
|
fun getPrefix () = SOME (OS.Path.joinDirFile {dir="/", file="usr"}) |
handle Path => NONE (* Path exception under Windows *) |
|
159,7 ⟶
164,7
val results = [ checkoFile ("dtd_path", dtdPath ()), |
check checkFile ("graphviz/path", |
foldl addFile (SOME (graphvizPath ())) |
["bin", "dot"]) |
["bin", adjustExe "dot"]) |
] |
in List.all (fn x=>x) results end |
|