Skip to content
Snippets Groups Projects
Commit 3aee7a36 authored by erwan's avatar erwan
Browse files

The -pdf mode was never returning (ditto for -ps and co), and the latex mode was buggy.

Also, the pdf content was written in the gnuplot.log file.

Add tests
parent 897231e8
No related branches found
No related tags found
No related merge requests found
Pipeline #
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
...@@ -33,10 +33,26 @@ ci: ...@@ -33,10 +33,26 @@ ci:
echo "*** I won't commit!\n*** until you 'make update_version'!" \ echo "*** I won't commit!\n*** until you 'make update_version'!" \
|| (git commit -F log && touch committed) || (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: amend:
test -f committed && git commit -a -F log --amend test -f committed && git commit -a -F log --amend
###############################
# test
.PHONY: test
test:
cd test ; make test
############################### ###############################
# forge # forge
......
# 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
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
OASISFormat: 0.4 OASISFormat: 0.4
Name: lutils Name: lutils
Version: 1.17 Version: 1.18
Authors: Erwan Jahier Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr Maintainers: erwan.jahier@imag.fr
License: GPL-3 License: GPL-3
...@@ -39,6 +39,6 @@ Library lutils ...@@ -39,6 +39,6 @@ Library lutils
SourceRepository "master" SourceRepository "master"
Type: git 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 Branch: master
Browser: https://forge.imag.fr/projects/lutils/ Browser: https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/
\newcommand{\version}{1.17} \newcommand{\version}{1.18}
\newcommand{\sha}{f09e3ec} \newcommand{\sha}{897231e}
\newcommand{\versionname}{none} \newcommand{\versionname}{none}
\newcommand{\versiondate}{30-11-17} \newcommand{\versiondate}{07-12-17}
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: 631f03c8500ab788a77a0b4e1034ad5a) # DO NOT EDIT (digest: 01cad35253defa68c861569ae46c957c)
version = "1.17" version = "1.18"
description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)." description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
requires = "unix str camlp4 num" requires = "unix str camlp4 num"
archive(byte) = "lutils.cma" archive(byte) = "lutils.cma"
......
(* 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 ** This file may only be copied under the terms of the GNU Library General
** Public License ** Public License
...@@ -230,7 +230,7 @@ let terminal_kind_to_string tk file = ...@@ -230,7 +230,7 @@ let terminal_kind_to_string tk file =
| Ps -> "set term post solid \nset output \"" ^ base_fn ^ ".ps\"\n" | Ps -> "set term post solid \nset output \"" ^ base_fn ^ ".ps\"\n"
| Cps -> "set term post color 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" | 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" | X11 -> "set terminal x11"
| Qt -> "set terminal qt size 1600,400" | Qt -> "set terminal qt size 1600,400"
| Default -> "" | Default -> ""
......
(* 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 ** This file may only be copied under the terms of the GNU Library General
** Public License ** Public License
...@@ -122,6 +122,8 @@ let main () = ...@@ -122,6 +122,8 @@ let main () =
rloop() rloop()
) )
in in
if !terminal = NoDisplay then () else rloop () match !terminal with
| X11| Wxt | Qt | Default -> rloop ()
| Jpg | Ps | Pdf | Cps | Eps | Latex | NoDisplay -> ()
let _ = main () let _ = main ()
let str="1.17" let str="1.18"
let sha="f09e3ec" let sha="897231e"
../_build/src/gnuplotRifMain.native
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment