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
+# 
+# 
+# 
 
 uv:update_version
 update_version:
 	git pull
 	rm -f lutin/src/version.ml
 	make lutin/src/version.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 lutin/src/version.ml  _oasis
 	make clean && make
-
+endif
 
 cia: test man cia-no-test 
 cia-no-test:
-	test -f committed && \
-   echo "*** I won't commit!\n*** until you 'make update_version'!" \
-      || (git commit -a -F log && touch committed)
+	git commit -a -F log
 
 
 push: opam-test
@@ -45,7 +27,7 @@ push: opam-test
 
 
 amend:
-	test -f committed && git commit -a -F log --amend 
+	git commit -a -F log --amend 
 
 dif:
 	git --no-pager diff  --color-words