Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Allow user to configure location of dot tool for theory graph building.

The default is /usr/bin/dot, because that’s where it is on my Linux machine.  If you need it to be somewhere else, create a config-override or poly-includes.ML file, depending on which ML you’re using.
  • Loading branch information...
commit 2a28c8991bb12c78e1dca5a06e83324c729be8bf 1 parent d16d440
@mn200 mn200 authored
View
3  help/src-sml/DOT
@@ -35,7 +35,7 @@ val HTML_DIR = Path.toString(Path.fromString(Path.concat
val SIGOBJ_DIR = Path.toString(Path.fromString(Path.concat
(Globals.HOLDIR,"sigobj")));
-val DOTPATH = "/usr/local/bin/dot"
+val DOTPATH = Systeml.DOT_PATH
(*---------------------------------------------------------------------------
Extract dot-friendly digraph from HOL theory graph.
@@ -227,4 +227,3 @@ val _ = print " done\n";
gen_map_file DOTPATH ancs (Path.concat(HTML_DIR, "theories"));
-
View
1  tools-poly/Holmake/unix-systeml.sml
@@ -99,6 +99,7 @@ val DYNLIB = ""
val version = ""
val ML_SYSNAME = ""
val release = ""
+val DOT_PATH = ""
val isUnix = true
View
3  tools-poly/Holmake/winNT-systeml.sml
@@ -56,6 +56,7 @@ val GNUMAKE =
val DYNLIB =
val version =
val release =
+val DOT_PATH =
val isUnix = false
@@ -108,5 +109,3 @@ end (* local *)
end; (* struct *)
-
-
View
3  tools-poly/configure.sml
@@ -232,7 +232,8 @@ in
"val DYNLIB =" --> ("val DYNLIB = "^Bool.toString dynlib_available^"\n"),
"val version =" --> ("val version = "^Int.toString version_number^"\n"),
"val ML_SYSNAME =" --> "val ML_SYSNAME = \"poly\"\n",
- "val release =" --> ("val release = "^quote release_string^"\n")];
+ "val release =" --> ("val release = "^quote release_string^"\n"),
+ "val DOT_PATH =" --> ("val DOT_PATH = "^quote DOT_PATH^"\n")];
use destfile
end;
View
3  tools-poly/smart-configure.sml
@@ -212,6 +212,8 @@ val dynlib_available = false;
print "\n";
+val DOT_PATH = "/usr/bin/dot"
+
fun verdict (prompt, value) =
if value = "" then
(print ("\n*** No value for "^prompt^
@@ -226,6 +228,7 @@ verdict ("OS", OS);
verdict ("poly", poly);
verdict ("polymllibdir", polymllibdir);
verdict ("holdir", holdir);
+verdict ("DOT_PATH", DOT_PATH);
print "\nConfiguration will begin with above values. If they are wrong\n";
print "press Control-C.\n\n";
View
1  tools/Holmake/Systeml.sig
@@ -29,6 +29,7 @@ sig
val GNUMAKE : string
val DYNLIB : bool
val ML_SYSNAME : string
+ val DOT_PATH : string
val isUnix : bool
View
1  tools/Holmake/unix-systeml.sml
@@ -102,6 +102,7 @@ val DYNLIB = ""
val version = ""
val ML_SYSNAME = ""
val release = ""
+val DOT_PATH = ""
val isUnix = true
View
1  tools/Holmake/winNT-systeml.sml
@@ -94,6 +94,7 @@ val DYNLIB = ""
val version = ""
val ML_SYSNAME = ""
val release = ""
+val DOT_PATH = ""
val isUnix = false
View
3  tools/configure-mosml.sml
@@ -179,6 +179,8 @@ val dynlib_available = (load "Dynlib"; true) handle _ => false;
print "\n";
+val DOT_PATH = "/usr/bin/dot"
+
val _ = let
val override = Path.concat(holdir, "config-override")
in
@@ -199,6 +201,7 @@ verdict ("OS", OS);
verdict ("mosmldir", mosmldir);
verdict ("holdir", holdir);
verdict ("dynlib_available", Bool.toString dynlib_available);
+verdict ("DOT_PATH", DOT_PATH);
val _ = let
val mosml' = if OS = "winNT" then "mosmlc.exe" else "mosmlc"
View
4 tools/configure.sml
@@ -185,7 +185,9 @@ in
"val DYNLIB =" --> ("val DYNLIB = "^Bool.toString dynlib_available^"\n"),
"val version =" --> ("val version = "^Int.toString version_number^"\n"),
"val ML_SYSNAME =" --> "val ML_SYSNAME = \"mosml\"\n",
- "val release =" --> ("val release = "^quote release_string^"\n")];
+ "val release =" --> ("val release = "^quote release_string^"\n"),
+ "val DOT_PATH =" --> ("val DOT_PATH = "^quote DOT_PATH^"\n")
+ ];
use destfile
end;
Please sign in to comment.
Something went wrong with that request. Please try again.