diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c7d1f4c283820753553a8a24eccf363d0411046e
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+image: ocaml/opam:ubuntu
+
+variables:
+ GIT_STRATEGY: clone
+
+
+stage:
+ - build
+ - test
+
+build:
+ stage: build
+ script:
+ - make
+
+test:
+ stage: test
+ script:
+ - cd test
+ - make test-batch
+
diff --git a/Makefile.dev b/Makefile.dev
index b8f20d1f03d31444ce58383668b5bc7cfcf7040e..a2148807d3f80ff68e94a1e74d86a6174b8405b6 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -33,10 +33,26 @@ ci:
echo "*** I won't commit!\n*** until you 'make update_version'!" \
|| (git commit -F log && touch committed)
+push:
+ make opam-test && git push
+
+merge: merge_work_into_master
+merge_work_into_master:
+ echo "git checkout master && \
+ git merge work && make opam && \
+ git push "
+
amend:
test -f committed && git commit -a -F log --amend
+###############################
+# test
+
+.PHONY: test
+test:
+ cd test ; make test
+
###############################
# forge
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..edf0ad3a1e780a13f0822211633132acbdca131a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,42 @@
+
+# Table of Contents
+
+1. [Installing `lutils` via opam](#orgdb9b2ce)
+2. [Installing the git source](#org5d904a1)
+3. [Tests](#orge9c6280)
+
+Tools and libs shared by other Verimag/synchronous tools (lustre, lutin, rdbg).
+
+- The lutils ocaml library contains various modules shared between
+ tools. Those modules deal with:
+ - generate and parse RIF files
+ - generate dro files (to call luciole)
+- `gnuplot-rif` is a stand alone executable that vizualises RIF files
+ using gnuplot.
+
+
+<a id="orgdb9b2ce"></a>
+
+# Installing `lutils` via opam
+
+ $ opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository"
+ $ opam update
+ $ opam install lutils
+
+
+<a id="org5d904a1"></a>
+
+# Installing the git source
+
+ git clone https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/lutils.git
+ cd lutils
+ make configure
+ make
+
+
+<a id="orge9c6280"></a>
+
+# Tests
+
+ make test
+
diff --git a/README.org b/README.org
new file mode 100644
index 0000000000000000000000000000000000000000..62ea4cf7d860e57e9a96874f33ea4b624498abbb
--- /dev/null
+++ b/README.org
@@ -0,0 +1,34 @@
+
+Tools and libs shared by other Verimag/synchronous tools (lustre, lutin, rdbg).
+
++ The lutils ocaml library contains various modules shared between
+ tools. Those modules deal with:
+ - generate and parse RIF files
+ - generate dro files (to call luciole)
++ =gnuplot-rif= is a stand alone executable that vizualises RIF files
+ using gnuplot.
+
+* Installing =lutils= via opam
+
+#+BEGIN_SRC sh
+$ opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository"
+$ opam update
+$ opam install lutils
+#+END_SRC
+
+* Installing the git source
+
+#+BEGIN_SRC sh
+git clone https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/lutils.git
+cd lutils
+make configure
+make
+#+END_SRC
+
+* Tests
+
+#+BEGIN_SRC sh
+make test
+#+END_SRC
+
+
diff --git a/_oasis b/_oasis
index 33117fbc584c14758134c46e3241499e1381922d..5e98bd1d4527357d25194dbf51f84713f42c0168 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lutils
-Version: 1.17
+Version: 1.18
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: GPL-3
@@ -39,6 +39,6 @@ Library lutils
SourceRepository "master"
Type: git
- Location: https://forge.imag.fr/anonscm/git/lutils/lutils.git
+ Location: https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils.git
Branch: master
- Browser: https://forge.imag.fr/projects/lutils/
+ Browser: https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/
diff --git a/doc/version.tex b/doc/version.tex
index 6999e04ea30bc752c9beaa25563eb300d7e0a091..4733c4035a1598dae163d8c5f214b2e2141bd44d 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.17}
-\newcommand{\sha}{f09e3ec}
+\newcommand{\version}{1.18}
+\newcommand{\sha}{897231e}
\newcommand{\versionname}{none}
-\newcommand{\versiondate}{30-11-17}
+\newcommand{\versiondate}{07-12-17}
diff --git a/src/META b/src/META
index 8e06331b6095267d67d7a2c735db72e485255b60..4c29269925fca4139e8d8223c18220187c5509a7 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 631f03c8500ab788a77a0b4e1034ad5a)
-version = "1.17"
+# DO NOT EDIT (digest: 01cad35253defa68c861569ae46c957c)
+version = "1.18"
description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
requires = "unix str camlp4 num"
archive(byte) = "lutils.cma"
diff --git a/src/gnuplotRif.ml b/src/gnuplotRif.ml
index 46d283ec6a9f38a8f7c361b755598e4f905a0458..5a9f857bbb71b1fdbbdc049f8d5136d06806467f 100644
--- a/src/gnuplotRif.ml
+++ b/src/gnuplotRif.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 24/11/2017 (at 11:32) by Erwan Jahier> *)
+(* Time-stamp: <modified the 07/12/2017 (at 17:54) by Erwan Jahier> *)
(*-----------------------------------------------------------------------
** This file may only be copied under the terms of the GNU Library General
** Public License
@@ -230,7 +230,7 @@ let terminal_kind_to_string tk file =
| Ps -> "set term post solid \nset output \"" ^ base_fn ^ ".ps\"\n"
| Cps -> "set term post color solid \nset output \"" ^ base_fn ^ ".ps\"\n"
| Eps -> "set term post color solid eps\nset output \"" ^ base_fn ^ ".eps\"\n"
- | Latex -> "set term solid latex\nset output \"" ^ base_fn ^ ".tex\"\n"
+ | Latex -> "set term latex\nset output \"" ^ base_fn ^ ".tex\"\n"
| X11 -> "set terminal x11"
| Qt -> "set terminal qt size 1600,400"
| Default -> ""
diff --git a/src/gnuplotRifMain.ml b/src/gnuplotRifMain.ml
index 417a7e07860f03407a1776c271d7078cc6d73220..c0d273d27df8eb14ce84d392119183fb80bc796d 100644
--- a/src/gnuplotRifMain.ml
+++ b/src/gnuplotRifMain.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 09/10/2017 (at 22:50) by Erwan Jahier> *)
+(* Time-stamp: <modified the 07/12/2017 (at 17:36) by Erwan Jahier> *)
(*-----------------------------------------------------------------------
** This file may only be copied under the terms of the GNU Library General
** Public License
@@ -122,6 +122,8 @@ let main () =
rloop()
)
in
- if !terminal = NoDisplay then () else rloop ()
+ match !terminal with
+ | X11| Wxt | Qt | Default -> rloop ()
+ | Jpg | Ps | Pdf | Cps | Eps | Latex | NoDisplay -> ()
let _ = main ()
diff --git a/src/lutilsVersion.ml b/src/lutilsVersion.ml
index e1cbf237e517787310247db68ea59cfe93d89d92..fe5315934f4210ff94f4883be75c921c3e1a97fc 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.17"
-let sha="f09e3ec"
+let str="1.18"
+let sha="897231e"
diff --git a/test/gnuplot-rif b/test/gnuplot-rif
new file mode 120000
index 0000000000000000000000000000000000000000..520ec7423ce271746de6838674985d58a3d0fc05
--- /dev/null
+++ b/test/gnuplot-rif
@@ -0,0 +1 @@
+../_build/src/gnuplotRifMain.native
\ No newline at end of file