X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fhelena%2FMakefile;h=6194e6c4c0ace7eb89cb4398ad21977c68841c92;hb=25893b01cb815cbd9a3b9684952bfc0f42c0739d;hp=48f7e4b9644fa4c205f62d18b2e60419868c1294;hpb=bcc6a96020485731da4c02cc38043817903bd7dc;p=helm.git

diff --git a/helm/software/helena/Makefile b/helm/software/helena/Makefile
index 48f7e4b96..6194e6c4c 100644
--- a/helm/software/helena/Makefile
+++ b/helm/software/helena/Makefile
@@ -33,16 +33,18 @@ INPUT = examples/automath/grundlagen_2.aut
 
 INPUTFAST = examples/automath/grundlagen_1.aut
 
+OUTPUT = scripts
+
 MA  = grundlagen_2.ma
 V   = grundlagen_2.v
 LP1 = grundlagen_21.elpi
 LP2 = grundlagen_22.elpi
 TJ2 = grundlagen_22.mod
-TJ2 = grundlagen_23.mod
+TJ3 = grundlagen_23.mod
 
 PREAMBLE_MA = ../matita/matita.ma.templ
-PREAMBLE_V  = coq/grundlagen.template
-PREAMBLE_LP = lp/lp.template
+PREAMBLE_V  = $(OUTPUT)/coq/grundlagen.template
+PREAMBLE_LP = $(OUTPUT)/lp/lp.template
 
 ALL_FEATURES = LEXER PARSER TRACE SUMMARY EXPAND MANAGER OBJECTS PREPROCESS QUOTE STAGE TYPE
 
@@ -61,8 +63,8 @@ byte: .depend.byte
 	@$(CALLMAKE) F="$(ALL_FEATURES)" $(MAIN).byte
 
 test-si-fast: $(MAIN).opt etc
-	@echo "  HELENA -q -u -x -y -1 $(INPUTFAST)"
-	$(H)./$(MAIN).opt -T 1 -q -u -x -y -1 $(O) $(INPUTFAST) > etc/log.txt
+	@echo "  HELENA -u -x -y -1 $(INPUTFAST)"
+	$(H)./$(MAIN).opt -T 1 -u -x -y -1 $(O) $(INPUTFAST) > etc/log.txt
 
 test-si: $(MAIN).opt etc
 	@echo "  HELENA -d -l -u -0 $(INPUT)"
@@ -89,25 +91,25 @@ test6: $(MAIN).opt etc
 	$(H)./$(MAIN).opt -l -u $(O) $(INPUT) -X -T 6 -l $(O) $(INPUT) > etc/log.txt
 
 profile-fast: $(MAIN).opt etc
-	@echo "  HELENA -q -u -x $(INPUTFAST) (31 TIMES)"
+	@echo "  HELENA -u -x -y -1 $(INPUTFAST) (31 TIMES)"
 	$(H)rm -f etc/log.txt
-	$(H)for T in `seq 31`; do ./$(MAIN).opt -T 1 -q -u -x -1 $(O) $(INPUTFAST) >> etc/log.txt; done
+	$(H)for T in `seq 31`; do ./$(MAIN).opt -T 1 -u -x -y -1 $(O) $(INPUTFAST) >> etc/log.txt; done
 	$(H)grep "at exit" etc/log.txt | sort | uniq > etc/profile.txt
 
 profile: $(MAIN).opt etc
-	@echo "  HELENA -l -u $(INPUT) (31 TIMES)"
+	@echo "  HELENA -l -u -1 $(INPUT) (31 TIMES)"
 	$(H)rm -f etc/log.txt
 	$(H)for _ in `seq 31`; do ./$(MAIN).opt $(TEST1) >> etc/log.txt; done
 	$(H)grep "at exit" etc/log.txt | sort | uniq > etc/profile.txt
 
 profile-opt: $(MAIN).opt etc
-	@echo "  HELENA -l $(INPUT) (31 TIMES)"
+	@echo "  HELENA -l -1 $(INPUT) (31 TIMES)"
 	$(H)rm -f etc/log.txt
 	$(H)for _ in `seq 31`; do ./$(MAIN).opt $(TEST1) $(TEST2) >> etc/log.txt; done
 	$(H)grep "processed" etc/log.txt | sort -k 6 | uniq > etc/profile.txt
 
 profile-byte: $(MAIN).byte etc
