Commit 063e00f4 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

fix opam installation (wrt the generation of the opam file)

parent 9e4b5902
...@@ -81,11 +81,11 @@ $(PACKNAME).tgz: ...@@ -81,11 +81,11 @@ $(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 $^ $@ cp $^ $@
OPAM_FILE=$(shell find $(WWW)/opam-repository/packages -name opam | grep Lutin | sort | tail -1 | sed -e 's/^./\U&/') OPAM_FILE=$(shell find $(WWW)/opam-repository/packages -name opam | grep Lutin | sort | tail -1 | sed -e 's/^./\U&/')
OPAM_FILE_TEST=$(shell find $(WWWTEST)/opam-repository/packages -name opam | grep Lutin | sort | tail -1 | sed -e 's/^./\U&/') OPAM_FILE_TEST=$(shell find $(WWWTEST)/opam-repository/packages -name opam | grep Lutin | sort | tail -1 | sed -e 's/^./\U&/')
...@@ -94,8 +94,12 @@ OPAM_DIR=$(shell dirname $(OPAM_FILE)) ...@@ -94,8 +94,12 @@ OPAM_DIR=$(shell dirname $(OPAM_FILE))
OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lutin OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lutin
x: x:
echo $(OPAM_FILE)
echo $(OPAM_FILE_TEST) echo $(OPAM_FILE_TEST)
i:
opam-installer Lutin.install --prefix=$(OPAM_DIR)
opam : $(WWW)/pool/$(PACKNAME).tgz opam : $(WWW)/pool/$(PACKNAME).tgz
cd $(WWW)/opam-repository/packages && \ cd $(WWW)/opam-repository/packages && \
oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \ oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
...@@ -106,9 +110,12 @@ opam : $(WWW)/pool/$(PACKNAME).tgz ...@@ -106,9 +110,12 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz
cd $(WWWTEST)/opam-repository/packages && \ cd $(WWWTEST)/opam-repository/packages && \
oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \ oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \
cp ~/lurette/opam $(OPAM_FILE_TEST) && \ opam-installer Lutin.install --prefix=$(OPAM_DIR) && \
cd .. ; opam-admin check && opam-admin make -g cd .. ; opam-admin check && opam-admin make -g
# xxxcp ~/lurette/opam $(OPAM_FILE_TEST) && \
opam-pr: opam-pr:
cp -rf $(OPAM_DIR) /home/jahier/local/opam-repository/packages/lutin/ cp -rf $(OPAM_DIR) /home/jahier/local/opam-repository/packages/lutin/
......
post-messages: ["The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "]
\ No newline at end of file
Markdown is supported
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