command line options rearranged

[helm.git] / helm / software / helena / Makefile

diff --git a/helm/software/helena/Makefile b/helm/software/helena/Makefile
index 61891b69b48f81940311c322f6145d416e097f8c..42cf240fc78f25f60104f67c15c6ef8182a55259 100644 (file)
--- a/helm/software/helena/Makefile
+++ b/helm/software/helena/Makefile
@@ -39,73 +39,73 @@ PREAMBLE_V    = coq/grundlagen.template
 PREAMBLE_ELPI = elpi/elpi.template
 
 test-si-fast: $(MAIN).opt etc
-       @echo "  HELENA -o -q -1 $(INPUTFAST)"
-       $(H)./$(MAIN).opt -T 1 -n -o -q -1 $(O) $(INPUTFAST) > etc/log.txt
+       @echo "  HELENA -q -u -x -1 $(INPUTFAST)"
+       $(H)./$(MAIN).opt -T 1 -q -u -x -1 $(O) $(INPUTFAST) > etc/log.txt
 
 test-si: $(MAIN).opt etc
-       @echo "  HELENA -d -l -p -o $(INPUT)"
-       $(H)./$(MAIN).opt -T 2 -d -l -p -o $(O) $(INPUT) > etc/log.txt
+       @echo "  HELENA -d -l -u -0 $(INPUT)"
+       $(H)./$(MAIN).opt -T 2 -d -l -u -0 $(O) $(INPUT) > etc/log.txt
 
 test2: $(MAIN).opt etc
-       @echo "  HELENA -d -l $(INPUT)"
-       $(H)./$(MAIN).opt -l -o $(INPUT) -X -T 2 -d -l $(O) $(INPUT) > etc/log.txt
+       @echo "  HELENA -T 2 -d -l $(INPUT)"
+       $(H)./$(MAIN).opt -l -u $(INPUT) -X -T 2 -d -l $(O) $(INPUT) > etc/log.txt
 
 test3: $(MAIN).opt etc
-       @echo "  HELENA -d -l $(INPUT)"
-       $(H)./$(MAIN).opt -l -o $(INPUT) -X -T 3 -d -l $(O) $(INPUT) > etc/log.txt
+       @echo "  HELENA -T 3 -d -l $(INPUT)"
+       $(H)./$(MAIN).opt -l -u $(INPUT) -X -T 3 -d -l $(O) $(INPUT) > etc/log.txt
 
 test6: $(MAIN).opt etc
-       @echo "  HELENA -d -l $(INPUT)"
-       $(H)./$(MAIN).opt -l -o $(INPUT) -X -T 6 -d -l $(O) $(INPUT) > etc/log.txt
+       @echo "  HELENA -T 6 -d -l -n $(INPUT)"
+       $(H)./$(MAIN).opt -l -u $(INPUT) -X -T 6 -d -l -n $(O) $(INPUT) > etc/log.txt
 
 xml-si: $(MAIN).opt etc
