Merge branch 'feature/dune/mode-guis' into 'feature/bobot/jbuilder'

GUI organization and compilation

See merge request frama-c/frama-c!3764

nix/frama-c.nix

@@ -24,6 +24,7 @@
 , mlmpfr
 , ocaml
 , ocamlgraph
+, ocamlgraph_gtk
 , ppx_deriving
 , ppx_deriving_yojson
 , ppx_import
@@ -71,6 +72,7 @@ stdenvNoCC.mkDerivation rec {
     mlmpfr
     ocaml
     ocamlgraph
+    ocamlgraph_gtk
     ppx_deriving
     ppx_deriving_yojson
     ppx_import

src/plugins/aorai/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Aorai:" %{lib-available:frama-c-aorai.core} "\n")
+          (echo "  - (optional) Eva:" %{lib-available:frama-c-eva.core} "\n")
+  )
+  )
+)
+
 ( library
   (name aorai)
   (public_name frama-c-aorai.core)

src/plugins/callgraph/callgraph.mli

@@ -23,11 +23,13 @@
 (** Callgraph plugin. *)
 
 module Options: sig
+  include Plugin.S
   module Filename: Parameter_sig.Filepath
   module Service_roots: Parameter_sig.Kernel_function_set
   module Uncalled: Parameter_sig.Bool
   module Uncalled_leaf: Parameter_sig.Bool
   module Services: Parameter_sig.Bool
+  module Roots : Parameter_sig.Kernel_function_set
 end
 
 module Cg: module type of Cg

src/plugins/callgraph/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Callgraph:" %{lib-available:frama-c-callgraph.core} "\n")
+          (echo "  - Eva:" %{lib-available:frama-c-eva.core} "\n")
+  )
+  )
+)
+
 ( library
   (name callgraph)
   (public_name frama-c-callgraph.core)
-  (modules Options Journalize Cg Services Uses Register Callgraph_api Callgraph Subgraph)
-;  (private_modules Options Journalize Cg Uses Register)
   (flags -open Frama_c_kernel :standard -w -9)
   (libraries frama-c.kernel frama-c-eva.core)
 )
 
 (plugin (optional) (name callgraph) (libraries frama-c-callgraph.core) (site (frama-c plugins)))
-
-( library
-  (name callgraph_gui)
-  (public_name frama-c-callgraph.gui)
-  (optional)
-  (modules Cg_viewer)
-;  (private_modules Cg_viewer)
-  (flags -open Frama_c_kernel -open Frama_c_gui -open Callgraph :standard)
-  (libraries callgraph frama-c.kernel frama-c.gui ocamlgraph.dgraph)
-)
-
-(plugin (optional) (name callgraph) (libraries frama-c-callgraph.gui) (site (frama-c plugins_gui)))

src/plugins/callgraph/cg_viewer.ml → src/plugins/callgraph/gui/cg_viewer.ml

@@ -20,7 +20,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-open DGRAPH_MODULE
+open Graph.S
 
 let ($) f x = f x
 

src/plugins/callgraph/gui/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Callgraph GUI:" %{lib-available:frama-c-callgraph.gui} "\n")
+          (echo "  - Frama-C GUI:" %{lib-available:frama-c.gui} "\n")
+          (echo "  - Callgraph:" %{lib-available:frama-c-callgraph.core} "\n")
+          (echo "  - Ocamlgraph_gtk:" %{lib-available:ocamlgraph_gtk} "\n")
+          (echo "  - Ocamlgraph Dgraph:" %{lib-available:ocamlgraph.dgraph} "\n")
+  )
+  )
+)
+
+( library
+  (name callgraph_gui)
+  (public_name frama-c-callgraph.gui)
+  (optional)
+  (flags -open Frama_c_kernel -open Frama_c_gui -open Callgraph :standard -w -9)
+  (libraries
+    frama-c.kernel frama-c.gui frama-c-callgraph.core
+    (select graph.ml from
+      (ocamlgraph.dgraph -> graph.dgraph.ml)
+      (ocamlgraph_gtk -> graph.gtk.ml)
+    )
+  )
+)
+
+(plugin (optional) (name callgraph-gui) (libraries frama-c-callgraph.gui) (site (frama-c plugins_gui)))

src/plugins/callgraph/gui/graph.dgraph.ml

+module S = Dgraph

src/plugins/callgraph/gui/graph.gtk.ml

+module S = Graph_gtk

