Skip to content
Snippets Groups Projects
Commit 24455b30 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Fix the generation of opam packages

parent b5e55fe0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile.dev
+ 5
− 6
View file @ 24455b30
...@@ -86,7 +86,7 @@ WWWTEST=/import/www/DIST-TOOLS/SYNCHRONE/test ...@@ -86,7 +86,7 @@ WWWTEST=/import/www/DIST-TOOLS/SYNCHRONE/test
HTTPTEST=http://www-verimag.imag.fr/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_FILE_TEST=$(shell find $(WWW)/test/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/')
OPAM_DIR=$(shell dirname $(OPAM_FILE)) OPAM_DIR=$(shell dirname $(OPAM_FILE))
OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lustre-v6 OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lustre-v6
...@@ -95,14 +95,13 @@ $(PACKNAME).tgz: ...@@ -95,14 +95,13 @@ $(PACKNAME).tgz:
git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD
$(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
mv $^ $@ cp $^ $@
$(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz $(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
mv $^ $@ mv $^ $@
opam : $(WWW)/pool/$(PACKNAME).tgz opam : $(WWW)/pool/$(PACKNAME).tgz
[ $(BRANCH) = "master" ] && test -f committed && ( \ [ "$(BRANCH)" = "master" ] && test -f committed && ( \
cd $(WWW)/opam-repository/packages && \ cd $(WWW)/opam-repository/packages && \
oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \ oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
cp ~/lus2lic/opam $(OPAM_FILE) && \ cp ~/lus2lic/opam $(OPAM_FILE) && \
...@@ -112,9 +111,9 @@ opam : $(WWW)/pool/$(PACKNAME).tgz ...@@ -112,9 +111,9 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
cp -rf $(OPAM_DIR) $(OFFICIAL_OPAM_DIR) cp -rf $(OPAM_DIR) $(OFFICIAL_OPAM_DIR)
opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz 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 && \ oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \
cp ~/lus2lic/opam $(OPAM_FILE_TEST) && \ cp opam $(OPAM_FILE_TEST) && \
cd .. ; opam-admin check && opam-admin make -g cd .. ; opam-admin check && opam-admin make -g
......
_oasis
+ 1
− 1
View file @ 24455b30
OASISFormat: 0.4 OASISFormat: 0.4
Name: lustre-v6 Name: lustre-v6
Version: 1.745 Version: 1.746
Synopsis: The Lustre V6 Verimag compiler Synopsis: The Lustre V6 Verimag compiler
Description: This package contains: Description: This package contains:
- lv6: the (current) name of the compiler (and interpreter via -exec) - lv6: the (current) name of the compiler (and interpreter via -exec)
......
src/lv6version.ml
+ 2
− 2
View file @ 24455b30
(** Automatically generated from Makefile *) (** Automatically generated from Makefile *)
let tool = "lv6" let tool = "lv6"
let branch = "master" let branch = "master"
let commit = "745" let commit = "746"
let sha_1 = "148595c1ec2f86bbf6a74ebed15a11eb077f8d24" let sha_1 = "b5e55fe04f49eef5a6182a8574c8144a5ee7952a"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")") let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "erwan.jahier@univ-grenoble-alpes.fr" let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"
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