[Libreoffice-commits] .: 5 commits - officecfg/Configuration_officecfg.mk solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Thu Sep 8 22:48:11 PDT 2011
officecfg/Configuration_officecfg.mk | 20 ++++++++++----------
solenv/gbuild/AllLangResTarget.mk | 7 ++++++-
solenv/gbuild/Configuration.mk | 21 +++++++++++++++------
solenv/gbuild/CppunitTest.mk | 8 ++++++--
solenv/gbuild/LinkTarget.mk | 3 ++-
solenv/gbuild/RdbTarget.mk | 9 +++++++--
6 files changed, 46 insertions(+), 22 deletions(-)
New commits:
commit b1aa69af4e1e78433e376e654a7f908775c4b733
Author: David Tardon <dtardon at redhat.com>
Date: Fri Sep 9 07:29:36 2011 +0200
avoid the need for calling eval here
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index bdd03cc..220b260 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -134,20 +134,24 @@ endef
define gb_CppunitTest_add_type_rdb
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,$(2))
$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(2)
+
endef
define gb_CppunitTest_add_type_rdbs
-$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_type_rdb,$(1),$(rdb))))
+$(foreach rdb,$(2),$(call gb_CppunitTest_add_type_rdb,$(1),$(rdb)))
+
endef
define gb_CppunitTest_add_service_rdb
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_RdbTarget_get_target,$(2))
$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_RdbTarget_get_clean_target,$(2))
$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(2)
+
endef
define gb_CppunitTest_add_service_rdbs
-$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_service_rdb,$(1),$(rdb))))
+$(foreach rdb,$(2),$(call gb_CppunitTest_add_service_rdb,$(1),$(rdb)))
+
endef
define gb_CppunitTest__forward_to_Linktarget
commit 1da34ade443dddde48812023f778179b8ed7707e
Author: David Tardon <dtardon at redhat.com>
Date: Fri Sep 9 07:27:51 2011 +0200
avoid the need for calling eval here
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 27b63bc..c760426 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -142,6 +142,7 @@ ifneq ($(strip $(WITH_LANG)),)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF)
endif
+
endef
# SrsTemplateTarget class
@@ -168,6 +169,7 @@ $(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS :=
$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS :=
$(call gb_SrsTemplateTarget_get_target,$(1)) : $(call gb_SrsTemplateTarget__get_target,$(1))
$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
+
endef
.PHONY : $(call gb_SrsTemplateTarget_get_target,%_last)
@@ -196,6 +198,7 @@ $(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS += $(2)
$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplatePartTarget_get_target,$(2))
$(call gb_SrsTemplatePartTarget_get_target,$(2)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
$(call gb_SrsPartMergeTarget_get_target,$(2)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
+
endef
# SrsTarget class
@@ -286,10 +289,12 @@ endef
define gb_SrsTarget_add_template
$(call gb_SrsTemplateTarget_add_file,$(1),$(2))
+
endef
define gb_SrsTarget_add_templates
-$(foreach template,$(2),$(eval $(call gb_SrsTarget_add_template,$(1),$(template))))
+$(foreach template,$(2),$(call gb_SrsTarget_add_template,$(1),$(template)))
+
endef
commit 63850a7f28f31b8e6792478aa7ba170f489196a4
Author: David Tardon <dtardon at redhat.com>
Date: Fri Sep 9 07:24:40 2011 +0200
make use of Configuration consistent with other gbuild classes
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 0b0470d..64a10c7 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Configuration_Configuration,registry,SRCDIR))
-$(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
+$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/LDAP.xcs \
org/openoffice/Inet.xcs \
org/openoffice/Setup.xcs \
@@ -118,9 +118,9 @@ $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/ucb/Hierarchy.xcs \
org/openoffice/ucb/InteractionHandler.xcs \
org/openoffice/ucb/Store.xcs \
-)
+))
-$(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Inet.xcu \
org/openoffice/System.xcu \
org/openoffice/UserProfile.xcu \
@@ -148,9 +148,9 @@ $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/UI/Factories.xcu \
org/openoffice/TypeDetection/UISort.xcu \
org/openoffice/ucb/Configuration.xcu \
-)
+))
-$(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
org/openoffice/Inet-macosx.xcu \
org/openoffice/Inet-unixdesktop.xcu \
org/openoffice/Inet-wnt.xcu \
@@ -209,14 +209,14 @@ $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
org/openoffice/TypeDetection/UISort-impress.xcu \
org/openoffice/TypeDetection/UISort-math.xcu \
org/openoffice/ucb/Configuration-gio.xcu \
-)
+))
# perhaps this file should be moved 2 levels up?
-$(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
+$(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
Langpack.xcu \
-)
+))
-$(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
org/openoffice/Setup.xcu \
org/openoffice/Office/Accelerators.xcu \
org/openoffice/Office/Common.xcu \
@@ -259,5 +259,5 @@ $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
org/openoffice/Office/UI/WriterWebWindowState.xcu \
org/openoffice/Office/UI/WriterCommands.xcu \
org/openoffice/Office/UI/GenericCategories.xcu \
-)
+))
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 6e8e007..b444167 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -327,6 +327,7 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_Zip_get_clean_target,$(1)_$(lang))))
$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
+
endef
# $(call gb_Configuration_add_schema,zipfile,prefix,xcsfile)
@@ -343,11 +344,13 @@ $(call gb_XcsTarget_get_outdir_target,$(3)) : \
$(call gb_XcsTarget_get_target,$(2)/$(3))
$(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\
$(call gb_XcsTarget_get_target,$(2)/$(3)),$(2)/$(3))
+
endef
#$(call gb_Configuration_add_schemas,zipfile,prefix,xcsfiles)
define gb_Configuration_add_schemas
-$(foreach xcs,$(3),$(eval $(call gb_Configuration_add_schema,$(1),$(2),$(xcs))))
+$(foreach xcs,$(3),$(call gb_Configuration_add_schema,$(1),$(2),$(xcs)))
+
endef
# $(call gb_Configuration_add_data,zipfile,prefix,xcufile)
@@ -367,11 +370,13 @@ $(call gb_Deliver_add_deliverable,\
$(call gb_XcuDataTarget_get_outdir_target,$(3)),\
$(call gb_XcuDataTarget_get_target,$(2)/$(3)),\
$(2)/$(3))
+
endef
#$(call gb_Configuration_add_schemas,zipfile,prefix,xcufiles)
define gb_Configuration_add_datas
-$(foreach xcu,$(3),$(eval $(call gb_Configuration_add_data,$(1),$(2),$(xcu))))
+$(foreach xcu,$(3),$(call gb_Configuration_add_data,$(1),$(2),$(xcu)))
+
endef
# $(call gb_Configuration_add_spool_module,zipfile,prefix,xcufile)
@@ -390,12 +395,13 @@ $(call gb_Deliver_add_deliverable,\
$(call gb_XcuModuleTarget_get_outdir_target,$(3)),\
$(call gb_XcuModuleTarget_get_target,$(2)/$(3)),\
$(2)/$(3))
+
endef
# $(call gb_Configuration_add_spool_modules,zipfile,prefix,xcufiles)
define gb_Configuration_add_spool_modules
-$(foreach xcu,$(3),$(eval \
- $(call gb_Configuration_add_spool_module,$(1),$(2),$(xcu))))
+$(foreach xcu,$(3),$(call gb_Configuration_add_spool_module,$(1),$(2),$(xcu)))
+
endef
define gb_Configuration__add_langpack
@@ -413,12 +419,14 @@ $(call gb_Deliver_add_deliverable,\
$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)),\
$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)),\
$(call gb_XcuLangpackTarget__get_name_with_lang,$(2)/$(3),$(4)))
+
endef
# $(call gb_Configuration_add_spool_langpack,zipfile,prefix,xcufile)
define gb_Configuration_add_spool_langpack
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_Configuration__add_langpack,$(1),$(2),$(strip $(3)),$(lang))))
+
endef
# $(call gb_Configuration_add_localized_data,zipfile,prefix,xcufile)
@@ -436,12 +444,13 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuResTarget_get_clean_target,$(1)/$(lang)/$(3))))
+
endef
# $(call gb_Configuration_add_localized_datas,zipfile,prefix,xcufile)
define gb_Configuration_add_localized_datas
-$(foreach xcu,$(3),$(eval \
- $(call gb_Configuration_add_localized_data,$(1),$(2),$(xcu))))
+$(foreach xcu,$(3),$(call gb_Configuration_add_localized_data,$(1),$(2),$(xcu)))
+
endef
# vim: set noet sw=4 ts=4:
commit efac5b9f4c34e00407abea959587b9ee9e69cfa7
Author: David Tardon <dtardon at redhat.com>
Date: Fri Sep 9 07:18:39 2011 +0200
avoid the need for calling eval here
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 904ebcf..0cdcebf 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -59,26 +59,31 @@ ifeq ($(2),$(true))
$(call gb_RdbTarget_get_outdir_target,$(1)) : $(call gb_RdbTarget_get_target,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_RdbTarget_get_target,$(1)))
endif
+
endef
define gb_RdbTarget_add_component
$(call gb_RdbTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS += $(2)
$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS += $(2)
+
endef
define gb_RdbTarget_add_components
-$(foreach component,$(2),$(eval $(call gb_RdbTarget_add_component,$(1),$(component))))
+$(foreach component,$(2),$(call gb_RdbTarget_add_component,$(1),$(component)))
+
endef
define gb_RdbTarget_add_old_component
$(call gb_RdbTarget_get_target,$(1)) : $(call gb_RdbTarget__get_old_component_target,$(2))
$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS += $(2)
$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS += $(2)
+
endef
define gb_RdbTarget_add_old_components
-$(foreach component,$(2),$(eval $(call gb_RdbTarget_add_old_component,$(1),$(component))))
+$(foreach component,$(2),$(call gb_RdbTarget_add_old_component,$(1),$(component)))
+
endef
# vim: set noet sw=4:
commit 490268276558ffd921422fa3f0b9dd0d8c6dc537
Author: David Tardon <dtardon at redhat.com>
Date: Fri Sep 9 07:12:45 2011 +0200
the eval is actually not needed here
Better to say, it is not needed if we make sure that the result of the
call of gb_LinkTarget_use_external always ends by a newline.
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index a3ff269..ba403ea 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1072,11 +1072,12 @@ define gb_LinkTarget_use_external
$(if $(value gb_LinkTarget__use_$(2)),\
$(call gb_LinkTarget__use_$(2),$(1)),\
$(error gb_LinkTarget_use_external: unknown external: $(2)))
+
endef
# $(call gb_LinkTarget_use_externals,library,externals)
gb_LinkTarget_use_externals = \
- $(foreach external,$(2),$(eval $(call gb_LinkTarget_use_external,$(1),$(external))))
+ $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
# vim: set noet sw=4:
More information about the Libreoffice-commits
mailing list