Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
verimag
synchrone
lutin
Commits
f7ce4deb
Commit
f7ce4deb
authored
Jun 10, 2016
by
Erwan Jahier
Browse files
just a commit to increment the version number to make sure it works
parent
2a501627
Changes
5
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
f7ce4deb
...
...
@@ -15,7 +15,7 @@ slink:
build
:
setup.data
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
# a clutch because oasis does not support camlidl
...
...
@@ -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
:
ocaml setup.ml
-distclean
rm
-rf
_build/src
...
...
Makefile.dev
View file @
f7ce4deb
#######################################################################################
# Workflow:
# C=git commit ; A=git amend ; U=update_version ; O=opam pack
# C=git commit ; A=git amend ; U=update_version ; O
P
=opam pack
# to make sure the sha and the version are good, one should never
# do U and then A.
# to avoid such problems, legal trace are defined by this automata:
# 0 -C-> 1
# 1 -P-> 1
# 1 -
O
P-> 1
# 1 -A-> 1
# 1 -U-> 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
cd
$(WWW)
/opam-repository/packages
&&
\
oasis2opam
$(HTTP)
/pool/
$(PACKNAME)
.tgz
&&
\
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
Makefile.version
View file @
f7ce4deb
...
...
@@ -25,6 +25,9 @@ PRE_COMMIT_NB:=$(shell echo $(COMMIT_NB) - 1 | bc)
PRE_VERSION
:=
2.
$(PRE_COMMIT_NB)
VERSION
:=
2.
$(COMMIT_NB)
echover
:
echo
"VERSION=
$(VERSION)
"
echo
"PRE_VERSION=
$(PRE_VERSION)
"
lutin/src/version.ml
:
cd
$(LURETTE_PATH)
;
\
...
...
_oasis
View file @
f7ce4deb
OASISFormat: 0.4
Name: Lutin
Version: 2.
2
Version: 2.
4
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: PROP
...
...
@@ -13,6 +13,7 @@ Description:
It has been initially designed to model environments and perform
automated testing of reactive systems with Lurette.
BuildTools: ocamlbuild
PreBuildCommand: make lutin/src/version.ml
#PreBuildCommand: make gen_version
...
...
lutin/src/version.ml
View file @
f7ce4deb
let
str
=
"2.
2
"
let
sha
=
"
dc00be7
"
let
str
=
"2.
4
"
let
sha
=
"
5a14494
"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment