chart2/CppunitTest_chart2_dump.mk | 3 ++-
chart2/CppunitTest_chart2_geometry.mk | 3 ++-
chart2/CppunitTest_chart2_pivot_chart_test.mk | 3 ++-
chart2/CppunitTest_chart2_trendcalculators.mk | 3 ++-
chart2/CppunitTest_chart2_xshape.mk | 3 ++-
chart2/export_setup.mk | 3 ++-
chart2/import_setup.mk | 3 ++-
sc/CppunitTest_sc_anchor_test.mk | 3 ++-
sc/CppunitTest_sc_bugfix_test.mk | 3 ++-
sc/CppunitTest_sc_cache_test.mk | 3 ++-
sc/CppunitTest_sc_chart2dataprovider.mk | 3 ++-
sc/CppunitTest_sc_chart_regression_test.mk | 3 ++-
sc/CppunitTest_sc_cond_format_merge.mk | 3 ++-
sc/CppunitTest_sc_copypaste.mk | 3 ++-
sc/CppunitTest_sc_datapilotitemobj.mk | 3 ++-
sc/CppunitTest_sc_datapilottablesobj.mk | 3 ++-
sc/CppunitTest_sc_dataprovider.mk | 3 ++-
sc/CppunitTest_sc_datatransformation.mk | 3 ++-
sc/CppunitTest_sc_macros_test.mk | 3 ++-
sc/CppunitTest_sc_mark_test.mk | 3 ++-
sc/CppunitTest_sc_namedrangeobj.mk | 3 ++-
sc/CppunitTest_sc_new_cond_format_api.mk | 3 ++-
sc/CppunitTest_sc_parallelism.mk | 3 ++-
sc/CppunitTest_sc_perfobj.mk | 3 ++-
sc/CppunitTest_sc_range_test.mk | 3 ++-
sc/CppunitTest_sc_rangelst_test.mk | 3 ++-
sc/CppunitTest_sc_tiledrendering.mk | 3 ++-
sc/ucalc_setup.mk | 3 ++-
sccomp/CppunitTest_sccomp_swarmsolvertest.mk | 3 ++-
sw/CppunitTest_sw_apitests.mk | 3 ++-
sw/CppunitTest_sw_macros_test.mk | 3 ++-
sw/CppunitTest_sw_uwriter.mk | 3 ++-
sw/Library_vbaswobj.mk | 3 ++-
vcl/commonfuzzer.mk | 17 +++++++++++------
34 files changed, 77 insertions(+), 39 deletions(-)
New commits:
commit 26cfb57abfc037752bc02dae043f08ac7b2bc711
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 6 16:59:37 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 6 21:16:43 2021 +0200
use Helper_optional SCRIPTING for libs that don't exist if
--disable-scripting
Change-Id: Iec65d6395b903e13f788fe8322b60aac5b974cd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120125
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/chart2/CppunitTest_chart2_dump.mk
b/chart2/CppunitTest_chart2_dump.mk
index 4bf7d692c1c6..90c12ff039a8 100644
--- a/chart2/CppunitTest_chart2_dump.mk
+++ b/chart2/CppunitTest_chart2_dump.mk
@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dump, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
xo \
sw \
))
diff --git a/chart2/CppunitTest_chart2_geometry.mk
b/chart2/CppunitTest_chart2_geometry.mk
index 457d7ffd3036..f2467594abc3 100644
--- a/chart2/CppunitTest_chart2_geometry.mk
+++ b/chart2/CppunitTest_chart2_geometry.mk
@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_geometry, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk
b/chart2/CppunitTest_chart2_pivot_chart_test.mk
index af49c8a0b02f..4dc7dca420cb 100644
--- a/chart2/CppunitTest_chart2_pivot_chart_test.mk
+++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk
@@ -52,7 +52,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,chart2_pivot_chart_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
xo \
sw \
))
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk
b/chart2/CppunitTest_chart2_trendcalculators.mk
index f8c14bfba120..2ef23fc9bf90 100644
--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -52,7 +52,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,chart2_trendcalculators, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
xo \
sw \
))
diff --git a/chart2/CppunitTest_chart2_xshape.mk
b/chart2/CppunitTest_chart2_xshape.mk
index 08d43565d107..7f4c65f415dc 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
xo \
sw \
))
diff --git a/chart2/export_setup.mk b/chart2/export_setup.mk
index 59bd27ef3938..359973634dbd 100644
--- a/chart2/export_setup.mk
+++ b/chart2/export_setup.mk
@@ -55,7 +55,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export$(1),
\
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/chart2/import_setup.mk b/chart2/import_setup.mk
index 16647f5f9a0c..fb83a0462b7e 100644
--- a/chart2/import_setup.mk
+++ b/chart2/import_setup.mk
@@ -55,7 +55,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import$(1),
\
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_anchor_test.mk b/sc/CppunitTest_sc_anchor_test.mk
index da3807004573..4b54ab542ae1 100644
--- a/sc/CppunitTest_sc_anchor_test.mk
+++ b/sc/CppunitTest_sc_anchor_test.mk
@@ -50,7 +50,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_anchor_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index 1abda4990bb4..9d27f9bd04f0 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_bugfix_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_cache_test.mk b/sc/CppunitTest_sc_cache_test.mk
index 66ecab8c1226..f0212dcb04b0 100644
--- a/sc/CppunitTest_sc_cache_test.mk
+++ b/sc/CppunitTest_sc_cache_test.mk
@@ -54,7 +54,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cache_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_chart2dataprovider.mk
b/sc/CppunitTest_sc_chart2dataprovider.mk
index a790129dfcbe..80de59a744b6 100644
--- a/sc/CppunitTest_sc_chart2dataprovider.mk
+++ b/sc/CppunitTest_sc_chart2dataprovider.mk
@@ -52,7 +52,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_chart2dataprovider, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
$(gb_UWINAPI) \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk
b/sc/CppunitTest_sc_chart_regression_test.mk
index 8bfab584f753..5d155dfd36a7 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -45,7 +45,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_chart_regression_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_cond_format_merge.mk
b/sc/CppunitTest_sc_cond_format_merge.mk
index ab5b351c47e5..9e27d89269f9 100644
--- a/sc/CppunitTest_sc_cond_format_merge.mk
+++ b/sc/CppunitTest_sc_cond_format_merge.mk
@@ -50,7 +50,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_cond_format_merge, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk
index a9351f7a3cb1..9a5938271739 100644
--- a/sc/CppunitTest_sc_copypaste.mk
+++ b/sc/CppunitTest_sc_copypaste.mk
@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_copypaste, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_datapilotitemobj.mk
b/sc/CppunitTest_sc_datapilotitemobj.mk
index e34cd82a3768..16964520ac09 100644
--- a/sc/CppunitTest_sc_datapilotitemobj.mk
+++ b/sc/CppunitTest_sc_datapilotitemobj.mk
@@ -49,7 +49,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_datapilotitemobj, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_datapilottablesobj.mk
b/sc/CppunitTest_sc_datapilottablesobj.mk
index 874473b79b61..ac289889ebaf 100644
--- a/sc/CppunitTest_sc_datapilottablesobj.mk
+++ b/sc/CppunitTest_sc_datapilottablesobj.mk
@@ -49,7 +49,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_datapilottablesobj, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_dataprovider.mk
b/sc/CppunitTest_sc_dataprovider.mk
index a7b29dd1c2c6..6858c7085fcb 100644
--- a/sc/CppunitTest_sc_dataprovider.mk
+++ b/sc/CppunitTest_sc_dataprovider.mk
@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_dataprovider, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
$(gb_UWINAPI) \
diff --git a/sc/CppunitTest_sc_datatransformation.mk
b/sc/CppunitTest_sc_datatransformation.mk
index 81dbd7127bbe..808cec8615d0 100644
--- a/sc/CppunitTest_sc_datatransformation.mk
+++ b/sc/CppunitTest_sc_datatransformation.mk
@@ -52,7 +52,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_datatransformation, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
$(gb_UWINAPI) \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index b4f62624e693..b29c3fe03b54 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_mark_test.mk b/sc/CppunitTest_sc_mark_test.mk
index b0cd5222cc5e..c305f50e7a21 100644
--- a/sc/CppunitTest_sc_mark_test.mk
+++ b/sc/CppunitTest_sc_mark_test.mk
@@ -54,7 +54,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_mark_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk
b/sc/CppunitTest_sc_namedrangeobj.mk
index 87d6fde1fb16..5459a0833c9f 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_new_cond_format_api.mk
b/sc/CppunitTest_sc_new_cond_format_api.mk
index b16f07c0b38d..5f111580627e 100644
--- a/sc/CppunitTest_sc_new_cond_format_api.mk
+++ b/sc/CppunitTest_sc_new_cond_format_api.mk
@@ -48,7 +48,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sc_new_cond_format_api, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_parallelism.mk b/sc/CppunitTest_sc_parallelism.mk
index eb7aaa446954..7002c33c5129 100644
--- a/sc/CppunitTest_sc_parallelism.mk
+++ b/sc/CppunitTest_sc_parallelism.mk
@@ -62,7 +62,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_perfobj.mk b/sc/CppunitTest_sc_perfobj.mk
index 9c6edc2c421b..1c05df7a2ba2 100644
--- a/sc/CppunitTest_sc_perfobj.mk
+++ b/sc/CppunitTest_sc_perfobj.mk
@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_perfobj, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_range_test.mk b/sc/CppunitTest_sc_range_test.mk
index f344bed41cbc..d382ab6219e8 100644
--- a/sc/CppunitTest_sc_range_test.mk
+++ b/sc/CppunitTest_sc_range_test.mk
@@ -54,7 +54,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_range_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_rangelst_test.mk
b/sc/CppunitTest_sc_rangelst_test.mk
index 8b87fdc95e32..a652231686e9 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -54,7 +54,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sc/CppunitTest_sc_tiledrendering.mk
b/sc/CppunitTest_sc_tiledrendering.mk
index d42fc0a956a6..7d194c29863f 100644
--- a/sc/CppunitTest_sc_tiledrendering.mk
+++ b/sc/CppunitTest_sc_tiledrendering.mk
@@ -32,7 +32,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tiledrendering,
\
scui \
test \
unotest \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
tl \
utl \
diff --git a/sc/ucalc_setup.mk b/sc/ucalc_setup.mk
index a678ad11850e..73bf5ca45790 100644
--- a/sc/ucalc_setup.mk
+++ b/sc/ucalc_setup.mk
@@ -69,7 +69,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc$(1), \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sccomp/CppunitTest_sccomp_swarmsolvertest.mk
b/sccomp/CppunitTest_sccomp_swarmsolvertest.mk
index ca6667638613..38cc3fa39521 100644
--- a/sccomp/CppunitTest_sccomp_swarmsolvertest.mk
+++ b/sccomp/CppunitTest_sccomp_swarmsolvertest.mk
@@ -48,7 +48,8 @@ $(eval $(call
gb_CppunitTest_use_libraries,sccomp_swarmsolvertest,\
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
$(gb_UWINAPI) \
diff --git a/sw/CppunitTest_sw_apitests.mk b/sw/CppunitTest_sw_apitests.mk
index d65c058fc97c..9af8873079d3 100644
--- a/sw/CppunitTest_sw_apitests.mk
+++ b/sw/CppunitTest_sw_apitests.mk
@@ -53,7 +53,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_apitests, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 7f38c45180bb..805242613b58 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -48,7 +48,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xo \
))
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index e6a490c5dff1..ef9951ca1f80 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -56,7 +56,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \
ucbhelper \
unotest \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
xmlreader \
xo \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index a73b5d1721f1..8867fcf5ede4 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -56,7 +56,8 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\
tk \
tl \
utl \
- vbahelper \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbahelper) \
vcl \
))
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 6541d9ec7360..ee7fe1ad95d6 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -43,10 +43,12 @@ fuzzer_externals = \
zlib \
fuzzer_core_libraries = \
- basctl \
avmedia \
basegfx \
- basprov \
+ $(call gb_Helper_optional,SCRIPTING, \
+ basctl \
+ basprov \
+ ) \
bib \
canvastools \
configmgr \
@@ -71,7 +73,8 @@ fuzzer_core_libraries = \
package2 \
sax \
sb \
- scriptframe \
+ $(call gb_Helper_optional,SCRIPTING, \
+ scriptframe) \
spell \
sfx \
sofficeapp \
@@ -145,9 +148,11 @@ fuzzer_calc_libraries = \
pricing \
scfilt \
scd \
- vbaevents \
- vbahelper \
- vbaobj \
+ $(call gb_Helper_optional,SCRIPTING, \
+ vbaevents \
+ vbahelper \
+ vbaobj \
+ ) \
sc \
for \
forui \