-	@echo "  HELENA -l $(INPUT) (31 TIMES)"
+	@echo "  HELENA -l -1 $(INPUT) (31 TIMES)"
 	$(H)rm -f etc/log.txt
 	$(H)for _ in `seq 31`; do ./$(MAIN).byte $(TEST1) $(TEST2) >> etc/log.txt; done
 	$(H)grep "processed" etc/log.txt | sort -k 6 | uniq > etc/profile.txt
@@ -115,67 +117,67 @@ profile-byte: $(MAIN).byte etc
 profile-coq: $(MAIN).opt etc
 	@echo "  COQTOP $(V) (31 TIMES)"
 	$(H)rm -f etc/log.txt
-	$(H)for _ in `seq 31`; do echo Load \"coq/$(V)\". | $(TIME) $(COQTOP) -q  $(NULL); done
+	$(H)for _ in `seq 31`; do echo Load \"$(OUTPUT)/coq/$(V)\". | $(TIME) $(COQTOP) -q $(NULL); done
 	$(H)grep -h user etc/log.txt | sort | uniq > etc/profile.txt
 
 profile-coq-byte: $(MAIN).opt etc
 	@echo "  COQTOP $(V) (31 TIMES)"
 	$(H)rm -f etc/log.txt
-	$(H)for _ in `seq 31`; do echo Load \"coq/$(V)\". | $(TIME) $(COQTOP).byte -q  $(NULL); done
+	$(H)for _ in `seq 31`; do echo Load \"$(OUTPUT)/coq/$(V)\". | $(TIME) $(COQTOP).byte -q $(NULL); done
 	$(H)grep -h user etc/log.txt | sort | uniq > etc/profile.txt
 
 xml-si: $(MAIN).opt etc
