diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6ab6a6042a3f16ef45701eec3c1d0bfdc66d9c7..d5f97d3a40cb467cc092fe4739d6d92f41e847bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ build: - opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository" - eval `opam config env` - sudo apt-get update - - sudo opam depext -y lustre-v6 lutin lablgtk3 + - opam depext -y lustre-v6 lutin lablgtk3 - opam install -y dune ocamlgraph lutin lablgtk3 - make - make install diff --git a/Makefile b/Makefile index 2c17ae9330f1418b7b0c84516fdfa01ce3f6da77..d1c5913d90a74afea746e6dfeb2b30386e96cfa6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -build: +build: lib/sasacore/sasaVersion.ml dune build @install install: diff --git a/algo.opam b/algo.opam index 3ffd70d2fb17a4f14380516ab71c6308e75e37a0..99a01bba5480b5d77f7e5d9981eb73be969470c4 100644 --- a/algo.opam +++ b/algo.opam @@ -5,11 +5,11 @@ description: """ Contains the API to program sasa nodes. """ authors: [ "Erwan Jahier" ] -license: "CeCILL" +license: "CeCILL-2.1" homepage: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/sasa" dev-repo: "git+https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/sasa.git" bug-reports: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/sasa/issues" -build: ["dune" "build" "-p" name "-j" jobs] +build: ["dune" "build" ] depends: [ "ocaml" "ocamlfind" diff --git a/gui.opam b/gui.opam index 1751cd6d92b4d83f6ef3a04e8859037b4e5834d4..f72ba5e1e7f7c746798432a0557379465810a677 100644 --- a/gui.opam +++ b/gui.opam @@ -1,6 +1,6 @@ opam-version: "2.0" -synopsis: "A Graphical User Interface for XXX" -description: "sasa is a *Self-stabilizing Algorithms SimulAtor*. XXX" +synopsis: "A Graphical User Interface for using sasa" +description: "sasa is a *Self-stabilizing Algorithms SimulAtor*." maintainer: "erwan.jahier@univ-grenoble-alpes.fr" authors: "erwan.jahier@univ-grenoble-alpes.fr" license: "CeCILL-2.1" @@ -14,7 +14,7 @@ depends: [ "dune" {>= "2.8.5"} "lutils" {>= "0"} ] -build: ["dune" "build" "-p" name "-j" jobs] +build: ["dune" "build"] post-messages: "The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/" depexts: ["graphviz" "emacs" "gnuplot" "zathura"] diff --git a/rdbgui4sasa.opam b/rdbgui4sasa.opam index 67b380fd15f6456108c4a5c3de1cdd91ee74daba..92ed380d65da806b4673c72719e29f2bdb68c70b 100644 --- a/rdbgui4sasa.opam +++ b/rdbgui4sasa.opam @@ -19,7 +19,7 @@ depends: [ "dune" {>= "2.8.5"} "lutils" {>= "0"} ] -build: ["dune" "build" "-p" name "-j" jobs] +build: ["dune" "build" "@install"] post-messages: "The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/" depexts: ["graphviz" "emacs" "gnuplot" "zathura"] diff --git a/sasa.opam b/sasa.opam index d28b03accf32235eab9cd71550eb797401bfc988..f58fb68aefd098c907ecbf5d5b773e9860ed0711 100644 --- a/sasa.opam +++ b/sasa.opam @@ -15,7 +15,6 @@ license: "CeCILL" homepage: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/sasa" dev-repo: "git+https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/sasa.git" bug-reports: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/sasa/issues" -build: ["dune" "build" "-p" name "-j" jobs] depends: [ "ocaml" { >= "4.02" } "ocamlfind" @@ -28,5 +27,6 @@ depopts: [ "lustre-v6" "lutin" ] -build: ["dune" "build" "-p" name "-j" jobs] +build: ["make" "build"] +install: ["dune" "install"] post-messages: ["The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "] diff --git a/sasacore.opam b/sasacore.opam index 99a7e4cde0d28ca91b3a4efa87b33a73392b4200..7ed46e06e0a6cf610756ffa69355cfc7be289414 100644 --- a/sasacore.opam +++ b/sasacore.opam @@ -16,6 +16,6 @@ depends: [ "lutils" {>= "1.51"} ] available: ocaml-version >= "4.02" -build: ["dune" "build" "-p" name "-j" jobs] +build: ["dune" "build"] dev-repo: "git+https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/sasa.git"