Skip to content

Commit 62d9754

Browse files
Simone Ballarinsimhein
authored andcommitted
sca: Add cmake variables to enable artefacts
Add the cmake variables to enable following artefacts: ECLAIR_metrics_tab: metrics in spreadsheet format ECLAIR_reports_tab: findings in spreadsheet format ECLAIR_summary_txt: summary report in plain textual format ECLAIR_summary_doc: summary report in DOC format ECLAIR_summary_odt: summary report in ODT format ECLAIR_full_txt_areas: enable/disable detailed reports in txt format ECLAIR_full_txt: rich/detailed report in plain textual format ECLAIR_full_doc_areas: enable/disable detailed reports in ODT/DOC format ECLAIR_full_doc: rich/detailed report in DOC format ECLAIR_full_odt: rich/detailed report in ODT format Signed-off-by: Simone Ballarin <[email protected]>
1 parent 28ff97d commit 62d9754

File tree

2 files changed

+48
-16
lines changed

2 files changed

+48
-16
lines changed

cmake/sca/eclair/ECL/reports.ecl

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,33 @@ loading()
3737
map_strings("load_ecb", dir_entries(data_dir))
3838
loaded()
3939

40-
if(string_equal(or(getenv("TEXTUAL_REPORTS"),"false"),"true")
41-
eval_file("report__textual.ecl"))
42-
43-
44-
# Output report summaries in ODT format.
45-
#-summary_odt=join_paths(output_dir,"odt")
46-
# Output report summaries in ODT format.
47-
#-summary_doc=join_paths(output_dir,"doc")
48-
# Output report summaries in pure text format.
49-
#-summary_txt=join_paths(output_dir,"txt")
50-
# Output full report in pure text format.
51-
#-full_txt=join_paths(output_dir,"txt")
52-
# Output metrics for use with spreadsheet applications (if enabled).
53-
#-metrics_tab=join_paths(output_dir,"metrics")
54-
# Output reports for use with spreadsheet applications
55-
#-reports_tab=join_paths(output_dir,"reports")
40+
if(string_equal(or(getenv("ECLAIR_metrics_tab"),"false"),"true")
41+
metrics_tab(join_paths(output_dir,"metrics")))
42+
43+
if(string_equal(or(getenv("ECLAIR_reports_tab"),"false"),"true")
44+
reports_tab(join_paths(output_dir,"reports")))
45+
46+
if(string_equal(or(getenv("ECLAIR_summary_txt"),"false"),"true")
47+
summary_txt(join_paths(output_dir,"summary_txt")))
48+
49+
if(string_equal(or(getenv("ECLAIR_summary_doc"),"false"),"true")
50+
summary_doc(join_paths(output_dir,"summary_doc")))
51+
52+
if(string_equal(or(getenv("ECLAIR_summary_odt"),"false"),"true")
53+
summary_odt(join_paths(output_dir,"summary_odt")))
54+
55+
if(string_equal(or(getenv("ECLAIR_full_txt_areas"),"true"),"true")
56+
setq(report_areas,"areas"),
57+
setq(report_areas,"first_area"))
58+
if(string_equal(or(getenv("ECLAIR_full_txt"),"false"),"true")
59+
full_txt(join_paths(output_dir,"txt")))
60+
61+
if(string_equal(or(getenv("ECLAIR_full_doc_areas"),"false"),"true")
62+
setq(report_areas,"areas"),
63+
setq(report_areas,"first_area"))
64+
if(string_equal(or(getenv("ECLAIR_full_doc"),"false"),"true")
65+
full_doc(join_paths(output_dir,"doc")))
66+
if(string_equal(or(getenv("ECLAIR_full_odt"),"false"),"true")
67+
full_odt(join_paths(output_dir,"odt")))
5668

5769
server("changed")

cmake/sca/eclair/sca.cmake

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ add_custom_command(
6363
COMMAND sh -c "ECLAIR_DATA_DIR=${ECLAIR_DATA_DIR} \
6464
ECLAIR_OUTPUT_DIR=${ECLAIR_OUTPUT_DIR} \
6565
ECLAIR_PROJECT_ECD=${ECLAIR_PROJECT_ECD} \
66+
ECLAIR_metrics_tab=${ECLAIR_metrics_tab} \
67+
ECLAIR_reports_tab=${ECLAIR_reports_tab} \
68+
ECLAIR_summary_txt=${ECLAIR_summary_txt} \
69+
ECLAIR_summary_doc=${ECLAIR_summary_doc} \
70+
ECLAIR_summary_odt=${ECLAIR_summary_odt} \
71+
ECLAIR_full_txt_areas=${ECLAIR_full_txt_areas} \
72+
ECLAIR_full_txt=${ECLAIR_full_txt} \
73+
ECLAIR_full_doc_areas=${ECLAIR_full_doc_areas} \
74+
ECLAIR_full_doc=${ECLAIR_full_doc} \
75+
ECLAIR_full_odt=${ECLAIR_full_odt} \
6676
${ECLAIR_REPORT} \
6777
-eval_file=${ECLAIR_ECL_DIR}/reports.ecl \
6878
| tee ${ECLAIR_OUTPUT_DIR}/report.log"
@@ -72,3 +82,13 @@ add_custom_command(
7282
)
7383

7484
unset(ECLAIR_RULES_SET CACHE)
85+
unset(ECLAIR_metrics_tab CACHE)
86+
unset(ECLAIR_reports_tab CACHE)
87+
unset(ECLAIR_summary_txt CACHE)
88+
unset(ECLAIR_summary_doc CACHE)
89+
unset(ECLAIR_summary_odt CACHE)
90+
unset(ECLAIR_full_txt_areas CACHE)
91+
unset(ECLAIR_full_txt CACHE)
92+
unset(ECLAIR_full_doc_areas CACHE)
93+
unset(ECLAIR_full_doc CACHE)
94+
unset(ECLAIR_full_odt CACHE)

0 commit comments

Comments
 (0)