-	@echo "  HELENA -l -o -s 1 -u -y $(INPUT)"
-	$(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 1 -u -y $(O) $(INPUT) > etc/log.txt
+	@echo "  HELENA -l -o -q -s 1 -u -y $(INPUT)"
+	$(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -q -s 1 -u -y $(O) $(INPUT) > etc/log.txt
 
 xml-si-v3: $(MAIN).opt etc
-	@echo "  HELENA -l -o -s 2 -u -y $(INPUT)"
-	$(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 2 -u -y $(O) $(INPUT) > etc/log.txt
+	@echo "  HELENA -l -o -q -s 2 -u -y $(INPUT)"
+	$(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -q -s 2 -u -y $(O) $(INPUT) > etc/log.txt
 
 xml: $(MAIN).opt etc
-	@echo "  HELENA -l -o -s 1 -y $(INPUT)"
-	$(H)./$(MAIN).opt -l -u $(O) $(INPUT) -X -O $(XMLDIR) -T 1 -l -o -s 1 -y $(O) $(INPUT) > etc/log.txt
+	@echo "  HELENA -l -o -q -s 1 -y $(INPUT)"
+	$(H)./$(MAIN).opt -l -u $(O) $(INPUT) -X -O $(XMLDIR) -T 1 -l -o -q -s 1 -y $(O) $(INPUT) > etc/log.txt
 
 xml-v3: $(MAIN).opt etc
-	@echo "  HELENA -l -o -s 2 $(INPUT)"
-	$(H)./$(MAIN).opt -l -u $(O) $(INPUT) -X -O $(XMLDIR) -T 1 -l -o -s 2 -y $(O) $(INPUT) > etc/log.txt
+	@echo "  HELENA -l -o -q -s 2 -y $(INPUT)"
+	$(H)./$(MAIN).opt -l -u $(O) $(INPUT) -X -O $(XMLDIR) -T 1 -l -o -q -s 2 -y $(O) $(INPUT) > etc/log.txt
 
-export-coq coq/$(V): $(MAIN).opt etc
-	@echo "  HELENA -m V8 $(INPUT)"
-	$(H)./$(MAIN).opt -a n -m V8 -p $(PREAMBLE_V) $(TEST1) > etc/log.txt
+export-coq $(OUTPUT)/coq/$(V): $(MAIN).opt etc
+	@echo "  HELENA -m V8 -q $(INPUT)"
+	$(H)./$(MAIN).opt -M $(OUTPUT) -a n -m V8 -p $(PREAMBLE_V) -q $(TEST1) > etc/log.txt
 
-export-matita matita/$(MA): $(MAIN).opt etc
-	@echo "  HELENA -m MA2 $(INPUT)"
-	$(H)./$(MAIN).opt -a n -m MA2 -p $(PREAMBLE_MA) $(TEST1) > etc/log.txt
+export-matita $(OUTPUT)/matita/$(MA): $(MAIN).opt etc
+	@echo "  HELENA -m MA2 -q $(INPUT)"
+	$(H)./$(MAIN).opt -M $(OUTPUT) -a n -m MA2 -p $(PREAMBLE_MA) -q $(TEST1) > etc/log.txt
 
-export-lp1 lp/$(LP1): $(MAIN).opt etc
-	@echo "  HELENA -m LP1 $(INPUT)"
-	$(H)./$(MAIN).opt -a n -m LP1 -p $(PREAMBLE_LP) $(TEST1) > etc/log.txt
+export-lp1 $(OUTPUT)/lp/$(LP1): $(MAIN).opt etc
+	@echo "  HELENA -m LP1 -q $(INPUT)"
+	$(H)./$(MAIN).opt -M $(OUTPUT) -a n -m LP1 -p $(PREAMBLE_LP) -q $(TEST1) > etc/log.txt
 
-export-lp2 lp/$(LP2): $(MAIN).opt etc
-	@echo "  HELENA -m LP2 $(INPUT)"
-	$(H)./$(MAIN).opt -a n -m LP2 -p $(PREAMBLE_LP) $(TEST1) > etc/log.txt
+export-lp2 $(OUTPUT)/lp/$(LP2): $(MAIN).opt etc
+	@echo "  HELENA -m LP2 -q $(INPUT)"
+	$(H)./$(MAIN).opt -M $(OUTPUT) -a n -m LP2 -p $(PREAMBLE_LP) -q $(TEST1) > etc/log.txt
 
-export-tj2 lp/$(TJ2): $(MAIN).opt etc
-	@echo "  HELENA -m TJ2 $(INPUT)"
-	$(H)./$(MAIN).opt -a n -m TJ2 -p $(PREAMBLE_LP) $(TEST1) > etc/log.txt
+export-tj2 $(OUTPUT)/lp/$(TJ2): $(MAIN).opt etc
+	@echo "  HELENA -m TJ2 -q $(INPUT)"
+	$(H)./$(MAIN).opt -M $(OUTPUT) -a n -m TJ2 -p $(PREAMBLE_LP) -q $(TEST1) > etc/log.txt
 
-export-tj3 lp/$(TJ3): $(MAIN).opt etc
-	@echo "  HELENA -m TJ3 $(INPUT)"
-	$(H)./$(MAIN).opt -a n -m TJ3 -p $(PREAMBLE_LP) $(TEST1) > etc/log.txt
+export-tj3 $(OUTPUT)/lp/$(TJ3): $(MAIN).opt etc
+	@echo "  HELENA -m TJ3 -q $(INPUT)"
+	$(H)./$(MAIN).opt -M $(OUTPUT) -a n -m TJ3 -p $(PREAMBLE_LP) -q $(TEST1) > etc/log.txt
 
-matita: matita/$(MA)
+matita: $(OUTPUT)/matita/$(MA)
 	@echo "  MATITA $(MA)"
 	$(H)cd matita && $(MATITA) $(MA)
 
-matitac: matita/$(MA)
+matitac: $(OUTPUT)/matita/$(MA)
 	@echo "  MATITAC $(MA)"
 	$(H)cd matita && $(MATITAC) $(MA)
 
 #profile-matita: $(MAIN).opt etc
 #	@echo "  HELENA -u $(INPUT) (1 TIMES)"
 #	$(H)rm -f etc/log.txt
-#	$(H)for T in `seq 1`; do ./$(MAIN).opt -T 1 -a n -l -m $(PREAMBLE) -o -u $(INPUT) >> etc/log.txt; done
+#	$(H)for T in `seq 1`; do ./$(MAIN).opt -T 1 -M $(OUTPUT) -a n -l -m $(PREAMBLE) -o -u $(INPUT) >> etc/log.txt; done
 #	$(H)grep "at exit" etc/log.txt | sort | uniq > etc/profile-new.txt
 
 include Makefile.common