diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4c43c50f06df7a8cfb315a07170bdcefae5fa54..a1201f631fb712183efbc8d9aa5d2c0f17a8ce72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,10 +3,6 @@ image: ocaml/opam:ubuntu variables: GIT_STRATEGY: clone -before_script: - - opam install camlp4 ocamlfind - - eval `opam config env` - - which camlp4 stages: - build @@ -15,7 +11,9 @@ stages: build: stage: build script: + - opam install camlp4 ocamlfind - make + - make install test: stage: test @@ -24,6 +22,9 @@ test: - make test-batch local_test: + stage: none script: - make + - make install + - ls -l ../_build/src/gnuplotRifMain.native - make test-batch diff --git a/Makefile.dev b/Makefile.dev index b294c8ba0c2252c8cad207eaa88516d77a1399c1..f8f25a4d086cd26e96600037cf41f65a3ccb10f1 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -55,6 +55,9 @@ amend: test: cd test ; make test +test-batch: + cd test ; make test-batch + ############################# # tags diff --git a/_oasis b/_oasis index 251f5313e30a291d2445cec62b24b89e1af61b2b..b17680736d2c8b01598fbaedde7a1db753ebd36a 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lutils -Version: 1.27 +Version: 1.28 Authors: Erwan Jahier Maintainers: erwan.jahier@imag.fr License: GPL-3 diff --git a/doc/version.tex b/doc/version.tex index ee1b79c661e24cf4e4c4ad2bcbd60e29ffe66d34..80c61f1b61dd9232e43671ca21e91bec450562e0 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,4 +1,4 @@ -\newcommand{\version}{1.27} -\newcommand{\sha}{4ce9cf1} +\newcommand{\version}{1.28} +\newcommand{\sha}{767558d} \newcommand{\versionname}{none} \newcommand{\versiondate}{08-12-17} diff --git a/setup.ml b/setup.ml index 5932114d3bb0c95c922dfe6818d08f849304ed48..28714e8887295778cbad2d3f9d20100e41b6f856 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.4.10 *) (* OASIS_START *) -(* DO NOT EDIT (digest: e60c81dbc2ddcb857ed320f8b5c11a31) *) +(* DO NOT EDIT (digest: fbfca4bc0b51c7db73d4226244b848de) *) (* 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 = None; - version = "1.27"; + version = "1.28"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7254,7 +7254,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.10"; - oasis_digest = Some "Q\223\163O\031AK\166\168H\150\220K\177\1623"; + oasis_digest = Some "z\225veg 2\130\212\164\211(\225\018\207\203"; oasis_exec = None; oasis_setup_args = []; setup_update = false diff --git a/src/META b/src/META index 879ad537eb978cf425514c7a4a35d848a56fc14b..4c671c5c3f1611fd602d3efdbde7ac525fe15263 100644 --- a/src/META +++ b/src/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: b36b4285a3f473b2807ff207d6ac2c0f) -version = "1.27" +# DO NOT EDIT (digest: df4bca649125fec64ea2a93918a4db07) +version = "1.28" description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)." requires = "unix str camlp4 num" archive(byte) = "lutils.cma" diff --git a/src/lutilsVersion.ml b/src/lutilsVersion.ml index b6f19852a84ac4ef74f2f323e4795f7d756e26df..ba5211af34754a60b83935ede897bd171687fc9f 100644 --- a/src/lutilsVersion.ml +++ b/src/lutilsVersion.ml @@ -1,2 +1,2 @@ -let str="1.27" -let sha="4ce9cf1" +let str="1.28" +let sha="767558d" diff --git a/test/Makefile b/test/Makefile index 6efa7852244fb815be440a315482a5023a67e075..94038f706c1900eab8ab7bbc3bf0ce143ff86136 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,4 +1,4 @@ -GNUPLOTRIF=./gnuplot-rif +GNUPLOTRIF=gnuplot-rif pdf: $(GNUPLOTRIF) ControleurPorte.rif -pdf