From 21729ea41335e3c70a41cb9a5814d0be3855c07c Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Fri, 10 Mar 2017 15:08:59 +0100
Subject: [PATCH] Add rules to feed the opam-test verimag repo
---
Makefile.dev | 10 ++++++++++
_oasis | 2 +-
doc/version.tex | 6 +++---
src/META | 4 ++--
src/lutilsVersion.ml | 4 ++--
5 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Makefile.dev b/Makefile.dev
index 371f325..b8f20d1 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -63,15 +63,25 @@ NAME=lutils
PACKNAME=$(NAME).$(PRE_VERSION)
WWW=/import/www/DIST-TOOLS/SYNCHRONE
HTTP=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE
+# for testing opam packages before publishing
+WWWTEST=/import/www/DIST-TOOLS/SYNCHRONE/test
+HTTPTEST=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test
$(PACKNAME).tgz:
git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD
$(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
mv $^ $@
+$(WWWTEST)/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
+
+opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz
+ cd $(WWWTEST)/opam-repository/packages && \
+ oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \
+ cd .. ; opam-admin check && opam-admin make -g
diff --git a/_oasis b/_oasis
index 9842a9a..85023d0 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lutils
-Version: 1.10
+Version: 1.11
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: GPL-3
diff --git a/doc/version.tex b/doc/version.tex
index 5123fd2..3b0c193 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.10}
-\newcommand{\sha}{f72f2b4}
+\newcommand{\version}{1.11}
+\newcommand{\sha}{08ab724}
\newcommand{\versionname}{none}
-\newcommand{\versiondate}{01-12-16}
+\newcommand{\versiondate}{10-03-17}
diff --git a/src/META b/src/META
index 5c365fd..a03b303 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 54fedc79891273606f6979d57066839f)
-version = "1.10"
+# DO NOT EDIT (digest: f6253f3bb51ae8433d46c85a0b609a5e)
+version = "1.11"
description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
requires = "unix str camlp4 num"
archive(byte) = "lutils.cma"
diff --git a/src/lutilsVersion.ml b/src/lutilsVersion.ml
index 6655f71..86214c4 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.10"
-let sha="f72f2b4"
+let str="1.11"
+let sha="08ab724"
--
GitLab