diff --git a/Makefile b/Makefile index a94acbe356c06714e36f6183e8634dd55a963382..39eb9571b3a3053c3eb92cc0eb4e705e9f279a8f 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ all:build -PREFIX=$(shell opam config var prefix) - -include ./Makefile.version build: lib/lutilsVersion.ml dune build @install diff --git a/Makefile.dev b/Makefile.dev index 9391fafa1d38a92e151a6fa04ac3d97679f88000..9baa34c389fc7c7d0f38013061c77be47404656f 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -6,13 +6,6 @@ uv:update_version update_version: git pull # to get the release tags! rm -f src/lutilsVersion.ml - make src/lutilsVersion.ml - cp _oasis _oasis.save -ifneq (,$(findstring -,$(VERSION))) - echo "won't update _oasis" -else - cat _oasis.save | sed "s/^Version:.*/Version: $(VERSION)/" > _oasis -endif make clean && make cia: test diff --git a/dune-project b/dune-project new file mode 100644 index 0000000000000000000000000000000000000000..f75713fb8c409db59b961e7905989483fb90578d --- /dev/null +++ b/dune-project @@ -0,0 +1 @@ +(lang dune 1.2) diff --git a/lutils.opam b/lutils.opam index ed169cab97516b9d4ab935398aab5fd1b56c69be..bf4ec4c69c8786807bbc8204aa0be6b52afa4f82 100644 --- a/lutils.opam +++ b/lutils.opam @@ -17,21 +17,18 @@ bug-reports: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/" depends: [ "ocaml" {>= "4.02"} + "dune" {>= "1.2"} "base-unix" - "ocamlbuild" {build} "ocamlfind" "num" + "str" ] 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} + [make "build"] ] -install: ["ocaml" "setup.ml" "-install"] +install: [make "install"] remove: [ - "ocaml" "%{etc}%/lutils/setup.ml" "-C" "%{etc}%/lutils" "-uninstall" + [make "uninstall"] ] post-messages: "The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/"