diff options
43 files changed, 25 insertions, 147 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 423834e53262..5285bccb0380 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2912,33 +2912,36 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\ ) endef -# Better duplication with gb_Gallery__UNO_COMPONENTS than nothing. +gb_Gallery__UNO_COMPONENTS := \ + comphelper/util/comphelp \ + configmgr/source/configmgr \ + drawinglayer/drawinglayer \ + fileaccess/source/fileacc \ + framework/util/fwk \ + i18npool/util/i18npool \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + sfx2/util/sfx \ + svgio/svgio \ + svx/util/svx \ + svx/util/svxcore \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ + unoxml/source/service/unoxml + # This is used to determine what we need for 'build' platform. define gb_Executable__register_gengal $(call gb_Executable_add_runtime_dependencies,gengal,\ - $(foreach component, \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - fileaccess/source/fileacc \ - framework/util/fwk \ - i18npool/util/i18npool \ - package/source/xstor/xstor \ - package/util/package2 \ - sfx2/util/sfx \ - svx/util/svx \ - svx/util/svxcore \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unoxml/source/service/unoxml \ + $(foreach component,$(gb_Gallery__UNO_COMPONENTS) \ ,$(call gb_ComponentTarget_get_target_for_build,$(component))) \ $(call gb_AllLangResTarget_get_target,ofa) \ - $(call gb_Configuration_get_target,registry) \ - $(call gb_Configuration_get_target,fcfg_langpack) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ $(call gb_Library_get_target,vclplug_svp) \ )) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ + $(call gb_Package_get_target_for_build,postprocess_registry) \ $(call gb_Rdb_get_target_for_build,ure/services) \ $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \ $(call gb_UnoApi_get_target,offapi) \ diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk index 0c0e0253ca29..11599dfeb079 100644 --- a/chart2/CppunitTest_chart2_export.mk +++ b/chart2/CppunitTest_chart2_export.mk @@ -112,8 +112,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_export)) -$(eval $(call gb_CppunitTest_use_filter_configuration,chart2_export)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_export)) # vim: set noet sw=4 ts=4: diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk index a4033663e42d..0005363ce289 100644 --- a/chart2/CppunitTest_chart2_import.mk +++ b/chart2/CppunitTest_chart2_import.mk @@ -112,8 +112,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_import)) -$(eval $(call gb_CppunitTest_use_filter_configuration,chart2_import)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_import)) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk index 9d4173cc0410..06164f7c6ba7 100644 --- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk +++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk @@ -65,8 +65,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_firebird_test)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_firebird_test)) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 18d7db4fbfa7..cf7d983c577e 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -102,8 +102,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_macros_test)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_macros_test)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index 06e0ac6cccb3..25bc1c657f27 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_annotationobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annotationobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index f9f6a8c6478f..e9678126e752 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annonationshapeobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_annonationshapeobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annonationshapeobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annonationshapeobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index 9728c948bf68..d36fb5a3ba2b 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_annotationsobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annotationsobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationsobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index aecd1d7236bc..e27a7a51acaf 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\ $(eval $(call gb_CppunitTest_use_configuration,sc_cellrangesbase)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_cellrangesbase)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_cellrangesbase)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 6a6474704ea1..703ed0c351b7 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -109,8 +109,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_chart_regression_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_chart_regression_test)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_chart_regression_test)) $(eval $(call gb_CppunitTest_use_external,sc_chart_regression_test,libxml2)) diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index c867d93f481c..1022d943eaf4 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_databaserangeobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_databaserangeobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index e9e73d732c82..927f37d2c773 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilotfieldobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilotfieldobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 2f18dae54f00..79a106dd0efb 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilottableobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilottableobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 2a48401ca171..a1859970baa8 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\ $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_cell)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_cell)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_cell)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index dd5d052fa0f8..90160b1f23b5 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\ $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_header)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_header)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_header)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 82a6cf753833..58c3949dbe6d 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -116,6 +116,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index ace83ce3a182..516474e48699 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -112,8 +112,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_macros_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_macros_test)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_macros_test)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 65be2c5eac82..760842a9d73b 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_modelobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_modelobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_modelobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 337936b438a0..5af7ada215bd 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangeobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangeobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangeobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 92a160c249f6..c346ff99578a 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangesobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangesobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index 62043f03e9d1..8d661719117c 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_outlineobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_outlineobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_outlineobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 5618c0466ca9..45cef04a437c 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -125,8 +125,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_rangelst_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_rangelst_test)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_rangelst_test)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 1896bbd5ab3d..fc53cc7b5169 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -121,6 +121,4 @@ endif $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_export_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_export_test)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 4bc57c3b6eba..a5acabd791f8 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -121,6 +121,4 @@ endif $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index c5fff4edcf27..413c6c5fe6f5 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -102,8 +102,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\ $(eval $(call gb_CppunitTest_use_configuration,sc_tableautoformatfield)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tableautoformatfield)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tableautoformatfield)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 84bcd6051a41..06a8e6f48469 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tablesheetobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tablesheetobj)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 210651cd3cc4..dd6a8d81720a 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetsobj)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tablesheetsobj)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tablesheetsobj)) # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 23c9709a3c1b..55f62c197a37 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ $(eval $(call gb_CppunitTest_use_configuration,sd_filters_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sd_filters_test)) - $(call gb_CppunitTest_get_target,sd_filters_test) : $(call gb_AllLangResTarget_get_target,sd) # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk index 419269b51cdc..be5ec1abb61d 100644 --- a/sd/CppunitTest_sd_import_tests.mk +++ b/sd/CppunitTest_sd_import_tests.mk @@ -108,8 +108,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_import_tests)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sd_import_tests)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sd_import_tests)) $(eval $(call gb_CppunitTest_add_arguments,sd_import_tests,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index d205e0073a15..e281ffd6370c 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -283,8 +283,8 @@ endef # Use standard configuration. define gb_CppunitTest_use_configuration -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,registry) -$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry)) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,postprocess_registry) +$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTDIR)/$(LIBO_SHARE_FOLDER)/registry) endef @@ -293,20 +293,6 @@ $(call gb_CppunitTest_get_target,$(1)) : HEADLESS= endef -# Use configuration for filters. -# -# Okay, this is not exactly true, because there may be configuration -# for more things than just filters in spool, but it is good enough. -define gb_CppunitTest_use_filter_configuration -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,fcfg_langpack) -$(call gb_CppunitTest__use_configuration,$(1),module,$(gb_Configuration_registry)/spool) - -endef - -define gb_CppunitTest_use_extra_configuration -$$(call gb_Output_error,gb_CppunitTest_use_extra_configuration: use gb_CppunitTest_use_unittest_configuration instead.)) -endef - # Use configuration in $(OUTDIR)/unittest/registry. define gb_CppunitTest_use_unittest_configuration $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest) diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index e4201cffc734..12847e01c354 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -11,47 +11,17 @@ # Handles creation of image galleries. -gb_Gallery__UNO_COMPONENTS := \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - drawinglayer/drawinglayer \ - fileaccess/source/fileacc \ - framework/util/fwk \ - i18npool/util/i18npool \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sfx2/util/sfx \ - svgio/svgio \ - svx/util/svx \ - svx/util/svxcore \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unoxml/source/service/unoxml - -gb_Gallery__UNO_TYPES := \ - offapi \ - udkapi - gb_Gallery_TRANSLATE := $(SOLARENV)/bin/desktop-translate.pl - -# TODO: this should be in RepositoryExternal.mk, but it would lead to -# duplication. Fix. -gb_Gallery_EXTRA_DEPENCENCIES := \ - $(foreach component,$(gb_Gallery__UNO_COMPONENTS),$(call gb_ComponentTarget_get_target_for_build,$(component))) \ - $(foreach api,$(gb_Gallery__UNO_TYPES),$(call gb_UnoApi_get_target,$(api))) - gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery # BRAND_BASE_DIR is for resource files define gb_Gallery__make_env_args "-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/unittest/install)" \ -"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(gb_Configuration_registry)) \ - module:$(call gb_Helper_make_url,$(gb_Configuration_registry)/spool)" \ +"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(INSTDIR)/$(LIBO_SHARE_FOLDER)/registry)" \ "-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,ure/services)) \ $(foreach item,$(gb_Gallery__UNO_COMPONENTS),\ $(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \ -"-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\ +"-env:UNO_TYPES=$(foreach item,offapi udkapi,\ $(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \ -env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER)) @@ -96,8 +66,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_Gallery_get_target,%) : \ - $(call gb_Executable_get_runtime_dependencies,gengal) \ - $(gb_Gallery_EXTRA_DEPENCENCIES) + $(call gb_Executable_get_runtime_dependencies,gengal) $(call gb_Gallery__command,$@,$*) $(call gb_Gallery__get_final_target,%) : diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 2545b35d3c0a..0e2c044d4110 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -87,6 +87,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_filters_test)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk index 5041627c03e9..32134351faad 100644 --- a/sw/CppunitTest_sw_htmlexport.mk +++ b/sw/CppunitTest_sw_htmlexport.mk @@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_htmlexport)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_htmlexport)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_htmlexport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index c074f1db4593..1a52610cb441 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -99,8 +99,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\ $(eval $(call gb_CppunitTest_use_configuration,sw_layout_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_layout_test)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_layout_test)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index cf3c425318ff..49b8b53f4d55 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_macros_test)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_macros_test)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk index a484b9afcb4a..179f344f823a 100644 --- a/sw/CppunitTest_sw_odfexport.mk +++ b/sw/CppunitTest_sw_odfexport.mk @@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_odfexport)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_odfexport)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index 756f1810bcc4..1320fefac3d3 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_odfimport)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_odfimport)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfimport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk index 2e90beca897c..0158be6cd5cf 100644 --- a/sw/CppunitTest_sw_ooxmlexport.mk +++ b/sw/CppunitTest_sw_ooxmlexport.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ooxmlexport)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlexport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index 45cac9ec1d0e..583189368e56 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ooxmlimport)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlimport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk index e62647ca885c..7bc28b4c61d9 100644 --- a/sw/CppunitTest_sw_rtfexport.mk +++ b/sw/CppunitTest_sw_rtfexport.mk @@ -78,8 +78,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_rtfexport)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfexport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index be6613adf2ff..ba09f4b50498 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_rtfimport.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_rtfimport)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_rtfimport)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfimport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index 2b1a4751f20d..78ee4e3b6da4 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ww8export)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ww8export)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8export)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk index 1cb3425c5f2b..e45addc88063 100644 --- a/sw/CppunitTest_sw_ww8import.mk +++ b/sw/CppunitTest_sw_ww8import.mk @@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ww8import)) -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ww8import)) - $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8import)) # vim: set noet sw=4 ts=4: |