From 5be26f21c83b78c07e970e808a9d8bbad21b6413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Wed, 13 Jul 2022 10:40:58 +0200
Subject: [PATCH] [dune] cleanup
---
src/plugins/qed/dune | 8 ++------
src/plugins/server/dune | 2 +-
src/plugins/wp/dune | 44 ++++++++++++++++++-----------------------
3 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/src/plugins/qed/dune b/src/plugins/qed/dune
index 1bf19481129..221f2898c65 100644
--- a/src/plugins/qed/dune
+++ b/src/plugins/qed/dune
@@ -25,15 +25,11 @@
(deps (universe))
(action (progn
(echo "Qed:" %{lib-available:qed} "\n")
- (echo " - Zarith:" %{lib-available:zarith} "\n")
- )
- )
-)
+ (echo " - Zarith:" %{lib-available:zarith} "\n"))))
(library
(name qed)
(optional)
(public_name qed)
(flags (-open Frama_c_kernel :standard -w -9))
- (libraries frama-c.kernel zarith)
-)
+ (libraries frama-c.kernel zarith))
diff --git a/src/plugins/server/dune b/src/plugins/server/dune
index 682610a0cfc..0cfcd175bbc 100644
--- a/src/plugins/server/dune
+++ b/src/plugins/server/dune
@@ -30,7 +30,7 @@
)
)
-( library
+(library
(name server)
(optional)
(public_name frama-c-server.core)
diff --git a/src/plugins/wp/dune b/src/plugins/wp/dune
index f83bd2fd2bc..6468cab09b3 100644
--- a/src/plugins/wp/dune
+++ b/src/plugins/wp/dune
@@ -29,40 +29,34 @@
(echo " - Qed:" %{lib-available:qed} "\n")
(echo " - Rtegen:" %{lib-available:frama-c-rtegen.core} "\n")
(echo " - Why3:" %{lib-available:why3} "\n")
- (echo " - Zarith:" %{lib-available:zarith} "\n")
- )
- )
-)
+ (echo " - Zarith:" %{lib-available:zarith} "\n"))))
(library
(name wp)
(optional)
(public_name frama-c-wp.core)
(flags (-open Frama_c_kernel :standard -w -9))
- (libraries frama-c.kernel frama-c-rtegen.core why3 qed zarith ocamlgraph)
-)
+ (libraries
+ frama-c.kernel
+ frama-c-rtegen.core
+ qed why3 zarith ocamlgraph))
(plugin (optional) (name wp) (libraries frama-c-wp.core) (site (frama-c plugins)))
-
(ocamllex driver rformat script)
-;find share \( -not -name ".gitignore" \) -type f -printf "(%p as wp/%p)\n" >> dune
-; wp/share -> wp
-
(install
- (package frama-c-wp)
- (section (site (frama-c share)))
- (files
-(share/Makefile.resources as wp/Makefile.resources)
-(share/install.ml as wp/install.ml)
-(share/why3/frama_c_wp/vlist.mlw as wp/why3/frama_c_wp/vlist.mlw)
-(share/why3/frama_c_wp/cbits.mlw as wp/why3/frama_c_wp/cbits.mlw)
-(share/why3/frama_c_wp/cint.mlw as wp/why3/frama_c_wp/cint.mlw)
-(share/why3/frama_c_wp/qed.mlw as wp/why3/frama_c_wp/qed.mlw)
-(share/why3/frama_c_wp/vset.mlw as wp/why3/frama_c_wp/vset.mlw)
-(share/why3/frama_c_wp/memory.mlw as wp/why3/frama_c_wp/memory.mlw)
-(share/why3/frama_c_wp/cmath.mlw as wp/why3/frama_c_wp/cmath.mlw)
-(share/why3/frama_c_wp/cfloat.mlw as wp/why3/frama_c_wp/cfloat.mlw)
-(share/wp.driver as wp/wp.driver)
-))
+ (package frama-c-wp)
+ (section (site (frama-c share)))
+ (files
+ (share/Makefile.resources as wp/Makefile.resources)
+ (share/install.ml as wp/install.ml)
+ (share/why3/frama_c_wp/vlist.mlw as wp/why3/frama_c_wp/vlist.mlw)
+ (share/why3/frama_c_wp/cbits.mlw as wp/why3/frama_c_wp/cbits.mlw)
+ (share/why3/frama_c_wp/cint.mlw as wp/why3/frama_c_wp/cint.mlw)
+ (share/why3/frama_c_wp/qed.mlw as wp/why3/frama_c_wp/qed.mlw)
+ (share/why3/frama_c_wp/vset.mlw as wp/why3/frama_c_wp/vset.mlw)
+ (share/why3/frama_c_wp/memory.mlw as wp/why3/frama_c_wp/memory.mlw)
+ (share/why3/frama_c_wp/cmath.mlw as wp/why3/frama_c_wp/cmath.mlw)
+ (share/why3/frama_c_wp/cfloat.mlw as wp/why3/frama_c_wp/cfloat.mlw)
+ (share/wp.driver as wp/wp.driver)))
--
GitLab