Merge branch 'release/julien/simplify-packaging' into 'master'

Simplified packaging

Closes #41

See merge request laiser/caisar!98

Makefile

 all:
-	dune build --root=. @install caisar.opam caisar-nnet.opam caisar-onnx.opam caisar-ovo.opam caisar-ir.opam caisar-xgboost.opam
+	dune build --root=. @install caisar.opam
 
 all-ci:
-	dune build -j2 --root=. @install caisar.opam caisar-nnet.opam caisar-onnx.opam caisar-ovo.opam caisar-ir.opam caisar-xgboost.opam
+	dune build -j2 --root=. @install caisar.opam
 
 install:
 	dune install

caisar-ir.opam

-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-version: "0.2"
-synopsis: "CAISAR's intermediate representation"
-maintainer: [
-  "LAISER team, Software Safety and Security Laboratory, CEA-List"
-]
-authors: ["LAISER team, Software Safety and Security Laboratory, CEA-List"]
-license: "LGPL-2.1-only"
-homepage: "https://git.frama-c.com/pub/caisar"
-doc: "https://git.frama-c.com/pub/caisar"
-bug-reports: "https://git.frama-c.com/pub/caisar/issues"
-depends: [
-  "dune" {>= "2.9"}
-  "ocaml" {>= "4.13"}
-  "base" {>= "v0.14.0"}
-  "ocamlgraph" {>= "1.8.8"}
-  "ppx_inline_test" {>= "0.12.0"}
-  "ppx_deriving" {>= "4.4.1"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "--promote-install-files=false"
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-  ["dune" "install" "-p" name "--create-install-files" name]
-]
-dev-repo: "git+https://git.frama-c.com/pub/caisar.git"

caisar-nnet.opam

-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-version: "0.2"
-synopsis: "NNet parser for CAISAR"
-maintainer: [
-  "LAISER team, Software Safety and Security Laboratory, CEA-List"
-]
-authors: ["LAISER team, Software Safety and Security Laboratory, CEA-List"]
-license: "LGPL-2.1-only"
-homepage: "https://git.frama-c.com/pub/caisar"
-doc: "https://git.frama-c.com/pub/caisar"
-bug-reports: "https://git.frama-c.com/pub/caisar/issues"
-depends: [
-  "dune" {>= "2.9"}
-  "ocaml" {>= "4.13"}
-  "base" {>= "v0.14.0"}
-  "csv" {>= "2.4"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "--promote-install-files=false"
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-  ["dune" "install" "-p" name "--create-install-files" name]
-]
-dev-repo: "git+https://git.frama-c.com/pub/caisar.git"

caisar-onnx.opam

-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-version: "0.2"
-synopsis: "ONNX parser for CAISAR"
-maintainer: [
-  "LAISER team, Software Safety and Security Laboratory, CEA-List"
-]
-authors: ["LAISER team, Software Safety and Security Laboratory, CEA-List"]
-license: "LGPL-2.1-only"
-homepage: "https://git.frama-c.com/pub/caisar"
-doc: "https://git.frama-c.com/pub/caisar"
-bug-reports: "https://git.frama-c.com/pub/caisar/issues"
-depends: [
-  "dune" {>= "2.9"}
-  "ocaml" {>= "4.13"}
-  "base" {>= "v0.14.0"}
-  "stdio" {>= "v0.14.0"}
-  "ocaml-protoc-plugin" {>= "4.2.0"}
-  "ocplib-endian" {>= "1.0"}
-  "caisar-ir" {= version}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "--promote-install-files=false"
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-  ["dune" "install" "-p" name "--create-install-files" name]
-]
-dev-repo: "git+https://git.frama-c.com/pub/caisar.git"

caisar-ovo.opam

-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-version: "0.2"
-synopsis: "OVO parser for CAISAR"
-maintainer: [
-  "LAISER team, Software Safety and Security Laboratory, CEA-List"
-]
-authors: ["LAISER team, Software Safety and Security Laboratory, CEA-List"]
-license: "LGPL-2.1-only"
-homepage: "https://git.frama-c.com/pub/caisar"
-doc: "https://git.frama-c.com/pub/caisar"
-bug-reports: "https://git.frama-c.com/pub/caisar/issues"
-depends: [
-  "dune" {>= "2.9"}
-  "ocaml" {>= "4.13"}
-  "base" {>= "v0.14.0"}
-  "csv" {>= "2.4"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "--promote-install-files=false"
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-  ["dune" "install" "-p" name "--create-install-files" name]
-]
-dev-repo: "git+https://git.frama-c.com/pub/caisar.git"

caisar-xgboost.opam

-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-version: "0.2"
-synopsis: "XGBOOST parser for CAISAR"
-maintainer: [
-  "LAISER team, Software Safety and Security Laboratory, CEA-List"
-]
-authors: ["LAISER team, Software Safety and Security Laboratory, CEA-List"]
-license: "LGPL-2.1-only"
-homepage: "https://git.frama-c.com/pub/caisar"
-doc: "https://git.frama-c.com/pub/caisar"
-bug-reports: "https://git.frama-c.com/pub/caisar/issues"
-depends: [
-  "dune" {>= "2.9"}
-  "ocaml" {>= "4.13"}
-  "base" {>= "v0.14.0"}
-  "ocamlgraph" {>= "1.8.8"}
-  "ppx_deriving" {>= "4.4.1"}
-  "ppx_deriving_yojson" {>= "3.6.1"}
-  "csv" {>= "2.4"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "--promote-install-files=false"
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-  ["dune" "install" "-p" name "--create-install-files" name]
-]
-dev-repo: "git+https://git.frama-c.com/pub/caisar.git"

caisar.opam

@@ -12,7 +12,7 @@ homepage: "https://git.frama-c.com/pub/caisar"
 doc: "https://git.frama-c.com/pub/caisar"
 bug-reports: "https://git.frama-c.com/pub/caisar/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.8"}
   "ocaml" {>= "4.13"}
   "dune-site" {>= "2.9.0"}
   "piqi" {>= "0.7.6"}
@@ -24,20 +24,19 @@ depends: [
   "cmdliner" {>= "1.1.1"}
   "fmt" {>= "0.8.9"}
   "logs" {>= "0.7.0"}
-  "ppx_deriving" {>= "5.1"}
   "yojson" {>= "1.7.0"}
   "menhirLib" {>= "20210310"}
-  "ppx_deriving_yojson" {>= "3.6.1"}
   "csv" {>= "2.4"}
   "why3" {>= "1.6.0"}
   "re" {>= "1.10.4"}
   "fpath" {>= "0.7.3"}
   "yaml" {>= "3.1.0"}
-  "caisar-nnet" {= version}
-  "caisar-ovo" {= version}
-  "caisar-onnx" {= version}
-  "caisar-ir" {= version}
-  "caisar-xgboost" {= version}
+  "ocaml-protoc-plugin" {>= "4.2.0"}
+  "stdio" {>= "v0.14.0"}
+  "ocamlgraph" {>= "1.8.8"}
+  "ppx_deriving" {>= "5.1"}
+  "ppx_inline_test" {>= "0.12.0"}
+  "ppx_deriving_yojson" {>= "3.6.1"}
   "odoc" {with-doc}
 ]
 build: [

dune-project

-(lang dune 2.9)
+(lang dune 3.8)
 (name caisar)
 (version 0.2)
 
@@ -17,64 +17,6 @@
 (homepage https://git.frama-c.com/pub/caisar)
 (documentation https://git.frama-c.com/pub/caisar)
 
-(package
-  (name caisar-nnet)
-  (synopsis "NNet parser for CAISAR")
-  (depends
-   (ocaml (>= 4.13))
-   (base (>= v0.14.0))
-   (csv (>= 2.4))
-  )
-)
-
-(package
-  (name caisar-ovo)
-  (synopsis "OVO parser for CAISAR")
-  (depends
-   (ocaml (>= 4.13))
-   (base (>= v0.14.0))
-   (csv (>= 2.4))
-  )
-)
-
-(package
-  (name caisar-onnx)
-  (synopsis "ONNX parser for CAISAR")
-  (depends
-   (ocaml (>= 4.13))
-   (base (>= v0.14.0))
-   (stdio (>= v0.14.0))
-   (ocaml-protoc-plugin (>= 4.2.0))
-   (ocplib-endian (>= 1.0))
-   (caisar-ir (= :version))
-  )
-)
-
-(package
-  (name caisar-xgboost)
-  (synopsis "XGBOOST parser for CAISAR")
-  (depends
-   (ocaml (>= 4.13))
-   (base (>= v0.14.0))
-   (ocamlgraph (>= 1.8.8))
-   (ppx_deriving (>= 4.4.1))
-   (ppx_deriving_yojson (>= 3.6.1))
-   (csv (>= 2.4))
-  )
-)
-
-(package
-  (name caisar-ir)
-  (synopsis "CAISAR's intermediate representation")
-  (depends
-   (ocaml (>= 4.13))
-   (base (>= v0.14.0))
-   (ocamlgraph (>= 1.8.8))
-   (ppx_inline_test (>= 0.12.0))
-   (ppx_deriving (>= 4.4.1))
-  )
-)
-
 (package
   (name caisar)
   (synopsis "A platform for characterizing the safety and robustness of artificial intelligence based software")
@@ -90,20 +32,19 @@
    (cmdliner (>= 1.1.1))
    (fmt (>= 0.8.9))
    (logs (>= 0.7.0))
-   (ppx_deriving (>= 5.1))
    (yojson (>= 1.7.0))
    (menhirLib (>= 20210310))
-   (ppx_deriving_yojson (>= 3.6.1))
    (csv (>= 2.4))
    (why3 (>= 1.6.0))
    (re (>= 1.10.4))
    (fpath (>= 0.7.3))
    (yaml (>= 3.1.0))
-   (caisar-nnet (= :version))
-   (caisar-ovo (= :version))
-   (caisar-onnx (= :version))
-   (caisar-ir (= :version))
-   (caisar-xgboost (= :version))
+   (ocaml-protoc-plugin (>= 4.2.0))
+   (stdio (>= v0.14.0))
+   (ocamlgraph (>= 1.8.8))
+   (ppx_deriving (>= 5.1))
+   (ppx_inline_test (>= 0.12.0))
+   (ppx_deriving_yojson (>= 3.6.1))
   )
   (sites
    (share stdlib)

lib/ir/dune

 (library
  (name ir)
- (public_name caisar-ir)
+ (public_name caisar.ir)
  (preprocess
   (pps
    ppx_inline_test

lib/nnet/dune

 (library
  (name nnet)
- (public_name caisar-nnet)
+ (public_name caisar.nnet)
  (libraries base csv)
  (synopsis "NNet parser for CAISAR"))

lib/onnx/dune

 (library
  (name onnx)
- (public_name caisar-onnx)
- (libraries base stdio ocaml-protoc-plugin ocplib-endian caisar-ir)
+ (public_name caisar.onnx)
+ (libraries base stdio ocaml-protoc-plugin ocplib-endian caisar.ir)
  (synopsis "ONNX parser for CAISAR"))
 
 (rule

lib/ovo/dune

 (library
  (name ovo)
- (public_name caisar-ovo)
+ (public_name caisar.ovo)
  (libraries base csv)
  (synopsis "OVO parser for CAISAR"))

lib/xgboost/bin/dune

 (executable
  (name parse_xgboost)
- (libraries yojson caisar-xgboost csv)
+ (libraries yojson caisar.xgboost csv)
 )

lib/xgboost/dune

 (library
- (public_name caisar-xgboost)
+ (public_name caisar.xgboost)
  (name caisar_xgboost)
  (preprocess
   (pps ppx_deriving.show ppx_deriving_yojson))

lib/xgboost/example/dune

 (cram
  (deps model-0.json agaricus.test.svm ../bin/parse_xgboost.exe)
  (applies_to logistic)
- (package caisar-xgboost))
+ (package caisar))
 
 (cram
  (deps california.json california.csv ../bin/parse_xgboost.exe)
  (applies_to california)
- (package caisar-xgboost))
+ (package caisar))

src/dune

@@ -24,7 +24,7 @@
   yaml.unix
   fpath
   zarith
-  caisar-xgboost)
+  caisar.xgboost)
  (preprocess
   (pps
    ppx_deriving_yojson