X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FMakefile;h=ebf8eeda5f3aa26a219c90805aa673fde15823e5;hb=3a9b60b1a057fcd2634a147ca2dcb0cb286dccfa;hp=8b89d823a18cd92a894456d40d1d7977ea9e8ffd;hpb=c35a3f47e0468a6076a3afdd6f2ff5c5fe528784;p=helm.git

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index 8b89d823a..ebf8eeda5 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
 
@@ -49,7 +49,8 @@ INTERFACE_FILES = \
 	termViewer.mli \
 	invokeTactics.mli \
 	hbugs.mli \
-  	chosenTermEditor.mli 
+  	chosenTermEditor.mli \
+	helmGtkLogger.mli
 
 DEPOBJS = \
 	$(INTERFACE_FILES) $(INTERFACE_FILES:%.mli=%.ml) \
@@ -84,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
@@ -126,23 +127,31 @@ 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 =
 debug:
-	$(OCAMLFIND) query -recursive -predicates byte -a-format \
+	echo "load_printer \"threads.cma\"" > .debug_script
+	$(OCAMLFIND) query -recursive -predicates "mt,byte" -a-format \
 		helm-cic_unification | \
 		sed 's/\(.*\)/load_printer "\1"/' \
-		> .debug_script
+		>> .debug_script
 	echo "install_printer CicMetaSubst.fppsubst" >> .debug_script
 	echo "install_printer CicMetaSubst.fppterm" >> .debug_script
 	echo "install_printer CicMetaSubst.fppmetasenv" >> .debug_script
 	ledit $(OCAMLDEBUG) \
 		-source .debug_script \
+    -I +threads \
 		$(shell $(OCAMLFIND) query -recursive -i-format $(REQUIRES)) \
 		$(MAIN) $(ARGS)