diff --git a/Makefile.dev b/Makefile.dev index 2232f6a07463506eabee909466aa015d6be92574..91d42cb55fbcb3bb944f3e79312293fd12f56cec 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -86,11 +86,15 @@ 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 | head -1 | sed -e 's/^./\U&/') -OPAM_FILE_TEST=$(shell find $(WWW)/test/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/') +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 + +xxx: + echo "OPAM_FILE_TEST=$(OPAM_FILE_TEST)" + $(PACKNAME).tgz: git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD @@ -98,7 +102,7 @@ $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz cp $^ $@ $(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz - mv $^ $@ + cp $^ $@ opam : $(WWW)/pool/$(PACKNAME).tgz [ "$(BRANCH)" = "master" ] && test -f committed && ( \ @@ -113,7 +117,7 @@ opam : $(WWW)/pool/$(PACKNAME).tgz opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz [ "$(BRANCH)" = "master" ] && cd $(WWWTEST)/opam-repository/packages && \ oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \ - cp opam $(OPAM_FILE_TEST) && \ + cp ~/lus2lic/opam $(OPAM_FILE_TEST) && \ cd .. ; opam-admin check && opam-admin make -g diff --git a/_oasis b/_oasis index b4979b4140b10181181cfb094bb99055dbd643eb..8a2bf7966cd595ef7aad83656a61a83446bfd70d 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lustre-v6 -Version: 1.746 +Version: 1.749 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 ec925a0c8bfcfdb4718b5bfe0a625c821ebdadb0..47076dc5a5ca305f643cbb0d47b9a32b42431854 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 366b18d7bdada21a4381e82bbe44fd87a9f84c76..6894e445117e3c7f9e2cb514761e47ce78692b1e 100644 --- a/src/lv6version.ml +++ b/src/lv6version.ml @@ -1,7 +1,7 @@ (** Automatically generated from Makefile *) let tool = "lv6" let branch = "master" -let commit = "746" -let sha_1 = "b5e55fe04f49eef5a6182a8574c8144a5ee7952a" +let commit = "749" +let sha_1 = "493bc565c67740076667e4be85f84654493f204b" let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")") let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"