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 /RepositoryExternal.mk | |
| 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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 37 |
1 files changed, 20 insertions, 17 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) \ |