From b2071cb87c699b37cecf5731faef92e299732e0f Mon Sep 17 00:00:00 2001 From: Virgile Prevosto <virgile.prevosto@m4x.org> Date: Wed, 30 Oct 2019 09:52:50 +0100 Subject: [PATCH] [mdr] clean up plug-in name --- src/plugins/markdown-report/.gitignore | 3 +-- src/plugins/markdown-report/Makefile | 33 +++++++++--------------- src/plugins/markdown-report/sarif_gen.ml | 4 +-- 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/src/plugins/markdown-report/.gitignore b/src/plugins/markdown-report/.gitignore index d3be7b0249a..fec8b03f6b4 100644 --- a/src/plugins/markdown-report/.gitignore +++ b/src/plugins/markdown-report/.gitignore @@ -7,8 +7,7 @@ top/ .depend .merlin *~ -/mdr_version.ml -/Report_markdown.mli +/Markdown_report.mli /tests/ptests_config /tests/*/result /tests/*/result_* diff --git a/src/plugins/markdown-report/Makefile b/src/plugins/markdown-report/Makefile index b79cdd5d8d8..fae71e12424 100644 --- a/src/plugins/markdown-report/Makefile +++ b/src/plugins/markdown-report/Makefile @@ -2,38 +2,29 @@ ifndef FRAMAC_SHARE FRAMAC_SHARE:=$(shell frama-c -print-share-path) endif -Report_markdown_VERSION:=0.1~beta - -PLUGIN_NAME:=Report_markdown -PLUGIN_GENERATED:=$(PLUGIN_DIR)/mdr_version.ml $(PLUGIN_DIR)/Report_markdown.mli +PLUGIN_NAME:=Markdown_report +PLUGIN_GENERATED:=$(PLUGIN_DIR)/Markdown_report.mli PLUGIN_CMO:=\ - sarif mdr_version mdr_params parse_remarks \ + sarif mdr_params parse_remarks \ eva_coverage md_gen sarif_gen mdr_register PLUGIN_REQUIRES:=ppx_deriving ppx_deriving_yojson yojson -PLUGIN_VERSION:=$(Report_markdown_VERSION) PLUGIN_DISTRIB_EXTERNAL:=share/acsl.xml PLUGIN_TESTS_DIRS:= eva include $(FRAMAC_SHARE)/Makefile.dynamic -$(Report_markdown_DIR)/mdr_version.ml: $(Report_markdown_DIR)/Makefile - $(PRINT_MAKING) $@ - $(RM) $@ - $(ECHO) "let version = \"$(Report_markdown_VERSION)\"" > $@ - $(CHMOD_RO) $@ - -$(Report_markdown_DIR)/Report_markdown.mli: \ - $(Report_markdown_DIR)/mdr_params.mli \ - $(Report_markdown_DIR)/md_gen.mli \ - $(Report_markdown_DIR)/Makefile +$(Markdown_report_DIR)/Markdown_report.mli: \ + $(Markdown_report_DIR)/mdr_params.mli \ + $(Markdown_report_DIR)/md_gen.mli \ + $(Markdown_report_DIR)/Makefile echo "module Mdr_params: sig" > $@ - cat $(Report_markdown_DIR)/mdr_params.mli >> $@ + cat $(Markdown_report_DIR)/mdr_params.mli >> $@ echo "end" >> $@ echo "module Md_gen: sig" >> $@ - cat $(Report_markdown_DIR)/md_gen.mli >> $@ + cat $(Markdown_report_DIR)/md_gen.mli >> $@ echo "end" >> $@ install:: - $(PRINT_CP) $(FRAMAC_DATADIR)/Report_markdown - $(MKDIR) $(FRAMAC_DATADIR)/Report_markdown - $(CP) share/acsl.xml $(FRAMAC_DATADIR)/Report_markdown + $(PRINT_CP) $(FRAMAC_DATADIR)/Markdown_report + $(MKDIR) $(FRAMAC_DATADIR)/Markdown_report + $(CP) share/acsl.xml $(FRAMAC_DATADIR)/Markdown_report diff --git a/src/plugins/markdown-report/sarif_gen.ml b/src/plugins/markdown-report/sarif_gen.ml index 44cfad92c9c..f06371ecf1c 100644 --- a/src/plugins/markdown-report/sarif_gen.ml +++ b/src/plugins/markdown-report/sarif_gen.ml @@ -28,10 +28,8 @@ let frama_c_sarif = let semanticVersion = Config.version in let fullName = name ^ "-" ^ version in let downloadUri = "https://frama-c.com/download.html" in - let sarifLoggerVersion = Mdr_version.version in Tool.create - ~name ~version ~semanticVersion - ~fullName ~downloadUri ~sarifLoggerVersion () + ~name ~version ~semanticVersion ~fullName ~downloadUri () let get_remarks () = -- GitLab