X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FMakefile;h=9cba34bc70c771b0f3186d85937bc37e0ab339ee;hb=29442b4d21cf07992ad4e5c981085dada1f90fe4;hp=3175bbea7a2c2294a3edc0b844e237b3affd5cd6;hpb=d7d9d42a3d44ff82f797bd36c3a0ccc05f48483d;p=helm.git

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index 3175bbea7..9cba34bc7 100644
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -1,5 +1,6 @@
 BIN_DIR = /usr/local/bin
 TEST_REQUIRES = \
+	helm-registry \
 	helm-mathql_interpreter \
 	helm-mathql_generator \
 	helm-tactics \
@@ -8,19 +9,18 @@ TEST_REQUIRES = \
 	helm-cic_textual_parser \
 	helm-tex_cic_textual_parser \
 	mathml-editor \
-	lablgtkmathview \
-	helm-cic_cache
+	lablgtkmathview
 REQUIRES = \
 	$(TEST_REQUIRES) \
 	gdome2-xslt \
-	hbugs-client \
-	helm-cic_cache
+	hbugs-client
 PREDICATES = "gnome,init,glade"
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
+OCAMLOPTIONS = \
+	-package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o -thread
 OCAMLFIND = ocamlfind
 OCAMLDEBUGOPTIONS = -g
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS)
-OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = $(OCAMLFIND) ocamldep -pp camlp4o
 OCAMLDEBUG = wowcamldebug
 
@@ -38,22 +38,31 @@ stop:
 	$(MAKE) -C ../hbugs/ stop
 
 INTERFACE_FILES = \
-	proofEngine.mli logicalOperations.mli oldDisambiguate.mli \
-  disambiguatingParser.mli termEditor.mli texTermEditor.mli xmlDiff.mli \
-  chosenTransformer.mli termViewer.mli invokeTactics.mli hbugs.mli \
-  chosenTermEditor.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 \
+	helmGtkLogger.mli
 
 DEPOBJS = \
 	$(INTERFACE_FILES) $(INTERFACE_FILES:%.mli=%.ml) \
 	gTopLevel.ml regtest.ml testlibrary.ml batchParser.ml batchParser.mli
 
 TOPLEVELOBJS = $(INTERFACE_FILES:%.mli=%.cmo) gTopLevel.cmo
-REGTESTOBJS = \
+TESTOBJS = \
 	oldDisambiguate.cmo \
 	disambiguatingParser.cmo \
-	batchParser.cmo \
-	regtest.cmo
-TESTLIBOBJS = testlibrary.cmo
+	batchParser.cmo
+REGTESTOBJS = $(TESTOBJS) regtest.cmo
+TESTLIBOBJS = $(TESTOBJS) testlibrary.cmo
 
 $(INTERFACE_FILES:%.mli=%.cmo): $(LIBRARIES)
 $(INTERFACE_FILES:%.mli=%.cmx): $(LIBRARIES_OPT)
@@ -76,17 +85,17 @@ gTopLevel.opt: $(TOPLEVELOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
 	$(OCAMLOPT) -thread -linkpkg -o $@ $(TOPLEVELOBJS:.cmo=.cmx)
 
 testlibrary: $(TESTLIBOBJS) $(TEST_LIBRARIES)
-	$(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) -linkpkg \
+	$(OCAMLFIND) ocamlc -thread $(OCAMLDEBUGOPTIONS) -linkpkg \
 		-package "$(TEST_REQUIRES)" -o $@ $(TESTLIBOBJS)
 testlibrary.opt: $(TESTLIBOBJS:.cmo=.cmx) $(TEST_LIBRARIES_OPT)
-	$(OCAMLFIND) opt -linkpkg -package "$(TEST_REQUIRES)" -o $@ \
+	$(OCAMLFIND) ocamlopt -thread -linkpkg -package "$(TEST_REQUIRES)" -o $@ \
 		$(TESTLIBOBJS:.cmo=.cmx)
 
 regtest: $(REGTESTOBJS) $(TEST_LIBRARIES)
-	$(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) -linkpkg \
+	$(OCAMLFIND) ocamlc -thread $(OCAMLDEBUGOPTIONS) -linkpkg \
 		-package "$(TEST_REQUIRES)" -o $@ $(REGTESTOBJS)
 regtest.opt: $(REGTESTOBJS:.cmo=.cmx) $(TEST_LIBRARIES_OPT)
-	$(OCAMLOPT) opt -linkpkg -package "$(TEST_REQUIRES)" -o $@ \
+	$(OCAMLFIND) ocamlopt -thread -linkpkg -package "$(TEST_REQUIRES)" -o $@ \
 		$(REGTESTOBJS:.cmo=.cmx)
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
@@ -118,10 +127,16 @@ tests/%.cic.test: tests/%.cic regtest
 	time ./regtest -gen $<
 test: regtest
 	./regtest $(INTESTS) 2> /dev/null
+test.opt: regtest.opt
+	./regtest.opt $(INTESTS) 2> /dev/null
 envtest: regtest
 	./regtest -dump $(INTESTS) 2> /dev/null
-librarytest: testlibrary.opt
-	./testlibrary.opt - <index.txt 2>/dev/null >LOG &
+envtest.opt: regtest.opt
+	./regtest.opt -dump $(INTESTS) 2> /dev/null
+librarytest: testlibrary
+	./testlibrary -vars -varsprefix cic:/Coq index.txt 2>/dev/null >LOG &
+librarytest.opt: testlibrary.opt
+	./testlibrary.opt -vars -varsprefix cic:/Coq index.txt 2>/dev/null >LOG &
 
 MAIN = ./gTopLevel
 ARGS =
@@ -133,7 +148,7 @@ debug:
 	echo "install_printer CicMetaSubst.fppsubst" >> .debug_script
 	echo "install_printer CicMetaSubst.fppterm" >> .debug_script
 	echo "install_printer CicMetaSubst.fppmetasenv" >> .debug_script
-	$(OCAMLDEBUG) \
+	ledit $(OCAMLDEBUG) \
 		-source .debug_script \
 		$(shell $(OCAMLFIND) query -recursive -i-format $(REQUIRES)) \
 		$(MAIN) $(ARGS)