summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabriel Kerneis2014-04-23 14:58:34 +0100
committerGabriel Kerneis2014-04-23 15:00:56 +0100
commitfe28d6a93686eca649c3a8db7eb3c4b6e363e511 (patch)
tree80706ac294bd580b21a7f5f9135ec025f077517e /src
parentcd0728219401bf4b7dd8d43db7927d436318fd70 (diff)
Rename main to sail, build pretty_printer lib
Diffstat (limited to 'src')
-rw-r--r--src/Makefile11
-rw-r--r--src/myocamlbuild.ml4
-rw-r--r--src/sail.ml (renamed from src/main.ml)0
-rw-r--r--src/sail.odocl2
4 files changed, 10 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile
index e6849b07..a1ce3583 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,14 @@
-.PHONY: all test clean doc update_lem_lib test_power
+.PHONY: all test clean doc lib test_power
-all:
- ocamlbuild -classic-display main.native test/run_tests.native
+all: lib doc
+ ocamlbuild -classic-display sail.native test/run_tests.native
test: all
./run_tests.native
test_power:
#../../../rsem/idl/power/binary/run.sh
- SAIL_OPTS=-skip_constraints ocamlbuild -classic-display main.native test/run_power.native
+ SAIL_OPTS=-skip_constraints ocamlbuild -classic-display sail.native test/run_power.native
./run_power.native --file ../../../rsem/idl/power/binary/main.bin
clean:
@@ -21,3 +21,6 @@ clean:
doc:
ocamlbuild sail.docdir/index.html
+
+lib:
+ ocamlbuild pretty_print.cmxa pretty_print.cma
diff --git a/src/myocamlbuild.ml b/src/myocamlbuild.ml
index ecd86adc..70e2b633 100644
--- a/src/myocamlbuild.ml
+++ b/src/myocamlbuild.ml
@@ -46,7 +46,7 @@ dispatch begin function
rule "sail -> lem"
~prod: "%.lem"
- ~deps: ["%.sail"; "main.native"]
+ ~deps: ["%.sail"; "sail.native"]
(fun env builder ->
let sail_opts = List.map (fun s -> A s) (
"-lem_ast" ::
@@ -54,7 +54,7 @@ dispatch begin function
split ',' (Sys.getenv "SAIL_OPTS")
with Not_found -> []) in
Seq [
- Cmd (S ([ P "./main.native"] @ sail_opts @ [P (env "%.sail")]));
+ Cmd (S ([ P "./sail.native"] @ sail_opts @ [P (env "%.sail")]));
mv (basename (env "%.lem")) (dirname (env "%.lem"))
]);
diff --git a/src/main.ml b/src/sail.ml
index b0957f91..b0957f91 100644
--- a/src/main.ml
+++ b/src/sail.ml
diff --git a/src/sail.odocl b/src/sail.odocl
index 65935655..0872c3f9 100644
--- a/src/sail.odocl
+++ b/src/sail.odocl
@@ -2,7 +2,7 @@ ast
finite_map
initial_check
lexer
-main
+sail
parse_ast
parser
pp