Kaydet (Commit) 628d84d9 authored tarafından Michael Stahl's avatar Michael Stahl

gbuild: remove gb_Gallery__UNO_COMPONENTS and gb_Gallery__make_env_args

These are presumably a relic from pre-INSTDIR days: gengal should find
all this stuff via redirect.rc, fundamental.rc and services.rdb.

The UNO services should be found via services.rdb too after the
dependency was added in the previous commit.

Change-Id: I3d452acc7c4b05f254bef936c4f18a2ea8615cf8
üst 4e6b4fba
......@@ -3727,29 +3727,10 @@ $(call gb_Executable_add_runtime_dependencies,cppumaker,\
)
endef
gb_Gallery__UNO_COMPONENTS := \
comphelper/util/comphelp \
configmgr/source/configmgr \
drawinglayer/drawinglayer \
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.
# FIXME: the library target should be for build too
define gb_Executable__register_gengal
$(call gb_Executable_add_runtime_dependencies,gengal,\
$(foreach component,$(gb_Gallery__UNO_COMPONENTS) \
,$(call gb_ComponentTarget_get_target_for_build,$(component))) \
$(call gb_AllLangResTarget_get_target,ofa) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,postprocess_images) \
......
......@@ -14,19 +14,6 @@
gb_Gallery_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl
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,$(INSTROOT_FOR_BUILD))" \
"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(INSTROOT)/$(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,offapi udkapi,\
$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
-env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD)) \
-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD))
endef
define gb_Gallery__command
$(call gb_Output_announce,$(2),$(true),GAL,1)
$(call gb_Helper_abbreviate_dirs,\
......@@ -37,7 +24,6 @@ $(call gb_Helper_abbreviate_dirs,\
SAL_USE_VCLPLUGIN=svp \
)) \
$(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
--destdir $(GALLERY_BASEDIR) \
--name "$(GALLERY_NAME)" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment