From 802a18f95e4ffb077a4c39c01e132e2e38305657 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Wed, 12 Oct 2022 15:08:09 +0200
Subject: [PATCH] fixes the plugin name to frama-clang
---
Makefile | 4 ++--
dune | 6 +++---
dune-project | 4 ++--
frama-c-clang.opam => frama-clang.opam | 2 +-
frama-c-clang.opam.template => frama-clang.opam.template | 2 +-
share/dune | 2 +-
tests/test_config | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
rename frama-c-clang.opam => frama-clang.opam (97%)
rename frama-c-clang.opam.template => frama-clang.opam.template (94%)
diff --git a/Makefile b/Makefile
index cc4d079b..34d37602 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,9 @@ sinclude ${FRAMAC_SHARE}/Makefile.common
##########################################################################
# Build
-all:: build frama-c-clang.opam
+all:: build frama-clang.opam
-frama-c-clang.opam: frama-c-clang.opam.template dune-project
+frama-clang.opam: frama-clang.opam.template dune-project
rm -f $@
dune build $@
diff --git a/dune b/dune
index 8b69bcd2..95d11a57 100644
--- a/dune
+++ b/dune
@@ -24,7 +24,7 @@
(alias frama-c-configure)
(deps (universe))
(action (progn
- (echo "Clang:" %{lib-available:frama-c-clang.core} "\n")
+ (echo "Clang:" %{lib-available:frama-clang.core} "\n")
(echo " - zarith:" %{lib-available:zarith} "\n")
(echo " - camlp5:" %{lib-available:camlp5} "\n") ; for gen_ast
(echo " - camlp-streams:" %{lib-available:camlp-streams} "\n")
@@ -59,7 +59,7 @@
(library
(name clang)
(optional)
- (public_name frama-c-clang.core)
+ (public_name frama-clang.core)
(flags (-open Frama_c_kernel :standard -w -9))
(libraries frama-c.kernel frama-c-wp.core camlp-streams zarith)
)
@@ -73,7 +73,7 @@
(action (run %{exe:gen_ast_src/gen_ast.exe} %{deps}))
)
-(plugin (optional) (name clang) (libraries frama-c-clang.core) (site (frama-c plugins)))
+(plugin (optional) (name clang) (libraries frama-clang.core) (site (frama-c plugins)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/dune-project b/dune-project
index cc926b7e..110cc9df 100644
--- a/dune-project
+++ b/dune-project
@@ -24,10 +24,10 @@
(using dune_site 0.1)
(generate_opam_files true)
-(name frama-c-clang)
+(name frama-clang)
(maintainers "https://git.frama-c.com/pub/frama-c")
-(package (name frama-c-clang)
+(package (name frama-clang)
(depends
("frama-c" (and (>= 25.0) (< 26.0)))
("zarith" (>= 1.5))
diff --git a/frama-c-clang.opam b/frama-clang.opam
similarity index 97%
rename from frama-c-clang.opam
rename to frama-clang.opam
index b48ddefc..0907aa0d 100644
--- a/frama-c-clang.opam
+++ b/frama-clang.opam
@@ -28,7 +28,7 @@ build: [
]
["dune" "install" "-p" name "--create-install-files" name]
]
-name: "frama-c-clang"
+name: "frama-clang"
version: "0.0.11"
synopsis: "Frama-C plug-in based on Clang for parsing C++ files"
description: """
diff --git a/frama-c-clang.opam.template b/frama-clang.opam.template
similarity index 94%
rename from frama-c-clang.opam.template
rename to frama-clang.opam.template
index cf7a895f..b559bc80 100644
--- a/frama-c-clang.opam.template
+++ b/frama-clang.opam.template
@@ -1,4 +1,4 @@
-name: "frama-c-clang"
+name: "frama-clang"
version: "0.0.11"
synopsis: "Frama-C plug-in based on Clang for parsing C++ files"
description: """
diff --git a/share/dune b/share/dune
index 9dc87725..a7c8d45a 100644
--- a/share/dune
+++ b/share/dune
@@ -21,7 +21,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(install
- (package frama-c-clang)
+ (package frama-clang)
(section (site (frama-c share)))
(files
(libc++/algorithm as libc++/algorithm)
diff --git a/tests/test_config b/tests/test_config
index c3d4e232..ed5cf13b 100644
--- a/tests/test_config
+++ b/tests/test_config
@@ -12,7 +12,7 @@ MACRO: WP -wp -wp-par 1 -wp-session=%{read:@WP_CACHE@} -wp-cache update -wp-msg-
MACRO: EVA_PLUGINS eva,scope inout,from variadic
MACRO: WP_PLUGINS wp,rtegen
-PLUGIN: clang @WP_PLUGINS@ @EVA_PLUGINS@
+PLUGIN: frama-clang @WP_PLUGINS@ @EVA_PLUGINS@
FILTER:sed -e "s|@FRAMAC_SHARE@|FRAMAC_SHARE|g" -e "s|$(pwd -P)/||g"
OPT: @MACHDEP@ -print -check @CXX@
--
GitLab