From a5d7fd56967e00c5436a87a04bb5752aa2efe1b5 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Mon, 30 Apr 2018 15:57:53 +0200
Subject: [PATCH] Put setup.ml in the lutils.install file so that lutils can be
opam-uninstall properly
---
_oasis | 2 +-
doc/version.tex | 6 +++---
lutils.install | 6 ++++++
setup.ml | 9 +++++----
src/META | 4 ++--
src/lutilsVersion.ml | 4 ++--
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/_oasis b/_oasis
index 72793c4..c48192a 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lutils
-Version: 1.39
+Version: 1.41
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: CeCILL
diff --git a/doc/version.tex b/doc/version.tex
index 0dae768..484530c 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.40}
-\newcommand{\sha}{1fbbf1c}
+\newcommand{\version}{1.41}
+\newcommand{\sha}{293b568}
\newcommand{\versionname}{none}
-\newcommand{\versiondate}{23-03-18}
+\newcommand{\versiondate}{27-04-18}
diff --git a/lutils.install b/lutils.install
index 29856df..7b7b633 100644
--- a/lutils.install
+++ b/lutils.install
@@ -1,3 +1,9 @@
+etc: [
+ "setup.ml"
+ "setup.data"
+ "setup.log"
+]
+
bin: [
"_build/src/gnuplotRifMain.native" {"gnuplot-rif"}
]
diff --git a/setup.ml b/setup.ml
index 400292f..561c0db 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.10 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 63729d6c9e4d64de6f8abc89dea4c197) *)
+(* DO NOT EDIT (digest: 898ed4959d985994f4611ed88b8c8c6f) *)
(*
Regenerated by OASIS v0.4.10
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6855,7 +6855,7 @@ let setup_t =
{
oasis_version = "0.4";
ocaml_version = None;
- version = "1.39";
+ version = "1.41";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -7254,7 +7254,8 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.10";
- oasis_digest = Some "\175B\201#!K\171\002\1373w~\138q5\"";
+ oasis_digest =
+ Some "\180\000\135\151\192~\143\170\012\028\134\136\135^,\031";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
@@ -7262,7 +7263,7 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 7266 "setup.ml"
+# 7267 "setup.ml"
let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
open BaseCompat.Compat_0_4
(* OASIS_STOP *)
diff --git a/src/META b/src/META
index 070fea4..51ae841 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 2f93171c7d10f868c35f4bc99fd16e2b)
-version = "1.39"
+# DO NOT EDIT (digest: c39f6b0a9390022a198c15227b12205c)
+version = "1.41"
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 8ae37d5..d97bcb3 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.40"
-let sha="1fbbf1c"
+let str="1.41"
+let sha="293b568"
--
GitLab