Commit f7ce4deb authored by Erwan Jahier's avatar Erwan Jahier
Browse files

just a commit to increment the version number to make sure it works

parent 2a501627
...@@ -15,7 +15,7 @@ slink: ...@@ -15,7 +15,7 @@ slink:
build: setup.data build: setup.data
ocaml setup.ml -build ocaml setup.ml -build
setup.ml:_oasis polka/vector.ml lutin-utils/src/lutinutils.ml setup.ml:_oasis lutin/src/version.ml polka/vector.ml lutin-utils/src/lutinutils.ml
oasis setup oasis setup
# a clutch because oasis does not support camlidl # a clutch because oasis does not support camlidl
...@@ -76,17 +76,6 @@ xxx: ...@@ -76,17 +76,6 @@ xxx:
.PHONY:install
oi:install
or:reinstall
ob:build
oc:clean
clean:
ocaml setup.ml -clean
rm -f setup.data
cd polka; make clean
cd lutin-utils/src/ ; make clean
distclean: distclean:
ocaml setup.ml -distclean ocaml setup.ml -distclean
rm -rf _build/src rm -rf _build/src
......
####################################################################################### #######################################################################################
# Workflow: # Workflow:
# C=git commit ; A=git amend ; U=update_version ; O=opam pack # C=git commit ; A=git amend ; U=update_version ; OP=opam pack
# to make sure the sha and the version are good, one should never # to make sure the sha and the version are good, one should never
# do U and then A. # do U and then A.
# to avoid such problems, legal trace are defined by this automata: # to avoid such problems, legal trace are defined by this automata:
# 0 -C-> 1 # 0 -C-> 1
# 1 -P-> 1 # 1 -OP-> 1
# 1 -A-> 1 # 1 -A-> 1
# 1 -U-> 0 # 1 -U-> 0
# to implement such a workflow, C puts a lock (state 1) and U removes it (state 0) # to implement such a workflow, C puts a lock (state 1) and U removes it (state 0)
...@@ -80,3 +80,15 @@ opam : $(WWW)/pool/$(PACKNAME).tgz ...@@ -80,3 +80,15 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
cd $(WWW)/opam-repository/packages && \ cd $(WWW)/opam-repository/packages && \
oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \ oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
cd .. ; opam-admin check && opam-admin make -g cd .. ; opam-admin check && opam-admin make -g
.PHONY:install
oi:install
or:reinstall
ob:build
oc:clean
clean:
ocaml setup.ml -clean
rm -f setup.data
cd polka; make clean
cd lutin-utils/src/ ; make clean
...@@ -25,6 +25,9 @@ PRE_COMMIT_NB:=$(shell echo $(COMMIT_NB) - 1 | bc) ...@@ -25,6 +25,9 @@ PRE_COMMIT_NB:=$(shell echo $(COMMIT_NB) - 1 | bc)
PRE_VERSION:=2.$(PRE_COMMIT_NB) PRE_VERSION:=2.$(PRE_COMMIT_NB)
VERSION:=2.$(COMMIT_NB) VERSION:=2.$(COMMIT_NB)
echover:
echo "VERSION=$(VERSION)"
echo "PRE_VERSION=$(PRE_VERSION)"
lutin/src/version.ml: lutin/src/version.ml:
cd $(LURETTE_PATH) ; \ cd $(LURETTE_PATH) ; \
......
OASISFormat: 0.4 OASISFormat: 0.4
Name: Lutin Name: Lutin
Version: 2.2 Version: 2.4
Authors: Erwan Jahier Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr Maintainers: erwan.jahier@imag.fr
License: PROP License: PROP
...@@ -13,6 +13,7 @@ Description: ...@@ -13,6 +13,7 @@ Description:
It has been initially designed to model environments and perform It has been initially designed to model environments and perform
automated testing of reactive systems with Lurette. automated testing of reactive systems with Lurette.
BuildTools: ocamlbuild BuildTools: ocamlbuild
PreBuildCommand: make lutin/src/version.ml
#PreBuildCommand: make gen_version #PreBuildCommand: make gen_version
......
let str="2.2" let str="2.4"
let sha="dc00be7" let sha="5a14494"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment