change the opam install script so that ext dep are install automatically

.gitlab-ci.yml

@@ -22,9 +22,9 @@ build:
 test_opam_test:
   stage: test
   script:
-    - sudo apt-get install -y libgmp-dev libmpfr-dev m4
     - opam repo add opam-ocaml-org "https://opam.ocaml.org"
     - opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test/opam-repository"
     - opam update
     - opam install -y lutin
 
+

Makefile.dev

@@ -87,17 +87,20 @@ $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
 $(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
 	mv $^ $@ 
 
-OPAM_FILE=`find  $(WWW)/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/'`
+OPAM_FILE=$(shell find  $(WWW)/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/')
+OPAM_FILE_TEST=$(shell find  $(WWWTEST)/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/lutin
+
 opam : $(WWW)/pool/$(PACKNAME).tgz
 	cd $(WWW)/opam-repository/packages && \
 	oasis2opam   $(HTTP)/pool/$(PACKNAME).tgz && \
 	echo "OPAM_FILE=$(OPAM_FILE)" && \
-	cat $(OPAM_FILE) | ocaml $(PWD)/utils/fixopam_file.ml > $(OPAM_FILE)-fixed && \
-	cp $(OPAM_FILE) $(OPAM_FILE).save && \
-	cp $(OPAM_FILE)-fixed $(OPAM_FILE) && \
-	cd .. ; opam-admin check  && opam-admin make -g
+	cd .. ; opam-admin check  && opam-admin make -g && \
+	echo 'post-messages: ["A more up-to-date version can be obtained from (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "]' >>  $(OPAM_FILE) && \
+	cp -rf $(OPAM_DIR) $(OFFICIAL_OPAM_DIR)
 
-OPAM_FILE_TEST=`find  $(WWWTEST)/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/'`
 opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz
 	cd $(WWWTEST)/opam-repository/packages && \
 	oasis2opam  $(HTTPTEST)/pool/$(PACKNAME).tgz && \

_oasis

 OASISFormat: 0.4
 Name:        Lutin
-Version:     2.53
+Version:     2.54
 Authors:     Erwan Jahier, Pascal Raymond, Bertrand Jeannnet (polka), Yvan Roux
 Maintainers: erwan.jahier@univ-grenoble-alpes.fr  
 License:     CeCILL

_opam

+depexts: [
+  [ ["alpine" ]  ["perl" "gmp-dev" "mpfr-dev" "m4"] ]
+  [ ["debian" ]  ["perl" "libgmp-dev" "libmpfr-dev" "m4"] ]
+  [ ["ubuntu" ]  ["perl" "libgmp-dev" "libmpfr-dev" "m4"] ]
+]

lutin/src/version.ml

-let str="2.53"
-let sha="4528bd0"
+let str="2.54"
+let sha="4358413"

utils/fixopam_file.ml

-(* Time-stamp: <modified the 14/06/2016 (at 18:14) by Erwan Jahier> *)
+(* Time-stamp: <modified the 16/05/2018 (at 17:39) by Erwan Jahier> *)
 (* Replace 
   build: [ * ] 
 by  
@@ -18,9 +18,11 @@ let _ =
         removing := true;
       if !removing  && line.[0] = ']' then (
         removing := false;
-        print_string "  [\"oasis\" \"setup\"]
+        print_string " 
+  [\"opam\" \"depext\" \"-y\" \"lutin\"]
+  [\"oasis\" \"setup\"]
   [\"ocaml\" \"setup.ml\" \"-configure\" \"--prefix\" prefix]
-  [\"make\" \"build\"]
+  [make \"build\"]
 ]
 "
       );