From 15ee22b5c4da9ba40af267d9780dedc68b1fca18 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Fri, 29 Jan 2016 17:22:25 +0100
Subject: [PATCH] Better msgs if the workflow described in "Makefile.dev" is
violated.
---
Makefile.dev | 18 +++++++++++++-----
_oasis | 2 +-
src/lv6version.ml | 4 ++--
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/Makefile.dev b/Makefile.dev
index 4edbf698..4c248a8d 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -29,6 +29,7 @@ test:
# 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:
rm -f src/lv6version.ml
make src/lv6version.ml
@@ -38,10 +39,14 @@ update_version:
make clean && make
cia:
- test -f committed || (git commit -a -F log && touch committed)
+ test -f committed && \
+ echo "*** I won't commit!\n*** until you 'make update_version'!" \
+ || (git commit -a -F log && touch committed)
ci:
- test -f committed || (git commit -F log && touch committed)
+ test -f committed && \
+ echo "*** I won't commit!\n*** until you 'make update_version'!" \
+ || (git commit -F log && touch committed)
amend:
test -f committed && git commit -a -F log --amend
@@ -71,8 +76,11 @@ $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
mv $^ $@
+
opam : $(WWW)/pool/$(PACKNAME).tgz
- cd $(WWW)/opam-repository/packages && \
- oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
- cd .. ; opam-admin check && opam-admin make -g
+ test -f committed && ( \
+ cd $(WWW)/opam-repository/packages && \
+ oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
+ cd .. ; opam-admin check && opam-admin make -g \
+ ) || echo "*** I won't make an opam package\n*** until you commit something!"
diff --git a/_oasis b/_oasis
index b33f3518..c5d9e672 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lustre-v6
-Version: 1.632
+Version: 1.633
Synopsis: The Lustre V6 Verimag compiler
Description: This package contains:
- lus2lic: the (current) name of the compiler (and interpreter via -exec).
diff --git a/src/lv6version.ml b/src/lv6version.ml
index 02772d31..53bac4a5 100644
--- a/src/lv6version.ml
+++ b/src/lv6version.ml
@@ -1,7 +1,7 @@
(** Automatically generated from Makefile *)
let tool = "lus2lic"
let branch = "master"
-let commit = "632"
-let sha_1 = "ebeb303ab2867235869666e671600c955c8d887f"
+let commit = "633"
+let sha_1 = "11223b59a86e6a35ef5c04f33a1b7d1710eb8bd8"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "jahier@imag.fr"
--
GitLab