diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 730ba51a3a80091dcc62c2108175ff4cb1d234b0..b31bc66548595914638e643895d827a3ccea258f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,8 @@ image: ocaml/opam:ubuntu variables: GIT_STRATEGY: clone +before_script: + opam install camlp4 stages: - build diff --git a/_oasis b/_oasis index eaabdb2623eb8c6184bc5aa65935666fc9676b4d..cb6907539b7b7a4260dc240261e399b5ac7bca96 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lutils -Version: 1.22 +Version: 1.23 Authors: Erwan Jahier Maintainers: erwan.jahier@imag.fr License: GPL-3 diff --git a/doc/version.tex b/doc/version.tex index 89b7a9774a841018717bab9304afa53f0ef3f607..00284eec9580c9c049676b98f06fa7757eeb2f59 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,4 +1,4 @@ -\newcommand{\version}{1.22} -\newcommand{\sha}{943470a} +\newcommand{\version}{1.23} +\newcommand{\sha}{8b7a7de} \newcommand{\versionname}{none} \newcommand{\versiondate}{08-12-17} diff --git a/setup.ml b/setup.ml index 0a45e20129cf453b4b082063540e2279d3043473..a8845f7d3b5608b51fa9020152c08ef105ffb49c 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: c3931a0407d5bf5bbfe984ac8903f4a6) *) +(* DO NOT EDIT (digest: 65884de33b0e5272f670d6f66f7be6c4) *) (* 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.22"; + version = "1.23"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7254,8 +7254,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.10"; - oasis_digest = - Some "\240\246\152\175\150\242I\017?k4\160\171\163\219\133"; + oasis_digest = Some "\192Uf\185\248\001\178'\150\005`\132>\011~."; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7263,7 +7262,7 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7267 "setup.ml" +# 7266 "setup.ml" let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t open BaseCompat.Compat_0_4 (* OASIS_STOP *) diff --git a/src/META b/src/META index 6afd54dc008cd10fff7dfa3f581da7e42c29200e..8f971ddfdc868fca8b8748dd52dd6b59dc8653b5 100644 --- a/src/META +++ b/src/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 8e03da8e91e95d09b4227d20939ab65a) -version = "1.22" +# DO NOT EDIT (digest: 7beeecc388a5c11e700851d431d711f5) +version = "1.23" 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 47ae2d21b13579035ef6ce4bba64b364040fb380..97b914c3da61b969b6cad76aafc7d77a46500d8f 100644 --- a/src/lutilsVersion.ml +++ b/src/lutilsVersion.ml @@ -1,2 +1,2 @@ -let str="1.22" -let sha="943470a" +let str="1.23" +let sha="8b7a7de"