Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

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

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

just a commit to increment the version number to make sure it works
parent 2a501627
......@@ -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
......
#######################################################################################
# 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
# do U and then A.
# to avoid such problems, legal trace are defined by this automata:
# 0 -C-> 1
# 1 -P-> 1
# 1 -OP-> 1
# 1 -A-> 1
# 1 -U-> 0
# to implement such a workflow, C puts a lock (state 1) and U removes it (state 0)
......@@ -76,7 +76,23 @@ $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
mv $^ $@
OPAM_FILE=`find $(WWW)/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/'`
opam : $(WWW)/pool/$(PACKNAME).tgz
cd $(WWW)/opam-repository/packages && \
oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
echo "OPAM_FILE=$(OPAM_FILE)" && \
cat $(OPAM_FILE) | ocaml $(PWD)/utils/fixopam_file.ml > $(OPAM_FILE)-fixed && \
cp $(OPAM_FILE)-fixed $(OPAM_FILE) && \
cd .. ; opam-admin check && opam-admin make -g
.PHONY:install $(WWW)/pool/$(PACKNAME).tgz
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)
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) ; \
......
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
......
let str="2.2"
let sha="dc00be7"
let str="2.4"
let sha="f7ce4de"
(* Time-stamp: <modified the 13/06/2016 (at 11:00) by Erwan Jahier> *)
(* Replace
build: [ * ]
by
build: [ ["make"] ]
*)
let removing = ref false
let _ =
try
while true do
let line = read_line () in
if !removing then () else print_string (line^"\n");
if String.length line > 5 && String.sub line 0 6 = "build:" then removing := true;
if !removing && line.[0] = ']' then (
removing := false;
print_string " [\"make\"]\n]\n"
);
done
with End_of_file -> flush stdout
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