From 7e8af0deae8b1da8148a6e809524c4e2917b1fc9 Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Fri, 5 Apr 2024 11:33:06 +0200
Subject: [PATCH] [kernel] rename fc_config to system_config
---
.gitattributes | 2 +-
share/analysis-scripts/list_functions.ml | 2 +-
src/init/toplevel/toplevel_config.ml | 2 +-
src/kernel_internals/runtime/dump_config.ml | 42 +++++++++----------
src/kernel_internals/runtime/dune | 6 +--
src/kernel_internals/runtime/special_hooks.ml | 22 +++++-----
.../{fc_config.ml.in => system_config.ml.in} | 2 +-
.../{fc_config.mli => system_config.mli} | 0
src/kernel_internals/typing/cabs2cil.ml | 2 +-
.../ast_queries/cil_builtins.ml | 4 +-
src/kernel_services/ast_queries/file.ml | 12 +++---
.../cmdline_parameters/cmdline.ml | 6 +--
.../plugin_entry_points/dynamic.ml | 2 +-
.../plugin_entry_points/kernel.ml | 2 +-
.../plugin_entry_points/plugin.ml | 2 +-
src/libraries/project/project.ml | 4 +-
src/libraries/utils/command.ml | 2 +-
src/plugins/eva/domains/cvalue/builtins.ml | 2 +-
src/plugins/eva/utils/library_functions.ml | 2 +-
src/plugins/gui/design.ml | 4 +-
src/plugins/gui/filetree.ml | 2 +-
src/plugins/gui/gtk_helper.ml | 4 +-
src/plugins/gui/help_manager.ml | 2 +-
src/plugins/markdown-report/sarif_gen.ml | 2 +-
src/plugins/report/classify.ml | 2 +-
src/plugins/server/kernel_main.ml | 6 +--
src/plugins/server/server_doc.ml | 2 +-
src/plugins/wp/wpApi.ml | 2 +-
src/plugins/wp/wp_parameters.ml | 2 +-
tests/libc/check_compliance.ml | 2 +-
tests/misc/version.ml | 10 ++---
31 files changed, 79 insertions(+), 79 deletions(-)
rename src/kernel_internals/runtime/{fc_config.ml.in => system_config.ml.in} (98%)
rename src/kernel_internals/runtime/{fc_config.mli => system_config.mli} (100%)
diff --git a/.gitattributes b/.gitattributes
index b3719b15315..bd77d27bee1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -393,5 +393,5 @@ README* header_spec=.ignore
/share/emacs/frama-c-*.el header_spec=CEA_LGPL
/share/_frama-c header_spec=CEA_LGPL
-/src/kernel_internals/runtime/fc_config.ml.in header_spec=CEA_LGPL
+/src/kernel_internals/runtime/system_config.ml.in header_spec=CEA_LGPL
/src/libraries/stdlib/transitioning.ml.in header_spec=CEA_LGPL
diff --git a/share/analysis-scripts/list_functions.ml b/share/analysis-scripts/list_functions.ml
index 38de36d9b3a..022fdb66fec 100644
--- a/share/analysis-scripts/list_functions.ml
+++ b/share/analysis-scripts/list_functions.ml
@@ -115,7 +115,7 @@ class stmt_count_visitor =
location-based approach. *)
let located_within_framac_libc loc =
let pos = fst loc in
- Filepath.is_relative ~base_name:Fc_config.framac_libc pos.Filepath.pos_path
+ Filepath.is_relative ~base_name:System_config.framac_libc pos.Filepath.pos_path
class fun_cabs_visitor print_libc = object(self)
inherit Cabsvisit.nopCabsVisitor
diff --git a/src/init/toplevel/toplevel_config.ml b/src/init/toplevel/toplevel_config.ml
index 697a2ad40cb..4c9e99e129b 100644
--- a/src/init/toplevel/toplevel_config.ml
+++ b/src/init/toplevel/toplevel_config.ml
@@ -20,4 +20,4 @@
(* *)
(**************************************************************************)
-let () = Topdirs.dir_directory Fc_config.libdir
+let () = Topdirs.dir_directory System_config.libdir
diff --git a/src/kernel_internals/runtime/dump_config.ml b/src/kernel_internals/runtime/dump_config.ml
index 4b12a03e598..aa533fa3e97 100644
--- a/src/kernel_internals/runtime/dump_config.ml
+++ b/src/kernel_internals/runtime/dump_config.ml
@@ -45,31 +45,31 @@ let dump_to_json () =
let string s = `String s in
let list f l = `List (List.map f l) in
`Assoc [
- "version", `String Fc_config.version ;
- "codename", `String Fc_config.codename ;
- "version_and_codename", `String Fc_config.version_and_codename ;
- "major_version", `Int Fc_config.major_version ;
- "minor_version", `Int Fc_config.minor_version ;
- "is_gui", `Bool Fc_config.is_gui ;
- (* "lablgtk", `String Fc_config.lablgtk ;
- * "ocamlc", `String Fc_config.ocamlc ;
- * "ocamlopt", `String Fc_config.ocamlopt ;
- * "ocaml_wflags", `String Fc_config.ocaml_wflags ; *)
- "datadir", `String (Fc_config.datadir:>string) ;
+ "version", `String System_config.version ;
+ "codename", `String System_config.codename ;
+ "version_and_codename", `String System_config.version_and_codename ;
+ "major_version", `Int System_config.major_version ;
+ "minor_version", `Int System_config.minor_version ;
+ "is_gui", `Bool System_config.is_gui ;
+ (* "lablgtk", `String System_config.lablgtk ;
+ * "ocamlc", `String System_config.ocamlc ;
+ * "ocamlopt", `String System_config.ocamlopt ;
+ * "ocaml_wflags", `String System_config.ocaml_wflags ; *)
+ "datadir", `String (System_config.datadir:>string) ;
"datadirs",
- list string (Filepath.Normalized.to_string_list Fc_config.datadirs) ;
- "framac_libc", `String (Fc_config.framac_libc:>string) ;
+ list string (Filepath.Normalized.to_string_list System_config.datadirs) ;
+ "framac_libc", `String (System_config.framac_libc:>string) ;
"plugin_dir",
- list string (Filepath.Normalized.to_string_list Fc_config.plugin_dir) ;
- "lib_dir", `String (Fc_config.libdir:>string) ;
+ list string (Filepath.Normalized.to_string_list System_config.plugin_dir) ;
+ "lib_dir", `String (System_config.libdir:>string) ;
"lib_dirs",
- list string (Filepath.Normalized.to_string_list Fc_config.libdirs) ;
- "preprocessor", `String Fc_config.preprocessor ;
- "using_default_cpp", `Bool Fc_config.using_default_cpp ;
- "preprocessor_is_gnu_like", `Bool Fc_config.preprocessor_is_gnu_like ;
+ list string (Filepath.Normalized.to_string_list System_config.libdirs) ;
+ "preprocessor", `String System_config.preprocessor ;
+ "using_default_cpp", `Bool System_config.using_default_cpp ;
+ "preprocessor_is_gnu_like", `Bool System_config.preprocessor_is_gnu_like ;
"preprocessor_supported_arch_options",
- list string Fc_config.preprocessor_supported_arch_options ;
- "preprocessor_keep_comments", `Bool Fc_config.preprocessor_keep_comments ;
+ list string System_config.preprocessor_supported_arch_options ;
+ "preprocessor_keep_comments", `Bool System_config.preprocessor_keep_comments ;
"current_machdep", `String (Kernel.Machdep.get ()) ;
"machdeps", list string (File.list_available_machdeps ()) ;
"plugins", list string (list_plugin_names ()) ;
diff --git a/src/kernel_internals/runtime/dune b/src/kernel_internals/runtime/dune
index d960851d96c..797394691da 100644
--- a/src/kernel_internals/runtime/dune
+++ b/src/kernel_internals/runtime/dune
@@ -21,7 +21,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(rule
- (targets fc_config.ml)
- (deps fc_config.ml.in ../../../config.sed)
- (action (with-stdout-to fc_config.ml (run sed -f ../../../config.sed fc_config.ml.in)))
+ (targets system_config.ml)
+ (deps system_config.ml.in ../../../config.sed)
+ (action (with-stdout-to system_config.ml (run sed -f ../../../config.sed system_config.ml.in)))
)
diff --git a/src/kernel_internals/runtime/special_hooks.ml b/src/kernel_internals/runtime/special_hooks.ml
index fe42c94af1e..2452683347c 100644
--- a/src/kernel_internals/runtime/special_hooks.ml
+++ b/src/kernel_internals/runtime/special_hooks.ml
@@ -33,14 +33,14 @@ let print_config () =
FRAMAC_SHARE = %S@\n \
FRAMAC_PLUGIN = %S@\n \
FRAMAC_LIB = %S%t@."
- Fc_config.version_and_codename
- (String.concat ":" (Filepath.Normalized.to_string_list Fc_config.datadirs))
- (String.concat ":" (Filepath.Normalized.to_string_list Fc_config.plugin_dir))
- (String.concat ":" (Filepath.Normalized.to_string_list Fc_config.libdirs))
+ System_config.version_and_codename
+ (String.concat ":" (Filepath.Normalized.to_string_list System_config.datadirs))
+ (String.concat ":" (Filepath.Normalized.to_string_list System_config.plugin_dir))
+ (String.concat ":" (Filepath.Normalized.to_string_list System_config.libdirs))
(fun fmt ->
- if Fc_config.preprocessor = "" then
+ if System_config.preprocessor = "" then
Format.fprintf fmt "@\nWarning: no default preprocessor"
- else if not Fc_config.preprocessor_keep_comments then
+ else if not System_config.preprocessor_keep_comments then
Format.fprintf fmt
"@\nWarning: default preprocessor is not able to keep comments \
(hence ACSL annotations) in its output")
@@ -66,21 +66,21 @@ let print_configl get value () =
end
let print_version =
- print_config Kernel.PrintVersion.get Fc_config.version_and_codename
+ print_config Kernel.PrintVersion.get System_config.version_and_codename
let () = Cmdline.run_after_early_stage print_version
let print_version_newline =
- print_config ~newline:true Kernel.Version.get Fc_config.version_and_codename
+ print_config ~newline:true Kernel.Version.get System_config.version_and_codename
let () = Cmdline.run_after_early_stage print_version_newline
-let print_sharepath = print_configl Kernel.PrintShare.get Fc_config.datadirs
+let print_sharepath = print_configl Kernel.PrintShare.get System_config.datadirs
let () = Cmdline.run_after_early_stage print_sharepath
-let print_libpath = print_configl Kernel.PrintLib.get [Fc_config.libdir]
+let print_libpath = print_configl Kernel.PrintLib.get [System_config.libdir]
let () = Cmdline.run_after_early_stage print_libpath
let print_pluginpath =
- print_config Kernel.PrintPluginPath.get Fc_config.plugin_path
+ print_config Kernel.PrintPluginPath.get System_config.plugin_path
let () = Cmdline.run_after_early_stage print_pluginpath
(**************************************************************************)
diff --git a/src/kernel_internals/runtime/fc_config.ml.in b/src/kernel_internals/runtime/system_config.ml.in
similarity index 98%
rename from src/kernel_internals/runtime/fc_config.ml.in
rename to src/kernel_internals/runtime/system_config.ml.in
index 833d802008e..527d6340486 100644
--- a/src/kernel_internals/runtime/fc_config.ml.in
+++ b/src/kernel_internals/runtime/system_config.ml.in
@@ -20,7 +20,7 @@
(* *)
(**************************************************************************)
-# 24 "src/kernel_internals/runtime/fc_config.ml.in"
+# 24 "src/kernel_internals/runtime/system_config.ml.in"
let version = "@VERSION@"
let codename = "@VERSION_CODENAME@"
diff --git a/src/kernel_internals/runtime/fc_config.mli b/src/kernel_internals/runtime/system_config.mli
similarity index 100%
rename from src/kernel_internals/runtime/fc_config.mli
rename to src/kernel_internals/runtime/system_config.mli
diff --git a/src/kernel_internals/typing/cabs2cil.ml b/src/kernel_internals/typing/cabs2cil.ml
index 8258d595391..07ab04020e7 100644
--- a/src/kernel_internals/typing/cabs2cil.ml
+++ b/src/kernel_internals/typing/cabs2cil.ml
@@ -339,7 +339,7 @@ let process_stdlib_pragma name args =
match args with
| [ ACons ("pop",_) ] -> pop_stdheader (); None
| [ ACons ("push",_); AStr s ] ->
- let base_name = (Fc_config.framac_libc:>string) in
+ let base_name = (System_config.framac_libc:>string) in
let relative_name = Filepath.relativize ~base_name s in
push_stdheader relative_name;
None
diff --git a/src/kernel_services/ast_queries/cil_builtins.ml b/src/kernel_services/ast_queries/cil_builtins.ml
index 76e4ec86b74..cd1cb74879d 100644
--- a/src/kernel_services/ast_queries/cil_builtins.ml
+++ b/src/kernel_services/ast_queries/cil_builtins.ml
@@ -388,7 +388,7 @@ let instantiate_available_templates type_table name (entry : builtin_template) =
let init_gcc_builtin_templates () =
let fp =
Datatype.Filepath.concat ~existence:Filepath.Must_exist
- Fc_config.datadir "compliance/gcc_builtins.json"
+ System_config.datadir "compliance/gcc_builtins.json"
in
Json.init_builtin_templates ~default_compiler:GCC fp;
Gcc_builtin_templates_loaded.set true
@@ -396,7 +396,7 @@ let init_gcc_builtin_templates () =
let init_other_builtin_templates () =
let fp =
Datatype.Filepath.concat ~existence:Filepath.Must_exist
- Fc_config.datadir "compliance/compiler_builtins.json"
+ System_config.datadir "compliance/compiler_builtins.json"
in
Json.init_builtin_templates fp
diff --git a/src/kernel_services/ast_queries/file.ml b/src/kernel_services/ast_queries/file.ml
index 24615768362..b70c0b9f5e9 100644
--- a/src/kernel_services/ast_queries/file.ml
+++ b/src/kernel_services/ast_queries/file.ml
@@ -81,7 +81,7 @@ let cpp_opt_kind () =
else Unknown
let is_cpp_gnu_like () =
- let open Fc_config in
+ let open System_config in
let cpp_cmd = Kernel.CppCommand.get () in
match cpp_cmd = "", using_default_cpp, preprocessor_is_gnu_like with
| true, true, true -> Gnu
@@ -92,10 +92,10 @@ let is_cpp_gnu_like () =
If the program has an explicit argument -cpp-command "XX -Y"
(quotes are required by the shell)
then XX -Y
- else use the command in [Fc_config.preprocessor].*)
+ else use the command in [System_config.preprocessor].*)
let get_preprocessor_command () =
let cmdline = Kernel.CppCommand.get() in
- if cmdline <> "" then cmdline else Fc_config.preprocessor
+ if cmdline <> "" then cmdline else System_config.preprocessor
let from_filename ?cpp f =
let cpp =
@@ -130,7 +130,7 @@ let from_filename ?cpp f =
if Hashtbl.mem check_suffixes suf then
External (f, suf)
else if cpp <> "" then begin
- if not Fc_config.preprocessor_keep_comments then
+ if not System_config.preprocessor_keep_comments then
Kernel.warning ~once:true
"Default preprocessor does not keep comments. Any ACSL annotations \
on non-preprocessed files will be discarded.";
@@ -490,7 +490,7 @@ let build_cpp_cmd = function
let machdep_dir =
Machdep.generate_machdep_header ~censored_macros (get_machdep())
in
- [(machdep_dir:>string); (Fc_config.framac_libc:>string)]
+ [(machdep_dir:>string); (System_config.framac_libc:>string)]
end
else []
in
@@ -1865,7 +1865,7 @@ let init_from_cmdline () =
Project.set_current prj2;
end;
let files = Kernel.Files.get () in
- if files = [] && not Fc_config.is_gui then Kernel.warning "no input file.";
+ if files = [] && not System_config.is_gui then Kernel.warning "no input file.";
let files = List.map (fun f -> from_filename f) files in
try
init_from_c_files files;
diff --git a/src/kernel_services/cmdline_parameters/cmdline.ml b/src/kernel_services/cmdline_parameters/cmdline.ml
index 30740f79034..39bca3adf21 100644
--- a/src/kernel_services/cmdline_parameters/cmdline.ml
+++ b/src/kernel_services/cmdline_parameters/cmdline.ml
@@ -84,7 +84,7 @@ let long_plugin_name s =
if s = Log.kernel_label_name then "Frama-C" else "Plug-in " ^ s
let additional_info () =
- if Fc_config.is_gui then
+ if System_config.is_gui then
"\nReverting to previous state.\n\
Check the Console tab for additional information."
else
@@ -114,7 +114,7 @@ let request_crash_report =
Note that a version and a backtrace alone often do not contain enough\n\
information to understand the bug. Guidelines for reporting bugs are at:\n\
https://git.frama-c.com/pub/frama-c/-/wikis/Guidelines-for-reporting-bugs\n"
- Fc_config.version_and_codename
+ System_config.version_and_codename
let protect = function
| Sys.Break ->
@@ -1033,7 +1033,7 @@ let plugin_help shortname =
let help () =
Log.print_on_output
begin fun fmt ->
- Format.fprintf fmt "\nThis is Frama-C %s\n" Fc_config.version_and_codename ;
+ Format.fprintf fmt "\nThis is Frama-C %s\n" System_config.version_and_codename ;
Format.fprintf fmt "\nUsage:\n %s [options files ...]\n" Sys.argv.(0) ;
let print_line fmt s =
Format.(pp_print_string fmt s ; pp_print_newline fmt ()) in
diff --git a/src/kernel_services/plugin_entry_points/dynamic.ml b/src/kernel_services/plugin_entry_points/dynamic.ml
index cc95ee4b7bb..4771683889d 100644
--- a/src/kernel_services/plugin_entry_points/dynamic.ml
+++ b/src/kernel_services/plugin_entry_points/dynamic.ml
@@ -119,7 +119,7 @@ let load_packages pkgs =
(* -------------------------------------------------------------------------- *)
let load_plugin_path () =
- if Fc_config.is_gui then Config_data.Plugins.Plugins_gui.load_all ();
+ if System_config.is_gui then Config_data.Plugins.Plugins_gui.load_all ();
Config_data.Plugins.Plugins.load_all ()
let load_plugin m =
diff --git a/src/kernel_services/plugin_entry_points/kernel.ml b/src/kernel_services/plugin_entry_points/kernel.ml
index d4fff3d5b98..11f898a7554 100644
--- a/src/kernel_services/plugin_entry_points/kernel.ml
+++ b/src/kernel_services/plugin_entry_points/kernel.ml
@@ -735,7 +735,7 @@ module PrintLibc =
let option_name = "-print-libc"
let help = "when pretty-printing C code, keep prototypes coming \
from Frama-C standard library"
- let default = Fc_config.is_gui (* always print by default on the GUI *)
+ let default = System_config.is_gui (* always print by default on the GUI *)
end)
let () = Parameter_customize.set_group inout_source
diff --git a/src/kernel_services/plugin_entry_points/plugin.ml b/src/kernel_services/plugin_entry_points/plugin.ml
index 8ed97729a29..380a0e174cb 100644
--- a/src/kernel_services/plugin_entry_points/plugin.ml
+++ b/src/kernel_services/plugin_entry_points/plugin.ml
@@ -444,7 +444,7 @@ struct
(may be used if the plug-in is not installed at the same place as Frama-C)"
end)
(struct
- let dirs () = Fc_config.datadirs
+ let dirs () = System_config.datadirs
let visible_ref = !share_visible_ref
end)
diff --git a/src/libraries/project/project.ml b/src/libraries/project/project.ml
index 6e61f48dda7..37786e0941b 100644
--- a/src/libraries/project/project.ml
+++ b/src/libraries/project/project.ml
@@ -448,7 +448,7 @@ let magic = 9 (* magic number *)
let save_projects selection projects filename =
let cout = open_out_bin (filename : Filepath.Normalized.t :> string) in
- output_value cout Fc_config.version;
+ output_value cout System_config.version;
output_value cout magic;
output_value cout !Graph.Blocks.cpt_vertex;
let states : (t * (string * State.state_on_disk) list) list =
@@ -613,7 +613,7 @@ let load_projects ~project_under_copy selection ?name filename =
raise (IOError s)
end
in
- check_magic cin (fun x -> x) Fc_config.version;
+ check_magic cin (fun x -> x) System_config.version;
check_magic cin (fun n -> "magic number " ^ string_of_int n) magic;
let ocamlgraph_counter = read cin in
let pre_existing_projects = Descr.init project_under_copy in
diff --git a/src/libraries/utils/command.ml b/src/libraries/utils/command.ml
index 4052871a30a..0e08f4f6f31 100644
--- a/src/libraries/utils/command.ml
+++ b/src/libraries/utils/command.ml
@@ -238,7 +238,7 @@ let command_async ?stdout ?stderr cmd args =
command_generic ~async:true ?stdout ?stderr cmd args
let command ?(timeout=0) ?stdout ?stderr cmd args =
- if Fc_config.is_gui || timeout > 0 then
+ if System_config.is_gui || timeout > 0 then
let f = command_generic ~async:true ?stdout ?stderr cmd args in
let res = ref(Unix.WEXITED 99) in
let ftimeout = float_of_int timeout in
diff --git a/src/plugins/eva/domains/cvalue/builtins.ml b/src/plugins/eva/domains/cvalue/builtins.ml
index 405b76bb143..316d2f22d15 100644
--- a/src/plugins/eva/domains/cvalue/builtins.ml
+++ b/src/plugins/eva/domains/cvalue/builtins.ml
@@ -151,7 +151,7 @@ let warn_builtin_override kf source bname =
let internal =
(* TODO: treat this 'internal' *)
let file = source.Filepath.pos_path in
- Filepath.is_relative ~base_name:Fc_config.datadir file
+ Filepath.is_relative ~base_name:System_config.datadir file
in
if Kernel_function.is_definition kf && not internal
then
diff --git a/src/plugins/eva/utils/library_functions.ml b/src/plugins/eva/utils/library_functions.ml
index 98e63c0048c..1ab03581ef5 100644
--- a/src/plugins/eva/utils/library_functions.ml
+++ b/src/plugins/eva/utils/library_functions.ml
@@ -111,7 +111,7 @@ let warn_unsupported_spec name =
"@[The specification of function '%s' is currently not supported by Eva.@ \
Consider adding '%a'@ to the analyzed source files.@]"
name Filepath.Normalized.pretty
- (Filepath.Normalized.concat Fc_config.framac_libc header)
+ (Filepath.Normalized.concat System_config.framac_libc header)
with Not_found -> ()
diff --git a/src/plugins/gui/design.ml b/src/plugins/gui/design.ml
index 2196841e685..a91fd7398bb 100644
--- a/src/plugins/gui/design.ml
+++ b/src/plugins/gui/design.ml
@@ -1846,8 +1846,8 @@ class main_window () : main_window_extension_points =
end
let make_splash () =
- GMain.Rc.add_default_file ((Fc_config.datadir:>string) ^"/frama-c.rc");
- GMain.Rc.add_default_file ((Fc_config.datadir:>string) ^"/frama-c-user.rc");
+ GMain.Rc.add_default_file ((System_config.datadir:>string) ^"/frama-c.rc");
+ GMain.Rc.add_default_file ((System_config.datadir:>string) ^"/frama-c-user.rc");
(*print_endline ("BOOT: " ^ (Glib.Main.setlocale `ALL None));*)
let (_:string) = GtkMain.Main.init ~setlocale:false () in
(*print_endline ("START: " ^ (Glib.Main.setlocale `ALL None));*)
diff --git a/src/plugins/gui/filetree.ml b/src/plugins/gui/filetree.ml
index ad6f63a75df..3971403b575 100644
--- a/src/plugins/gui/filetree.ml
+++ b/src/plugins/gui/filetree.ml
@@ -294,7 +294,7 @@ module MYTREE = struct
let comes_from_share filename =
let path = Filepath.Normalized.of_string filename in
- Filepath.is_relative ~base_name:Fc_config.datadir path
+ Filepath.is_relative ~base_name:System_config.datadir path
let is_function t = match t with
| MFile _ -> false
diff --git a/src/plugins/gui/gtk_helper.ml b/src/plugins/gui/gtk_helper.ml
index 3bf2e03f8ae..1dbb0fc1d5b 100644
--- a/src/plugins/gui/gtk_helper.ml
+++ b/src/plugins/gui/gtk_helper.ml
@@ -24,7 +24,7 @@
let () =
begin
- Wutil.share := (Fc_config.datadir :> string);
+ Wutil.share := (System_config.datadir :> string);
Wutil.flush := (fun msg -> Gui_parameters.warning "%s" msg);
end
@@ -32,7 +32,7 @@ let framac_logo, framac_icon =
try
let img ext =
Some (GdkPixbuf.from_file
- ((Fc_config.datadir:>string) ^ "/frama-c." ^ ext))
+ ((System_config.datadir:>string) ^ "/frama-c." ^ ext))
in
img "png", img "ico"
with
diff --git a/src/plugins/gui/help_manager.ml b/src/plugins/gui/help_manager.ml
index 8d8e9732f96..a178673cdb3 100644
--- a/src/plugins/gui/help_manager.ml
+++ b/src/plugins/gui/help_manager.ml
@@ -100,7 +100,7 @@ let show main_ui =
~license
~website:"http://frama-c.com"
~website_label:"Questions and support"
- ~version:Fc_config.version_and_codename
+ ~version:System_config.version_and_codename
~comments:"Frama-C is a suite of tools dedicated to the analysis of the \
source code of software written in C."
()
diff --git a/src/plugins/markdown-report/sarif_gen.ml b/src/plugins/markdown-report/sarif_gen.ml
index 99b049c7bdd..65e4d54cde8 100644
--- a/src/plugins/markdown-report/sarif_gen.ml
+++ b/src/plugins/markdown-report/sarif_gen.ml
@@ -28,7 +28,7 @@ let frama_c_sarif () =
if Mdr_params.SarifDeterministic.get () then
"0+omitted-for-deterministic-output", ""
else
- Fc_config.version_and_codename, Fc_config.version
+ System_config.version_and_codename, System_config.version
in
let fullName = name ^ "-" ^ version in
let downloadUri = "https://frama-c.com/download.html" in
diff --git a/src/plugins/report/classify.ml b/src/plugins/report/classify.ml
index b4dc9b17d2e..98cf1b9b351 100644
--- a/src/plugins/report/classify.ml
+++ b/src/plugins/report/classify.ml
@@ -546,7 +546,7 @@ let classify () =
report_number "Unclassified: " !nb_unclassified R.OutputUnclassified.get ;
if !nb_errors > 0 && R.Exit.get () then
R.abort "Classified errors found" ;
- if not Fc_config.is_gui then clear_events () ;
+ if not System_config.is_gui then clear_events () ;
end
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/server/kernel_main.ml b/src/plugins/server/kernel_main.ml
index 1d178f7240c..740bd0c5310 100644
--- a/src/plugins/server/kernel_main.ml
+++ b/src/plugins/server/kernel_main.ml
@@ -107,10 +107,10 @@ let () =
~descr:(Md.plain "Frama-C Kernel configuration")
signature
begin fun rq () ->
- set_version rq Fc_config.version ;
- set_datadir rq (Filepath.Normalized.to_string_list Fc_config.datadirs);
+ set_version rq System_config.version ;
+ set_datadir rq (Filepath.Normalized.to_string_list System_config.datadirs);
set_pluginpath rq
- (Filepath.Normalized.to_string_list Fc_config.plugin_dir) ;
+ (Filepath.Normalized.to_string_list System_config.plugin_dir) ;
end
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/server/server_doc.ml b/src/plugins/server/server_doc.ml
index 7b65b2bc32f..8f8fd507bb3 100644
--- a/src/plugins/server/server_doc.ml
+++ b/src/plugins/server/server_doc.ml
@@ -370,7 +370,7 @@ let dump ~root ?(meta=true) () =
Yojson.Basic.to_file (path:>string) maindata ;
let body =
[ Md.H1 (Md.plain "Presentation", None);
- Md.Block (Md.text (Md.format "Version %s" Fc_config.version))]
+ Md.Block (Md.text (Md.format "Version %s" System_config.version))]
@
table_of_contents ()
@
diff --git a/src/plugins/wp/wpApi.ml b/src/plugins/wp/wpApi.ml
index 0fa7194ddba..aa94f15b3e0 100644
--- a/src/plugins/wp/wpApi.ml
+++ b/src/plugins/wp/wpApi.ml
@@ -153,7 +153,7 @@ let get_name = function
| VCS.Why3 p -> Why3Provers.name p
let get_version = function
- | VCS.Qed | Tactical -> Fc_config.version_and_codename
+ | VCS.Qed | Tactical -> System_config.version_and_codename
| Why3 p -> Why3Provers.version p
let iter_provers fn =
diff --git a/src/plugins/wp/wp_parameters.ml b/src/plugins/wp/wp_parameters.ml
index 80bccc0d9a4..a0334d13b33 100644
--- a/src/plugins/wp/wp_parameters.ml
+++ b/src/plugins/wp/wp_parameters.ml
@@ -47,7 +47,7 @@ let has_dkey (k:category) = is_debug_key_enabled k
let server = ref false
let () = Server.Main.once (fun () -> server := true)
-let is_interactive () = Fc_config.is_gui || !server
+let is_interactive () = System_config.is_gui || !server
(* ------------------------------------------------------------------------ *)
(* --- WP Generation --- *)
diff --git a/tests/libc/check_compliance.ml b/tests/libc/check_compliance.ml
index e75f6dac805..3688f8074ae 100644
--- a/tests/libc/check_compliance.ml
+++ b/tests/libc/check_compliance.ml
@@ -130,7 +130,7 @@ let () =
let vis = new stdlib_visitor in
ignore (Visitor.visitFramacFile (vis :> Visitor.frama_c_visitor) (Ast.get ()));
let fc_stdlib_idents = vis#get_idents in
- let dir = Filename.concat (Fc_config.datadir:>string) "compliance" in
+ let dir = Filename.concat (System_config.datadir:>string) "compliance" in
let c11_idents = Json.(to_table HeadersOnly (parse dir "c11_functions.json"))
and c11_headers = Json.(to_set (parse dir "c11_headers.json"))
and glibc_idents = Json.(to_set (parse dir "glibc_functions.json"))
diff --git a/tests/misc/version.ml b/tests/misc/version.ml
index cddd787c76c..5c3fdae73bd 100644
--- a/tests/misc/version.ml
+++ b/tests/misc/version.ml
@@ -1,20 +1,20 @@
let re_version = Str.regexp "^\\([0-9]+\\)\\.\\([0-9]+\\)"
let run () =
- let version_str = Fc_config.version in
+ let version_str = System_config.version in
if Str.string_match re_version version_str 0 then
let major = Str.matched_group 1 version_str in
let minor = Str.matched_group 2 version_str in
- if major = string_of_int Fc_config.major_version &&
- minor = string_of_int Fc_config.minor_version
+ if major = string_of_int System_config.major_version &&
+ minor = string_of_int System_config.minor_version
then
Kernel.feedback "version numbers match"
else
Kernel.abort
"error parsing major/minor version: expected %s.%s, got %d.%d"
- major minor Fc_config.major_version Fc_config.minor_version
+ major minor System_config.major_version System_config.minor_version
else
Kernel.abort
- "could not parse Fc_config.version"
+ "could not parse System_config.version"
let () = Boot.Main.extend run
--
GitLab