From 24455b304c38f3412a969e00141a6260ee62e1c6 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Wed, 4 Jul 2018 16:01:57 +0200
Subject: [PATCH] Fix the generation of opam packages
---
Makefile.dev | 11 +++++------
_oasis | 2 +-
src/lv6version.ml | 4 ++--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Makefile.dev b/Makefile.dev
index 9294562c..2232f6a0 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -86,7 +86,7 @@ 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_FILE=$(shell find $(WWW)/opam-repository/packages -name opam | head -1 | sed -e 's/^./\U&/')
OPAM_FILE_TEST=$(shell find $(WWW)/test/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/lustre-v6
@@ -95,14 +95,13 @@ $(PACKNAME).tgz:
git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD
$(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
- mv $^ $@
+ cp $^ $@
$(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
mv $^ $@
-
opam : $(WWW)/pool/$(PACKNAME).tgz
- [ $(BRANCH) = "master" ] && test -f committed && ( \
+ [ "$(BRANCH)" = "master" ] && test -f committed && ( \
cd $(WWW)/opam-repository/packages && \
oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
cp ~/lus2lic/opam $(OPAM_FILE) && \
@@ -112,9 +111,9 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
cp -rf $(OPAM_DIR) $(OFFICIAL_OPAM_DIR)
opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz
- [ $(BRANCH) = "master" ] && cd $(WWWTEST)/opam-repository/packages && \
+ [ "$(BRANCH)" = "master" ] && cd $(WWWTEST)/opam-repository/packages && \
oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \
- cp ~/lus2lic/opam $(OPAM_FILE_TEST) && \
+ cp opam $(OPAM_FILE_TEST) && \
cd .. ; opam-admin check && opam-admin make -g
diff --git a/_oasis b/_oasis
index 01d981dd..b5f2c7b1 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lustre-v6
-Version: 1.745
+Version: 1.746
Synopsis: The Lustre V6 Verimag compiler
Description: This package contains:
- lv6: the (current) name of the compiler (and interpreter via -exec)
diff --git a/src/lv6version.ml b/src/lv6version.ml
index 52d4bae3..366b18d7 100644
--- a/src/lv6version.ml
+++ b/src/lv6version.ml
@@ -1,7 +1,7 @@
(** Automatically generated from Makefile *)
let tool = "lv6"
let branch = "master"
-let commit = "745"
-let sha_1 = "148595c1ec2f86bbf6a74ebed15a11eb077f8d24"
+let commit = "746"
+let sha_1 = "b5e55fe04f49eef5a6182a8574c8144a5ee7952a"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"
--
GitLab