[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk solenv/gbuild

Michael Stahl mstahl at redhat.com
Mon Nov 30 01:11:10 PST 2015 

 RepositoryExternal.mk    |   35 +++++++----------------------------
 solenv/gbuild/Gallery.mk |   14 --------------
 2 files changed, 7 insertions(+), 42 deletions(-)

New commits:
commit 628d84d9a82bd2759faf869d7a28233538094578
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 27 12:22:14 2015 +0100

    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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2a80542..2c00a33 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -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) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 2ce708d..d08fe69 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -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)" \
commit 4e6b4fbac4d3e1cbbb486aa26940f484a1cb65d1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 27 12:49:34 2015 +0100

    fix build tool dependencies on INSTROOT files
    
    These should generally be INSTROOT_FOR_BUILD instead; also gengal only
    had the URE's services.rdb (twice) but not the basis layer one.
    
    Change-Id: If9cab809296fd66c1785562c5e5be6b2569d179c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 994348f..2a80542 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3715,10 +3715,9 @@ endef
 define gb_Executable__register_climaker
 $(call gb_Executable_add_runtime_dependencies,climaker,\
 	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-	$(call gb_Rdb_get_target_for_build,ure/services) \
-	$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
+	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
 	$(call gb_UnoApi_get_target,udkapi) \
-	$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
+	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
 )
 endef
 
@@ -3746,6 +3745,7 @@ gb_Gallery__UNO_COMPONENTS := \
 	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) \
@@ -3756,8 +3756,8 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
 	$(call gb_Package_get_target_for_build,postprocess_registry) \
 	$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
 	$(call gb_Package_get_target_for_build,instsetoo_native_setup) \
-	$(call gb_Rdb_get_target_for_build,ure/services) \
-	$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
+	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
+	$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \
 	$(call gb_UnoApi_get_target,offapi) \
 	$(call gb_UnoApi_get_target,udkapi) \
 )
@@ -3796,8 +3796,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
 	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
 	$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
 	$(call gb_Rdb_get_target_for_build,saxparser) \
-	$(call gb_Rdb_get_target_for_build,ure/services) \
-	$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
+	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
 	$(call gb_UnoApi_get_target,udkapi) \
 )
 endef
@@ -3809,8 +3808,7 @@ endef
 define gb_Executable__register_uno
 $(call gb_Executable_add_runtime_dependencies,uno,\
 	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-	$(call gb_Rdb_get_target_for_build,ure/services) \
-	$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
+	$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
 	$(call gb_UnoApi_get_target,udkapi) \
 )
 endef

More information about the Libreoffice-commits mailing list