diff --git a/Makefile.dev b/Makefile.dev index cae59865a54fa56f393878f37db49cfa55d74ea7..fbedf25c08883825b41aa575562702ff86d8e029 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -1,3 +1,25 @@ +####################################################################################### +# Workflow: +# C=make cia ; A=make amend ; U=make uv ; P=make opam-rel +# - to make sure the sha and the version are good, one should never +# do U and then A. +# - to make sure gtit is not confused, one should never do A and the P +# +# therefore, to avoid such problems, legal trace are defined by this automata: +# 0 -C-> 1 +# 1 -A-> 1 +# 1 -P-> 2 +# 2 -U-> 0 +# 1 -U-> 0 +# to implement such a workflow, C puts a lock (state 1) and U removes it (state 0) + + +############################### +# typical workflow: +# uv -> cia -> amend* -> push -> +# wait for gitlab release job -> pull (to get the release tag) +# and then; optionnaly, to release an opam version: +# opam-rel @@ -78,51 +100,12 @@ amend: # opam-ing NAME=lustre-v6 -PACKNAME=$(NAME).$(PRE_VERSION) -WWW=/import/www/DIST-TOOLS/SYNCHRONE -HTTP=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE - -# for testing opam packages before publishing -WWWTEST=/import/www/DIST-TOOLS/SYNCHRONE/test -HTTPTEST=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test - - -OPAM_FILE=$(shell find $(WWW)/opam-repository/packages -name opam | grep lustre | sort | tail -1 | sed -e 's/^./\U&/') -OPAM_FILE_TEST=$(shell find $(WWW)/test/opam-repository/packages -name opam | grep lustre | sort | tail -1 | sed -e 's/^./\U&/') -OPAM_DIR=$(shell dirname $(OPAM_FILE)) -OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lustre-v6 - - -$(PACKNAME).tgz: - git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD - -$(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz - cp $^ $@ - -$(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz - cp $^ $@ - -opam : $(WWW)/pool/$(PACKNAME).tgz - [ "$(BRANCH)" = "master" ] && ( \ - cd $(WWW)/opam-repository/packages && \ - oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \ - cp ~/lus2lic/opam $(OPAM_FILE) && \ - cd .. ; opam-admin check && opam-admin make -g \ - ) || echo "*** I won't make an opam package\n*** until you commit something!" && \ - echo 'post-messages: ["A more up-to-date version can be obtained from (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "]' >> $(OPAM_FILE) && \ - cp -rf $(OPAM_DIR) $(OFFICIAL_OPAM_DIR) - - -opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz - [ "$(BRANCH)" = "master" ] && cd $(WWWTEST)/opam-repository/packages && \ - oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \ - cp $(OPAM_FILE_TEST) $(PWD)/opam.oasis2opam && \ - diff -u $(PWD)/opam.oasis2opam $(PWD)/opam | \ - grep -v opam.oasis2opam > $(PWD)/opam.diff &&\ - diff $(PWD)/opam.diff $(PWD)/opam.diff.exp && \ - cp $(PWD)/opam $(OPAM_FILE_TEST) || \ - (echo "The opam file needs some update"; exit 2) && \ - cd .. ; opam-admin check && opam-admin make -g + +opam-rel : + make-opam-pack $(NAME) + +opam-test : + make-opam-pack $(NAME) -test diff --git a/_oasis b/_oasis index 4dbc346a05a907b8dd58fb6562c1f6316627e83c..374a6ed41cfc1e32501fcd10c9f549e7716fb89c 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lustre-v6 -Version: 6.100.0 +Version: 6.100.1 Synopsis: The Lustre V6 Verimag compiler Description: This package contains: - lv6: the (current) name of the compiler (and interpreter via -exec) diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf index da043c652ba81aeb18295c249d3af6d53878d1ac..1d0951bf1eaab631a20f58602e5e3e7000a69366 100644 Binary files a/lv6-ref-man/lv6-ref-man.pdf and b/lv6-ref-man/lv6-ref-man.pdf differ diff --git a/src/lv6version.ml b/src/lv6version.ml index 00795cade83d2b42fe89f8563651fda4ef6e6a82..664bd58ee066110198aa396826d34674fdb9f679 100644 --- a/src/lv6version.ml +++ b/src/lv6version.ml @@ -1,6 +1,6 @@ (** Automatically generated from Makefile.version *) let tool = "lv6" -let str="6.100.0" -let sha="db7aa5b" +let str="6.100.1" +let sha="9beabcb" let branch = "master" let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"