src/plugins/constant_propagation/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Constant Propagation:" %{lib-available:frama-c-constant_propagation.core} "\n")
+          (echo "  - Eva:" %{lib-available:frama-c-eva.core} "\n")
+  )
+  )
+)
+
 ( library
   (name Constant_Propagation)
   (public_name frama-c-constant_propagation.core)

src/plugins/dive/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Dive:" %{lib-available:frama-c-dive.core} "\n")
+          (echo "  - Studia:" %{lib-available:frama-c-studia.core} "\n")
+          (echo "  - Server:" %{lib-available:frama-c-server.core} "\n")
+  )
+  )
+)
+
 ( library
   (name dive)
   (public_name frama-c-dive.core)

src/plugins/e-acsl/src/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "E-ACSL:" %{lib-available:frama-c-e-acsl.core} "\n")
+  )
+  )
+)
+
 (library
  (name E_ACSL)
  (public_name frama-c-e-acsl.core)

src/plugins/from/dune

@@ -3,6 +3,9 @@
  (deps (universe))
  (action (progn
           (echo "From:" %{lib-available:frama-c-from.core} "\n")
+          (echo "  - Callgraph:" %{lib-available:frama-c-callgraph.core} "\n")
+          (echo "  - Eva:" %{lib-available:frama-c-eva.core} "\n")
+          (echo "  - Postdominators:" %{lib-available:frama-c-postdominators.core} "\n")
   )
   )
 )

src/plugins/impact/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Impact:" %{lib-available:frama-c-impact.core} "\n")
+          (echo "  - Callgraph:" %{lib-available:frama-c-callgraph.core} "\n")
+          (echo "  - Slicing:" %{lib-available:frama-c-slicing.core} "\n")
+          (echo "  - Inout:" %{lib-available:frama-c-inout.core} "\n")
+  )
+  )
+)
+
+
 ( library
   (name impact)
   (public_name frama-c-impact.core)

src/plugins/inout/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Inout:" %{lib-available:frama-c-inout.core} "\n")
+          (echo "  - Callgraph:" %{lib-available:frama-c-callgraph.core} "\n")
+          (echo "  - Eva:" %{lib-available:frama-c-eva.core} "\n")
+          (echo "  - From:" %{lib-available:frama-c-from.core} "\n")
+  )
+  )
+)
+
 ( library
   (name inout)
   (public_name frama-c-inout.core)

src/plugins/instantiate/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Instantiate:" %{lib-available:frama-c-instantiate.core} "\n")
+  )
+  )
+)
+
 ( library
   (name instantiate)
   (public_name frama-c-instantiate.core)

src/plugins/loop_analysis/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Loop-Analysis:" %{lib-available:frama-c-loop-analysis.core} "\n")
+          (echo "  - Eva:" %{lib-available:frama-c-eva.core} "\n")
+  )
+  )
+)
+
 ( library
   (name LoopAnalysis)
   (public_name frama-c-loop-analysis.core)
-  (modules options region_analysis_sig region_analysis region_analysis_stmt loop_analysis register LoopAnalysis)
   (private_modules region_analysis_sig region_analysis region_analysis_stmt loop_analysis register)
   (flags -open Frama_c_kernel :standard)
   (libraries frama-c.kernel frama-c-eva.core)

src/plugins/metrics/dune

+(rule
+ (alias frama-c-configure)
+ (deps (universe))
+ (action (progn
+          (echo "Metrics:" %{lib-available:frama-c-metrics.core} "\n")
+          (echo "  - Eva:" %{lib-available:frama-c-eva.core} "\n")
+          (echo "  - Server:" %{lib-available:frama-c-server.core} "\n")
+  )
+  )
+)
+
 ( library
   (name metrics)
   (public_name frama-c-metrics.core)
-  (modules metrics metrics_parameters css_html metrics_base metrics_acsl
-    metrics_cabs metrics_cilast metrics_coverage
-    register)
   (flags -open Frama_c_kernel :standard -w -9)
   (libraries frama-c.kernel frama-c-eva.core frama-c-server.core)
 )
 
 (plugin (optional) (name metrics) (libraries frama-c-metrics.core) (site (frama-c plugins)))
-
-( library
-  (name metrics_gui)
-  (public_name frama-c-metrics.gui)
-  (optional)
-  (modules metrics_gui_panels register_gui)
-  (flags -open Frama_c_kernel -open Frama_c_gui -open Metrics :standard -w -9)
-  (libraries metrics frama-c.kernel frama-c.gui)
-)
-
-(plugin (optional) (name metrics) (libraries frama-c-metrics.gui) (site (frama-c plugins_gui)))

src/plugins/metrics/gui/dune

+( library
+  (name metrics_gui)
+  (public_name frama-c-metrics.gui)
+  (optional)
+  (flags -open Frama_c_kernel -open Frama_c_gui -open Metrics :standard -w -9)
+  (libraries frama-c.kernel frama-c.gui frama-c-metrics.core)
+)
+
+(plugin (optional) (name metrics-gui) (libraries frama-c-metrics.gui) (site (frama-c plugins_gui)))