mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use Helper_optional SCRIPTING for libs that don't exist if --disable-scripting

Browse Source 
Change-Id: Iec65d6395b903e13f788fe8322b60aac5b974cd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120125
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2021-08-06 16:59:37 +01:00
parent 245d73fa13
commit 26cfb57abf
34 changed files with 77 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
chart2/CppunitTest_chart2_dump.mk
View File

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dump, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
xo \
sw \
))

3
chart2/CppunitTest_chart2_geometry.mk
View File

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_geometry, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
xo \
))

3
chart2/CppunitTest_chart2_pivot_chart_test.mk
View File

@@ -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 \
))

3
chart2/CppunitTest_chart2_trendcalculators.mk
View File

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_trendcalculators, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
xo \
sw \
))

3
chart2/CppunitTest_chart2_xshape.mk
View File

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
xo \
sw \
))

3
chart2/export_setup.mk
View File

@@ -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 \
))

3
chart2/import_setup.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_anchor_test.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_bugfix_test.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_cache_test.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_chart2dataprovider.mk
View File

@@ -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) \

3
sc/CppunitTest_sc_chart_regression_test.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_cond_format_merge.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_copypaste.mk
View File

@@ -52,7 +52,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_copypaste, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
xo \
))

3
sc/CppunitTest_sc_datapilotitemobj.mk
View File

@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotitemobj, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
xo \
))

3
sc/CppunitTest_sc_datapilottablesobj.mk
View File

@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottablesobj, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
xo \
))

3
sc/CppunitTest_sc_dataprovider.mk
View File

@@ -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) \

3
sc/CppunitTest_sc_datatransformation.mk
View File

@@ -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) \

3
sc/CppunitTest_sc_macros_test.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_mark_test.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_namedrangeobj.mk
View File

@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
xo \
))

3
sc/CppunitTest_sc_new_cond_format_api.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_parallelism.mk
View File

@@ -62,7 +62,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
xo \
))

3
sc/CppunitTest_sc_perfobj.mk
View File

@@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_perfobj, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
xo \
))

3
sc/CppunitTest_sc_range_test.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_rangelst_test.mk
View File

@@ -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 \
))

3
sc/CppunitTest_sc_tiledrendering.mk
View File

@@ -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 \

3
sc/ucalc_setup.mk
View File

@@ -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 \
))

3
sccomp/CppunitTest_sccomp_swarmsolvertest.mk
View File

@@ -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) \

3
sw/CppunitTest_sw_apitests.mk
View File

@@ -53,7 +53,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_apitests, \
ucbhelper \
unotest \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
xo \
))

3
sw/CppunitTest_sw_macros_test.mk
View File

@@ -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 \
))

3
sw/CppunitTest_sw_uwriter.mk
View File

@@ -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 \

3
sw/Library_vbaswobj.mk
View File

@@ -56,7 +56,8 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\
tk \
tl \
utl \
vbahelper \
$(call gb_Helper_optional,SCRIPTING, \
vbahelper) \
vcl \
))

17
vcl/commonfuzzer.mk
View File

@@ -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 \