Commit d01c84d8 authored by erwan's avatar erwan
Browse files

Do not generate the opam file with aosis2opam anymore

parent cbcf6675
Pipeline #7756 passed with stages
in 3 minutes and 29 seconds
......@@ -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
......@@ -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/
OASISFormat: 0.4
Name: lutils
Version: 1.44
Version: 1.45
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: CeCILL
......
\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}
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/ "]
(* 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 *)
......
# 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"
......
let str="1.44"
let sha="080108b"
let str="1.45"
let sha="cbcf667"
Supports Markdown
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