From d01c84d8eab7916f9109af7ce64d8f619c8bc38e Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Thu, 17 May 2018 17:11:56 +0200
Subject: [PATCH] Do not generate the opam file with aosis2opam anymore
---
.gitlab-ci.yml | 3 ++-
Makefile.dev | 18 +++++++++++++++++-
_oasis | 2 +-
doc/version.tex | 6 +++---
opam | 29 +++++++++++++++++++++++++++++
setup.ml | 9 +++++----
src/META | 4 ++--
src/lutilsVersion.ml | 4 ++--
8 files changed, 61 insertions(+), 14 deletions(-)
create mode 100644 opam
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70599fb..3c6662b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,4 +22,5 @@ test_opam_test:
script:
- opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test/opam-repository"
- opam update
- - opam install lutils
+ - opam depext lutils -y
+ - opam install lutils -y
diff --git a/Makefile.dev b/Makefile.dev
index 95f4206..89bbb65 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -78,6 +78,11 @@ HTTP=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE
WWWTEST=/import/www/DIST-TOOLS/SYNCHRONE/test
HTTPTEST=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test
+
+OPAM_FILE=$(shell find $(WWW)/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/')
+OPAM_DIR=$(shell dirname $(OPAM_FILE))
+OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lutils
+
$(PACKNAME).tgz:
git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD
@@ -90,9 +95,20 @@ $(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
opam : $(WWW)/pool/$(PACKNAME).tgz
cd $(WWW)/opam-repository/packages && \
oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
- cd .. ; opam-admin check && opam-admin make -g
+ cp ~/lutils/opam $(OPAM_FILE) && \
+ cd .. ; opam-admin check && opam-admin make -g && \
+ cp -rf $(OPAM_DIR) $(OFFICIAL_OPAM_DIR)
opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz
cd $(WWWTEST)/opam-repository/packages && \
oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \
+ cp ~/lutils/opam $(OPAM_FILE_TEST) && \
cd .. ; opam-admin check && opam-admin make -g
+
+opam-pr:
+ cp $(OPAM_DIR) /home/jahier/local/opam-repository/packages/
+
+OPAM_FILE=$(shell find $(WWW)/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/')
+OPAM_DIR=`dirname $(OPAM_FILE)`
+opam-pr:
+ cp $(OPAM_DIR) /home/jahier/local/opam-repository/packages/
diff --git a/_oasis b/_oasis
index 94468b4..efbbb3e 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lutils
-Version: 1.44
+Version: 1.45
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: CeCILL
diff --git a/doc/version.tex b/doc/version.tex
index 939a6f5..ce03c79 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.44}
-\newcommand{\sha}{080108b}
+\newcommand{\version}{1.45}
+\newcommand{\sha}{cbcf667}
\newcommand{\versionname}{none}
-\newcommand{\versiondate}{15-05-18}
+\newcommand{\versiondate}{16-05-18}
diff --git a/opam b/opam
new file mode 100644
index 0000000..17bddf5
--- /dev/null
+++ b/opam
@@ -0,0 +1,29 @@
+opam-version: "1.2"
+maintainer: "erwan.jahier@imag.fr"
+authors: [ "Erwan Jahier" ]
+license: "CeCILL"
+homepage: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"
+dev-repo: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils.git"
+bug-reports: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"
+build: [
+ ["ocaml" "setup.ml" "-configure" "--prefix" prefix]
+ ["ocaml" "setup.ml" "-build"]
+]
+install: ["ocaml" "setup.ml" "-install"]
+remove: [
+ ["ocaml" "%{etc}%/lutils/setup.ml" "-C" "%{etc}%/lutils" "-uninstall"]
+]
+build-test: [
+ ["ocaml" "setup.ml" "-configure" "--enable-tests"]
+ ["ocaml" "setup.ml" "-build"]
+ ["ocaml" "setup.ml" "-test"]
+]
+depends: [
+ "base-unix"
+ "camlp4"
+ "ocamlbuild" {build}
+ "ocamlfind"
+ "num"
+]
+available: [ ocaml-version >= "4.02" ]
+post-messages: ["The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "]
diff --git a/setup.ml b/setup.ml
index ef9265e..b345d4e 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: 7a6bf0c8c372a6f256906c3924b3684f) *)
+(* DO NOT EDIT (digest: fa7ca0cf0a8ddca4623870de69e8228b) *)
(*
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 = Some (OASISVersion.VGreaterEqual "4.02");
- version = "1.44";
+ version = "1.45";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -7256,7 +7256,8 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.10";
- oasis_digest = Some "qS\025\1479\017\170\225\159\180'\215\020`\022\209";
+ oasis_digest =
+ Some "\165\182\205\244\220\202\217z\000b\145\157\251\015\024W";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
@@ -7264,7 +7265,7 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 7268 "setup.ml"
+# 7269 "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 8049dbe..c6c55aa 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: edb5a8985f03b1674efb93fc7298fc35)
-version = "1.44"
+# DO NOT EDIT (digest: d4db006f5d8240469ab42566ac95e554)
+version = "1.45"
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 395264d..feb873e 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.44"
-let sha="080108b"
+let str="1.45"
+let sha="cbcf667"
--
GitLab