Clean-up the git repo and split the Makefile (into Makefile.dev).

Also, force a workflow (via a lock file named commited) that make
sure that the content of lv6version.ml is always correct xrt shat and
git commit number.

.gitignore

@@ -15,9 +15,6 @@ TAGS
 *.h
 *.diff
 *.swp
-src/._bcdi/*
-src/._d/*
-src/._ncdi/*
 src/lus2lic
 src/parser.ml
 src/parser.mli
@@ -63,12 +60,14 @@ lus2lic-types.pdf
 lus2lic.pdf
 *.tex
 ocamldoc
-_build/
-main.native
+_*
+*.native
+*.byte
 myocamlbuild.ml
 setup.data
 setup.ml
 configure
 linux
 src/lus4ocaml.mllib
-src/META
+META
\ No newline at end of file
+committed

Makefile

@@ -27,31 +27,15 @@ reinstall:
 clean:
 	ocaml setup.ml -clean
 	rm setup.data
+	rm src/lv6version.ml
 
 distclean:
 	ocaml setup.ml -distclean
 
-
 ###############################
-# opam-ing
-
-NAME=lustre-v6
-PACKNAME=$(NAME).$(VERSION)
-WWW=/import/www/DIST-TOOLS/SYNCHRONE
-HTTP=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE
-
-$(PACKNAME).tgz:
-	git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD
-
-$(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
-	mv $^ $@ 
+# for developpers
+include ./Makefile.dev
 
-
-opam : $(WWW)/pool/$(PACKNAME).tgz
-	cd $(WWW)/opam-repository/packages && \
-	oasis2opam   $(HTTP)/pool/$(PACKNAME).tgz && \
-	cd .. ; opam-admin check  && opam-admin make -g
-
-###############################
+# not gitted stuff
 -include ./Makefile.local
 

Makefile.dev

+
+
+
+#######################################################################################
+# TEST, NON REGR. ETC...
+TESTDIR=./test
+
+.PHONY: diff test log
+
+test_nc: 
+	cd $(TESTDIR) ; make test ; cd $(curdir)
+
+test: 
+	cd $(TESTDIR) ; make ; make time
+	cd $(curdir)
+
+#######################################################################################
+# git entry points
+
+#######################################################################################
+# Workflow:
+# C=git commit ;  A=git amend ; U=update_version ; O=opam pack
+# to make sure the sha and the version are good, one should never
+# do U and then A.
+# to avoid such problems, legal trace are defined by this automata:
+# 0 -C-> 1
+# 1 -P-> 1
+# 1 -A-> 1
+# 1 -U-> 0
+# to implement such a workflow, C puts a lock (state 1) and U removes it (state 0)
+
+update_version: 
+	rm -f src/lv6version.ml
+	make src/lv6version.ml
+	cp _oasis _oasis.save
+	cat _oasis.save | sed "s/^Version:.*/Version:     $(VERSION)/" > _oasis
+	rm committed
+	make clean && make
+
+cia:
+	test -f committed || (git commit -a -F log && touch committed)
+
+ci:
+	test -f committed || (git commit  -F log && touch committed)
+
+amend:
+	test -f committed && git commit -a -F log --amend 
+
+###############################
+# forge
+
+push:
+	git push git+ssh://$(USER)@scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/git/lustre/lus2lic.git
+
+pull:
+	git pull git+ssh://$(USER)@scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/git/lustre/lus2lic.git
+
+
+###############################
+# opam-ing
+
+NAME=lustre-v6
+PACKNAME=$(NAME).$(VERSION)
+WWW=/import/www/DIST-TOOLS/SYNCHRONE
+HTTP=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE
+
+$(PACKNAME).tgz:
+	git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD
+
+$(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
+	mv $^ $@ 
+
+
+opam : $(WWW)/pool/$(PACKNAME).tgz
+	cd $(WWW)/opam-repository/packages && \
+	oasis2opam   $(HTTP)/pool/$(PACKNAME).tgz && \
+	cd .. ; opam-admin check  && opam-admin make -g
+

Makefile.version

 
+
+
+
 # can oasis do all this stuff?
 SHA:=$(shell git log -1 --pretty=format:"%h")
 COMMIT_NB:=$(shell git log --pretty=oneline  | wc -l)

src/lv6version.ml

@@ -2,6 +2,6 @@
 let tool = "lus2lic"
 let branch = "master"
 let commit = "632"
-let sha_1 = "d1b062d3a67a2e288c8904f60b9c9874c11b0707"
+let sha_1 = "ebeb303ab2867235869666e671600c955c8d887f"
 let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
 let maintainer = "jahier@imag.fr"

test/lus2lic.sum

 ==> lus2lic0.sum <==
-Test Run By jahier on Wed Jan 27 15:20:40 
+Test Run By jahier on Fri Jan 29 09:51:43 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic0 tests ===
@@ -64,7 +64,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
 XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
 
 ==> lus2lic1.sum <==
-Test Run By jahier on Wed Jan 27 15:20:41 
+Test Run By jahier on Fri Jan 29 09:51:44 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic1 tests ===
@@ -163,29 +163,29 @@ PASS: ./lus2lic  {-2c call.lus -n call}
 PASS: ./lus2lic  {-2c call01.lus -n call01}
 PASS: ./lus2lic  {-2c call02.lus -n call02}
 PASS: gcc -o call02.exec call02_call02.c call02_call02_loop.c 
-FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call02.lus  {}
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call02.lus  {}
 PASS: ./lus2lic  {-2c call03.lus -n call03}
 PASS: ./lus2lic  {-2c call04.lus -n call04}
 PASS: gcc -o call04.exec call04_call04.c call04_call04_loop.c 
-FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call04.lus  {}
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call04.lus  {}
 PASS: ./lus2lic  {-2c call05.lus -n call05}
 PASS: ./lus2lic  {-2c call06.lus -n call06}
 PASS: ./lus2lic  {-2c call07.lus -n call07}
 PASS: gcc -o call07.exec call07_call07.c call07_call07_loop.c 
-FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call07.lus  {}
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call07.lus  {}
 PASS: ./lus2lic  {-2c carV2.lus -n carV2}
 PASS: gcc -o carV2.exec carV2_carV2.c carV2_carV2_loop.c 
-FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c carV2.lus  {}
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c carV2.lus  {}
 FAIL: Generate c code  : ./lus2lic  {-2c carligths.lus -n carligths}
 PASS: ./lus2lic  {-2c ck2.lus -n ck2}
 PASS: gcc -o ck2.exec ck2_ck2.c ck2_ck2_loop.c 
-FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck2.lus  {}
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck2.lus  {}
 PASS: ./lus2lic  {-2c ck3.lus -n ck3}
 PASS: gcc -o ck3.exec ck3_ck3.c ck3_ck3_loop.c 
-FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck3.lus  {}
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck3.lus  {}
 PASS: ./lus2lic  {-2c ck4.lus -n ck4}
 PASS: gcc -o ck4.exec ck4_ck4.c ck4_ck4_loop.c 
-FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck4.lus  {}
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck4.lus  {}
 PASS: ./lus2lic  {-2c ck5.lus -n ck5}
 PASS: gcc -o ck5.exec ck5_ck5.c ck5_ck5_loop.c 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck5.lus  {}
@@ -396,7 +396,7 @@ PASS: gcc -o multipar.exec multipar_multipar.c multipar_multipar_loop.c
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus  {}
 
 ==> lus2lic2.sum <==
-Test Run By jahier on Wed Jan 27 15:20:57 
+Test Run By jahier on Fri Jan 29 09:51:59 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic2 tests ===
@@ -411,7 +411,7 @@ PASS: gcc -o PCOND.exec PCOND_PCOND.c PCOND_PCOND_loop.c
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND.lus  {}
 PASS: ./lus2lic  {-2c PCOND1.lus -n PCOND1}
 PASS: gcc -o PCOND1.exec PCOND1_PCOND1.c PCOND1_PCOND1_loop.c 
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND1.lus  {}
+FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND1.lus  {}
 PASS: ./lus2lic  {-2c SOURIS.lus -n SOURIS}
 PASS: gcc -o SOURIS.exec SOURIS_SOURIS.c SOURIS_SOURIS_loop.c 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c SOURIS.lus  {}
@@ -506,7 +506,7 @@ PASS: gcc -o onlyroll.exec onlyroll_onlyroll.c onlyroll_onlyroll_loop.c
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c onlyroll.lus  {}
 PASS: ./lus2lic  {-2c onlyroll2.lus -n onlyroll2}
 PASS: gcc -o onlyroll2.exec onlyroll2_onlyroll2.c onlyroll2_onlyroll2_loop.c 
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c onlyroll2.lus  {}
+FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c onlyroll2.lus  {}
 PASS: ./lus2lic  {-2c over2.lus -n over2}
 PASS: gcc -o over2.exec over2_over2.c over2_over2_loop.c 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c over2.lus  {}
@@ -741,7 +741,7 @@ PASS: gcc -o zzz2.exec zzz2_zzz2.c zzz2_zzz2_loop.c
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus  {}
 
 ==> lus2lic3.sum <==
-Test Run By jahier on Wed Jan 27 15:21:43 
+Test Run By jahier on Fri Jan 29 09:52:45 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic3 tests ===
@@ -1243,7 +1243,7 @@ PASS: ./myec2c {-o multipar.c multipar.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
 
 ==> lus2lic4.sum <==
-Test Run By jahier on Wed Jan 27 15:21:57 
+Test Run By jahier on Fri Jan 29 09:52:59 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic4 tests ===
@@ -1260,7 +1260,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND.lus {}
 PASS: ./lus2lic {-o PCOND1.lic PCOND1.lus}
 PASS: ./lus2lic {-ec -o PCOND1.ec PCOND1.lus}
 PASS: ./myec2c {-o PCOND1.c PCOND1.ec}
-PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND1.lus {}
+FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND1.lus {}
 PASS: ./lus2lic {-o SOURIS.lic SOURIS.lus}
 PASS: ./lus2lic {-ec -o SOURIS.ec SOURIS.lus}
 PASS: ./myec2c {-o SOURIS.c SOURIS.ec}
@@ -1388,7 +1388,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node onlyroll.lus {}
 PASS: ./lus2lic {-o onlyroll2.lic onlyroll2.lus}
 PASS: ./lus2lic {-ec -o onlyroll2.ec onlyroll2.lus}
 PASS: ./myec2c {-o onlyroll2.c onlyroll2.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node onlyroll2.lus {}
+PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node onlyroll2.lus {}
 PASS: ./lus2lic {-o over2.lic over2.lus}
 PASS: ./lus2lic {-ec -o over2.ec over2.lus}
 PASS: ./myec2c {-o over2.c over2.ec}
@@ -1739,15 +1739,15 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 
 		=== lus2lic1 Summary ===
 
-# of expected passes		308
-# of unexpected failures	12
+# of expected passes		315
+# of unexpected failures	5
 
 ==> lus2lic2.sum <==
 
 		=== lus2lic2 Summary ===
 
-# of expected passes		330
-# of unexpected failures	3
+# of expected passes		328
+# of unexpected failures	5
 
 ==> lus2lic3.sum <==
 
@@ -1763,15 +1763,15 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 # of expected passes		470
 # of unexpected failures	5
 ===============================
-# Total number of failures: 31
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 16 seconds
+# Total number of failures: 26
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 15 seconds
 lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 46 seconds
 lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 14 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 48 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 49 seconds
 * Ref time: 
-0.06user 0.01system 2:04.62elapsed 0%CPU (0avgtext+0avgdata 5092maxresident)k
-32inputs+0outputs (0major+5555minor)pagefaults 0swaps
+0.05user 0.02system 2:05.60elapsed 0%CPU (0avgtext+0avgdata 5216maxresident)k
+32inputs+0outputs (0major+5601minor)pagefaults 0swaps
 * Quick time (-j 4):
-0.04user 0.02system 1:02.71elapsed 0%CPU (0avgtext+0avgdata 5096maxresident)k
-32inputs+0outputs (0major+5589minor)pagefaults 0swaps
+0.05user 0.01system 0:55.13elapsed 0%CPU (0avgtext+0avgdata 5236maxresident)k
+0inputs+0outputs (0major+5616minor)pagefaults 0swaps