diff --git a/Makefile.dev b/Makefile.dev index cae59865a54fa56f393878f37db49cfa55d74ea7..fa9f9e45a82c7c2045fa3cf1b57ea406bfc3141a 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -54,14 +54,14 @@ update_version: make src/lv6version.ml cp _oasis _oasis.save cat _oasis.save | sed "s/^Version:.*/Version: $(VERSION)/" > _oasis - rm committed + rm -f committed git add _oasis git add src/lv6version.ml make clean && make BRANCH=$(shell git rev-parse --abbrev-ref HEAD) -cia: +cia:test test -f committed && \ echo "*** I won't commit!\n*** until you 'make update_version'!" \ || (git commit -a -F log && touch committed) && echo "Hint: 'make ci' to test the CI before doing 'make 'push'" diff --git a/_oasis b/_oasis index 4dbc346a05a907b8dd58fb6562c1f6316627e83c..09b36e98a75764015c9828a819ac2823ee1f88ee 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lustre-v6 -Version: 6.100.0 +Version: 6.100.2 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 deleted file mode 100644 index da043c652ba81aeb18295c249d3af6d53878d1ac..0000000000000000000000000000000000000000 Binary files a/lv6-ref-man/lv6-ref-man.pdf and /dev/null differ diff --git a/src/lv6version.ml b/src/lv6version.ml index 00795cade83d2b42fe89f8563651fda4ef6e6a82..6a0a7b73acd9b172f18bb558c9eea53bc9979ebc 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.2" +let sha="615ffc5" let branch = "master" let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"