Build: new version number workflow based on gitlab-release

Makefile.dev

 #######################################################################################
-# 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
-
 
 
 #######################################################################################
@@ -54,46 +32,30 @@ README.md: README.txt
 #######################################################################################
 # git entry points
 
-#######################################################################################
-# Workflow:
-# C=git commit ;  A=git amend ; U=update_version ; P=opam pack
-# - 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
-#
-# thereforeto 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)
-
 uv:update_version
 update_version:
 	git pull
 	rm -f src/lv6version.ml
 	make src/lv6version.ml
+ifneq (,$(findstring -,$(VERSION)))
+	echo "won't update _oasis"
+else
 	cp _oasis _oasis.save
 	cat _oasis.save | sed "s/^Version:.*/Version:     $(VERSION)/" > _oasis
-	rm -f committed
-	git add _oasis
-	git add src/lv6version.ml
 	make clean && make
+endif
 
 BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
 
 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'"
+	git commit -a -F log && echo "Hint: 'make ci' to test the CI before doing 'make 'push'"
 
 
 push: opam-test
 	git push && make uv
 
 amend:
-	test -f committed && git commit -a -F log --amend 
+	git commit -a -F log --amend 
 
 
 ###############################

Makefile.version

+
+SHA:=$(shell git log -1 --pretty=format:"%h")
+VERSION=$(shell git describe --tags)
+
+gen_version:
+	rm -f src/lv6version.ml
+
+src/lv6version.ml: Makefile
+	echo "(** Automatically generated from Makefile.version *) " > $@
+	echo "let tool = \"lv6\"" >> $@
+	echo "let str=\"$(VERSION)\"" >> $@ 
+	echo "let sha=\"$(SHA)\"" >> $@ 
+	echo "let branch = \"$(shell utils/get_branch_name)\"" >> $@
+	echo "let maintainer = \"erwan.jahier@univ-grenoble-alpes.fr\"">> $@

src/lv6version.ml

-(** Automatically generated from Makefile.version *) 
-let tool = "lv6"
-let str="6.100.2"
-let sha="44bc6b6"
-let branch = "master"
-let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"