X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2FgTopLevel%2FMakefile;h=ec10354a78bb2217da342dc32cd8d5b2245f5769;hb=057426319f87faebb0a99b2c411ffdf67d347866;hp=9c9aaea62093ff46d45db89e6b32c21e426830ac;hpb=4227b4756648f58c9db4bcea9a6aa2770df3ac01;p=helm.git

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index 9c9aaea62..ec10354a7 100644
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -1,9 +1,8 @@
 BIN_DIR = /usr/local/bin
 REQUIRES = lablgtkmathview helm-cic_textual_parser helm-tex_cic_textual_parser \
-           helm-cic_proof_checking helm-xml gdome2-xslt helm-cic_unification \
-           helm-mathql helm-mathql_interpreter helm-mathql_generator \
-	         helm-tactics threads hbugs-client mathml-editor \
-           helm-cic_transformations
+           gdome2-xslt helm-mathql_interpreter helm-mathql_generator \
+	   		   helm-tactics hbugs-client mathml-editor helm-cic_transformations \
+           helm-cic_textual_parser2
 PREDICATES = "gnome,init,glade"
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLFIND = ocamlfind
@@ -14,8 +13,8 @@ OCAMLDEP = ocamldep -pp camlp4o
 LIBRARIES = $(shell $(OCAMLFIND) query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 LIBRARIES_OPT = $(shell $(OCAMLFIND) query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 
-all: styles gTopLevel
-opt: styles gTopLevel.opt
+all: styles gTopLevel regtest
+opt: styles gTopLevel.opt regtest.opt
 
 start:
 	$(MAKE) -C ../hbugs/ start
@@ -23,13 +22,18 @@ stop:
 	$(MAKE) -C ../hbugs/ stop
 
 INTERFACE_FILES = \
-	proofEngine.mli logicalOperations.mli disambiguate.mli \
-	termEditor.mli texTermEditor.mli xmlDiff.mli termViewer.mli \
-	invokeTactics.mli hbugs.mli
+	proofEngine.mli logicalOperations.mli oldDisambiguate.mli \
+  disambiguatingParser.mli termEditor.mli texTermEditor.mli xmlDiff.mli \
+  chosenTransformer.mli termViewer.mli invokeTactics.mli hbugs.mli \
+  chosenTermEditor.mli 
 
-DEPOBJS = $(INTERFACE_FILES) $(INTERFACE_FILES:%.mli=%.ml) gTopLevel.ml
+DEPOBJS = \
+	$(INTERFACE_FILES) $(INTERFACE_FILES:%.mli=%.ml) \
+	gTopLevel.ml regtest.ml batchParser.ml batchParser.mli
 
 TOPLEVELOBJS = $(INTERFACE_FILES:%.mli=%.cmo) gTopLevel.cmo
+REGTESTOBJS = \
+	$(INTERFACE_FILES:%.mli=%.cmo) batchParser.cmo regtest.cmo
 
 $(INTERFACE_FILES:%.mli=%.cmo): $(LIBRARIES)
 $(INTERFACE_FILES:%.mli=%.cmx): $(LIBRARIES_OPT)
@@ -47,10 +51,14 @@ depend:
 	$(OCAMLDEP) $(DEPOBJS) > .depend
 
 gTopLevel: $(TOPLEVELOBJS) $(LIBRARIES)
-	$(OCAMLC) -linkpkg -o gTopLevel $(TOPLEVELOBJS)
-
+	$(OCAMLC) -linkpkg -o $@ $(TOPLEVELOBJS)
 gTopLevel.opt: $(TOPLEVELOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
-	$(OCAMLOPT) -linkpkg -o gTopLevel.opt $(TOPLEVELOBJS:.cmo=.cmx)
+	$(OCAMLOPT) -linkpkg -o $@ $(TOPLEVELOBJS:.cmo=.cmx)
+
+regtest: $(REGTESTOBJS) $(LIBRARIES)
+	$(OCAMLC) -linkpkg -o $@ $(REGTESTOBJS)
+regtest.opt: $(REGTESTOBJS:.cmo=.cmx) $(LIBRARIES)
+	$(OCAMLOPT) -linkpkg -o $@ $(REGTESTOBJS:.cmo=.cmx)
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
 .ml.cmo:
@@ -64,24 +72,26 @@ $(TOPLEVELOBJS): $(LIBRARIES)
 $(TOPLEVELOBJS:.cmo=.cmx)): $(LIBRARIES_OPT)
 
 clean:
-	rm -f *.cm[iox] *.o gTopLevel gTopLevel.opt
-
+	rm -f *.cm[iox] *.o gTopLevel{,.opt} regtest{,.opt}
 install:
 	cp gTopLevel gTopLevel.opt $(BIN_DIR)
-
 uninstall:
 	rm -f $(BIN_DIR)/gTopLevel $(BIN_DIR)/gTopLevel.opt
 
-.PHONY: install uninstall clean
+.PHONY: install uninstall clean test
+
+INTESTS := $(wildcard tests/*.cic)
+OUTTESTS := $(patsubst %, %.test, $(INTESTS))
+gentest: $(OUTTESTS)
+cleantest:
+	rm -f $(OUTTESTS)
+tests/%.cic.test: tests/%.cic regtest
+	time ./regtest -gen $<
+test:
+	./regtest $(INTESTS) 2> /dev/null
+envtest:
+	./regtest -dump $(INTESTS) 2> /dev/null
 
 ifneq ($(MAKECMDGOALS), depend)
    include .depend   
 endif
-
-
-
-
-
-
-
-