diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-27 09:41:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 10:54:14 +0000 |
| commit | e1b51e7beb7f9cfa7b574b9c2a69799e62963a09 (patch) | |
| tree | 70e4cc24b42b10bba4d42ffa90f19f3ada6ae1bb /solenv | |
| parent | e8c8f02ffd6988ea72141992b1f26f9c5d918af5 (diff) | |
gbuild: use .xcd configuration files from instdir
..instead of .xcu files in solver/*/xml/registry
when running unittests and gengal.
Change-Id: I390a6c531d653acca7ef3379c49fe65fcb8f3c2a
Reviewed-on: https://gerrit.libreoffice.org/6057
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 18 | ||||
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 37 |
2 files changed, 5 insertions, 50 deletions
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,%) : |