-       @echo "  HELENA -l -o -s 1 -x $(INPUT)"
-       $(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 1 -x $(INPUT) > etc/log.txt
+       @echo "  HELENA -l -o -s 1 -u $(INPUT)"
+       $(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 1 -u $(INPUT) > etc/log.txt
 
 xml-si-v3: $(MAIN).opt etc
-       @echo "  HELENA -l -o -s 2 -x $(INPUT)"
-       $(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 2 -x $(INPUT) > etc/log.txt
+       @echo "  HELENA -l -o -s 2 -u $(INPUT)"
+       $(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 2 -u $(INPUT) > etc/log.txt
 
 xml: $(MAIN).opt etc
-       @echo "  HELENA -l -s 1 -x $(INPUT)"
-       $(H)./$(MAIN).opt -l -o $(INPUT) -X -O $(XMLDIR) -T 1 -l -s 1 -x $(INPUT) > etc/log.txt
+       @echo "  HELENA -l -o -s 1 $(INPUT)"
+       $(H)./$(MAIN).opt -l -u $(INPUT) -X -O $(XMLDIR) -T 1 -l -o -s 1 $(INPUT) > etc/log.txt
 
 xml-v3: $(MAIN).opt etc
-       @echo "  HELENA -l -s 2 -x $(INPUT)"
-       $(H)./$(MAIN).opt -l -o $(INPUT) -X -O $(XMLDIR) -T 1 -l -s 2 -x $(INPUT) > etc/log.txt
+       @echo "  HELENA -l -o -s 2 $(INPUT)"
+       $(H)./$(MAIN).opt -l -u $(INPUT) -X -O $(XMLDIR) -T 1 -l -o -s 2 $(INPUT) > etc/log.txt
 
 export-coq coq/$(V): $(MAIN).opt etc
        $(H)mkdir -p coq
-       @echo "  HELENA -l -m V8 -o $(INPUT)"
-       $(H)./$(MAIN).opt -T 1 -a n -c $(PREAMBLE_V) -l -m V8 -o $(O) $(INPUT) > etc/log.txt
+       @echo "  HELENA -l -m V8 -u $(INPUT)"
+       $(H)./$(MAIN).opt -T 1 -a n -l -m V8 -p $(PREAMBLE_V) -u $(O) $(INPUT) > etc/log.txt
 
 export-matita matita/$(MA): $(MAIN).opt etc
-       @echo "  HELENA -l -m MA2 -o $(INPUT)"
+       @echo "  HELENA -l -m MA2 -u $(INPUT)"
        $(H)mkdir -p matita
-       $(H)./$(MAIN).opt -T 1 -a n -c $(PREAMBLE_MA) -l -m MA2 -o $(O) $(INPUT) > etc/log.txt
+       $(H)./$(MAIN).opt -T 1 -a n -l -m MA2 -p $(PREAMBLE_MA) -u $(O) $(INPUT) > etc/log.txt
 
 export-elpi elpi/$(ELPI): $(MAIN).opt etc
-       @echo "  HELENA -l -m ELPI -o $(INPUT)"
+       @echo "  HELENA -l -m ELPI -u $(INPUT)"
        $(H)mkdir -p elpi
-       $(H)./$(MAIN).opt -T 1 -a n -c $(PREAMBLE_ELPI) -l -m ELPI1 -o $(O) $(INPUT) >  etc/log.txt
-       $(H)./$(MAIN).opt -T 1 -a n -c $(PREAMBLE_ELPI) -l -m ELPI2 -o $(O) $(INPUT) >> etc/log.txt
+       $(H)./$(MAIN).opt -T 1 -a n -l -m ELPI1 -p $(PREAMBLE_ELPI) -u $(O) $(INPUT) >  etc/log.txt
+       $(H)./$(MAIN).opt -T 1 -a n -l -m ELPI2 -p $(PREAMBLE_ELPI) -u $(O) $(INPUT) >> etc/log.txt
 
 profile-fast: $(MAIN).opt etc
-       @echo "  HELENA -o -q $(INPUTFAST) (31 TIMES)"
+       @echo "  HELENA -q -u -x $(INPUTFAST) (31 TIMES)"
        $(H)rm -f etc/log.txt
-       $(H)for T in `seq 31`; do ./$(MAIN).opt -T 1 -n -o -q $(O) $(INPUTFAST) >> etc/log.txt; done
+       $(H)for T in `seq 31`; do ./$(MAIN).opt -T 1 -q -u -x $(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 -o $(INPUT) (31 TIMES)"
+       @echo "  HELENA -l -u $(INPUT) (31 TIMES)"
        $(H)rm -f etc/log.txt
-       $(H)for _ in `seq 31`; do ./$(MAIN).opt -T 1 -l -o $(O) $(INPUT) >> etc/log.txt; done
+       $(H)for _ in `seq 31`; do ./$(MAIN).opt -T 1 -l -u $(O) $(INPUT) >> etc/log.txt; done
        $(H)grep "at exit" etc/log.txt | sort | uniq > etc/profile.txt
 
 profile-coq: $(MAIN).opt etc
        @echo "  COQC $(V) (31 TIMES)"
        $(H)rm -f etc/log.txt
-       $(H)for _ in `seq 31`; do `which time` -p -a -o etc/log.txt $(COQC) coq/$(V); done
+       $(H)for _ in `seq 31`; do `which time` -p -a -u etc/log.txt $(COQC) coq/$(V); done
        $(H)grep -h user etc/log.txt | sort | uniq > etc/profile.txt
 
 matita: matita/$(MA)
@@ -117,7 +117,7 @@ matitac: matita/$(MA)
        $(H)cd matita && $(MATITAC) $(MA)
 
 #profile-matita: $(MAIN).opt etc
-#      @echo "  HELENA -o $(INPUT) (1 TIMES)"
+#      @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 -x $(INPUT) >> etc/log.txt; done
+#      $(H)for T in `seq 1`; do ./$(MAIN).opt -T 1 -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