Build: use dune instead of oasis

.gitignore

@@ -5,7 +5,8 @@ _build/
 *.rif
 *~
 #*
-
+*.install
+.merlin
 log
 myocamlbuild.ml
 setup.ml
@@ -25,3 +26,4 @@ linux64/
 Makefile.local
 Makefile.version
 bin/
+lib/lutilsVersion.ml
\ No newline at end of file

Makefile

 
 all:build
 
-
 PREFIX=$(shell opam config var prefix)
 
-
 -include ./Makefile.version
-build:  setup.data
-	ocaml setup.ml -build
-
-setup.ml:_oasis
-	oasis setup  
-
-
-setup.data:configure
-configure: setup.ml
-	ocaml setup.ml -configure --prefix $(PREFIX)
-
+build:  lib/lutilsVersion.ml
+	dune build @install
 
 install:
-	ocaml setup.ml -install
-
-uninstall:
-	ocaml setup.ml -uninstall
-
-reinstall:
-	ocaml setup.ml -reinstall
+	dune install
 
 clean:
-	ocaml setup.ml -clean
-	rm -f setup.data
-	rm -f src/lutilsVersion.ml
-
-distclean:
-	ocaml setup.ml -distclean
-	rm -rf _build/src
-
+	dune clean
+	rm -f lib/lutilsVersion.ml
 
 
 ###############################

Makefile.version

@@ -5,10 +5,10 @@ BRANCH:=$(shell git branch | grep "*" | cut -d ' ' -f 2 || basename `pwd` | echo
 VERSION=$(shell git describe --tags || basename `pwd` | cut -d '.' -f2-4)
 
 del_version:
-	rm -f src/lutilsVersion.ml
+	rm -f lib/lutilsVersion.ml
 
 gen_version: del_version src/lutilsVersion.ml 
 
-src/lutilsVersion.ml:
-	echo "let str=\"$(VERSION)\"" > src/lutilsVersion.ml ; \
-	echo "let sha=\"$(SHA)\"" >> src/lutilsVersion.ml 
+lib/lutilsVersion.ml:
+	echo "let str=\"$(VERSION)\"" > lib/lutilsVersion.ml ; \
+	echo "let sha=\"$(SHA)\"" >> lib/lutilsVersion.ml 

_oasis

-OASISFormat: 0.4
-Name:        lutils
-Version:     1.49.5
-Authors:     Erwan Jahier
-Maintainers: erwan.jahier@imag.fr
-License:     CeCILL
-Plugins:     DevFiles (0.4), META (0.4)
-Synopsis:    Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg).
-Homepage:    https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/
-Description: 
-    The gnuplot-rif tool vizualise RIF files using gnuplot.
-
-    The lutils library contains various modules shared between tools developped 
-    at Verimag in the synchronous group. Those modules deal with:
-     - generate and parse RIF files
-     - generate dro files (to call luciole) 
-
-BuildTools: ocamlbuild
-PreBuildCommand: make src/lutilsVersion.ml
-OCamlVersion: >= 4.02
-PostInstallCommand:  cp emacs/*.el $prefix/lib/$pkg_name
-
-
-# A simple data visualiser based on gnuplot
-Executable "gnuplot-rif"
-  Path:       src
-  CompiledObject: native
-  MainIs:     gnuplotRifMain.ml
-  BuildDepends: unix,str,num
-  CompiledObject: native
-  Install: true
-
-
-Library lutils
-  XMETADescription: shared by Verimag/synchronous tools (lustre, lutin, rdbg).
-  Path: src/
-  BuildDepends: unix,str,num
-  Modules: RifIO,Data,LocalGenlex,GnuplotRif,Mypervasives,Luciole,LutilsVersion
-  Install: true
-  XMETAEnable: true
-
-SourceRepository "master"
-  Type: git
-  Location: https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils.git 
-  Branch: master
-  Browser:  https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/

lib/dune

+(library
+  (name lutils)
+  (public_name lutils)
+  (libraries unix str num)
+  (wrapped false)
+  (synopsis "A lib shared by Verimag/synchronous tools (lustre-v6, lutin, rdbg).")
+)

lutils.install

-etc: [
-  "setup.ml"
-  "setup.data"
-  "setup.log"
-]
-
-bin: [
-  "_build/src/gnuplotRifMain.native" {"gnuplot-rif"}
-  ]

lutils.opam

+opam-version: "2.0"
+synopsis: "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
+description: """
+The lutils library contains various modules shared between tools developped at
+Verimag in the synchronous group. Those modules deal with:
+- generate and parse RIF files
+- generate dro files (to call luciole)
+
+The gnuplot-rif tool vizualise RIF files using gnuplot. 
+"""
+maintainer: "erwan.jahier@imag.fr"
+authors: "Erwan Jahier"
+license: "CeCILL"
+homepage:
+  "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"
+bug-reports:
+  "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"
+depends: [
+  "ocaml" {>= "4.02"}
+  "base-unix"
+  "ocamlbuild" {build}
+  "ocamlfind"
+  "num"
+]
+build: [
+  ["ocaml" "setup.ml" "-configure" "--prefix" prefix]
+  ["ocaml" "setup.ml" "-build"]
+  ["ocaml" "setup.ml" "-configure" "--enable-tests"] {with-test}
+  ["ocaml" "setup.ml" "-build"] {with-test}
+  ["ocaml" "setup.ml" "-test"] {with-test}
+]
+install: ["ocaml" "setup.ml" "-install"]
+remove: [
+  "ocaml" "%{etc}%/lutils/setup.ml" "-C" "%{etc}%/lutils" "-uninstall"
+]
+post-messages:
+  "The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/"
+dev-repo:
+  "git+https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils.git"

opam

-opam-version: "1.2"
-maintainer: "erwan.jahier@imag.fr"
-authors: [ "Erwan Jahier" ]
-license: "CeCILL"
-homepage: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"
-dev-repo: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils.git"
-bug-reports: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"
-build: [
-  ["ocaml" "setup.ml" "-configure" "--prefix" prefix]
-  ["ocaml" "setup.ml" "-build"]
-]
-install: ["ocaml" "setup.ml" "-install"]
-remove: [
-  ["ocaml" "%{etc}%/lutils/setup.ml" "-C" "%{etc}%/lutils" "-uninstall"]
-]
-build-test: [
-  ["ocaml" "setup.ml" "-configure" "--enable-tests"]
-  ["ocaml" "setup.ml" "-build"]
-  ["ocaml" "setup.ml" "-test"]
-]
-depends: [
-  "base-unix"
-  "ocamlbuild" {build}
-  "ocamlfind"
-  "num"
-]
-available: [ ocaml-version >= "4.02" ]
-post-messages: ["The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "]