[Libreoffice-commits] core.git: 5 commits - filter/Configuration_filter.mk postprocess/CustomTarget_registry.mk solenv/gbuild
David Tardon
dtardon at redhat.com
Thu Apr 18 06:21:43 PDT 2013
filter/Configuration_filter.mk | 54 +++++++++++---------
postprocess/CustomTarget_registry.mk | 92 ++++++++++-------------------------
solenv/gbuild/Configuration.mk | 80 ++++++++++++------------------
3 files changed, 90 insertions(+), 136 deletions(-)
New commits:
commit e6f2a892471fde61e2a2f71e1f9028ccedfe7888
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 17 16:04:44 2013 +0200
gbuild: do not zip Configuration output
Change-Id: I9779cf6069737fcf10a592e1f5c750d5710d22e1
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 53872f0..3f88b0e 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -55,7 +55,7 @@ $(call filter_XcuFilterTypesTarget_get_clean_target,%) :
rm -f $(call filter_XcuFilterTypesTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
-# $(call filter_Configuration__add_module,zipfile,module,prefix,xcufiles,target,cleantarget)
+# $(call filter_Configuration__add_module,configuration,module,prefix,xcufiles,target,cleantarget)
define filter_Configuration__add_module
$(call gb_Configuration_get_target,$(1)) : \
$(call gb_XcuModuleTarget_get_outdir_target,$(2))
@@ -69,7 +69,7 @@ $(call gb_Deliver_add_deliverable,\
$(call gb_XcuModuleTarget_get_outdir_target,$(2)),$(5),$(2))
endef
-# $(call filter_Configuration_add_types,zipfile,typesfile,prefix,xcufiles)
+# $(call filter_Configuration_add_types,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_types
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
$(call filter_XcuFilterTypesTarget_get_target,$(2)),\
@@ -103,7 +103,7 @@ $(call filter_XcuFilterFiltersTarget_get_clean_target,%) :
rm -f $(call filter_XcuFilterFiltersTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
-# $(call filter_Configuration_add_filters,zipfile,typesfile,prefix,xcufiles)
+# $(call filter_Configuration_add_filters,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_filters
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
$(call filter_XcuFilterFiltersTarget_get_target,$(2)),\
@@ -140,7 +140,7 @@ $(call filter_XcuFilterOthersTarget_get_clean_target,%) :
# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
-# $(call filter_Configuration_add_others,zipfile,typesfile,prefix,xcufiles)
+# $(call filter_Configuration_add_others,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_others
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
$(call filter_XcuFilterOthersTarget_get_target,$(2)),\
@@ -175,7 +175,7 @@ $(call filter_XcuFilterInternalTarget_get_clean_target,%) :
rm -f $(call filter_XcuFilterInternalTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
-# $(call filter_Configuration_add_internal_filters,zipfile,typesfile,prefix,xcufiles)
+# $(call filter_Configuration_add_internal_filters,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_internal_filters
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
$(call filter_XcuFilterInternalTarget_get_target,$(2)),\
@@ -185,7 +185,7 @@ endef
### filter configuration rules: l10n stuff: #########################
-# zip fcfg_langpack_$(lang).zip
+# Configuration fcfg_langpack
# => $(lang)/org/openoffice/TypeDetection/Filter.xcu
# xslt=> filter_ui.xcu
# merge=> *.xcu $(ALL_UI_FILTERS) [if WITH_LANG]
@@ -238,11 +238,18 @@ endef
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call filter_XcuResTarget__rule,$(lang))))
-$(foreach lang,$(gb_Configuration_LANGS),$(eval \
- $(call gb_Configuration_get_clean_target,fcfg_langpack) : \
- $(call gb_XcuResTarget_get_clean_target,fcfg_langpack/$(lang)/$(filter_XCU_filter))))
+define filter_Configuration_Configuration
+$(call gb_Configuration_Configuration,$(1))
-# $(call filter_Configuration_add_ui_filter,zipfile,prefix,xcufile)
+$(call gb_Configuration_get_target,$(1)) : \
+ $(foreach lang,$(gb_Configuration_LANGS),$(call filter_XcuResTarget_get_target,$(lang)))
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(foreach lang,$(gb_Configuration_LANGS),$(call filter_XcuResTarget_get_clean_target,$(lang)))
+
+endef
+
+
+# $(call filter_Configuration_add_ui_filter,configuration,prefix,xcufile)
define filter_Configuration_add_ui_filter
ifeq ($(WITH_LANG),)
$(filter_XcuFilterUiTarget) : \
@@ -256,7 +263,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuMergeTarget_get_clean_target,$(2)/$(3))
endef
-# $(call filter_Configuration_add_ui_filters,zipfile,prefix,xcufile)
+# $(call filter_Configuration_add_ui_filters,configuration,prefix,xcufile)
define filter_Configuration_add_ui_filters
$(foreach xcu,$(3),$(eval \
$(call filter_Configuration_add_ui_filter,$(1),$(2),$(xcu).xcu)))
@@ -265,10 +272,7 @@ endef
### the filter configuration ########################################
-$(eval $(call gb_Configuration_Configuration,fcfg_langpack))
-
-$(foreach lang,$(gb_Configuration_LANGS),$(eval \
- $(call gb_Zip_add_file,fcfg_langpack_$(lang),$(filter_XCU_filter))))
+$(eval $(call filter_Configuration_Configuration,fcfg_langpack))
# fcfg_base
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_base_types.xcu,filter/source/config/fragments/types,\
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 71a9689..b84859b 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -13,8 +13,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry))
# Variables
#
-postprocess_UNZIP := unzip $(if $(VERBOSE)$(verbose),,-q)
-
postprocess_XCS := registry/schema/org/openoffice
postprocess_XCU := registry/data/org/openoffice
postprocess_MOD := registry/spool
@@ -514,35 +512,23 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).xcd : \
$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list
$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list : \
- $(call gb_XcuModuleTarget_get_outdir_target,Langpack-$(1).xcu) \
- | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
+ $(call gb_XcuLangpackTarget_get_outdir_target,Langpack-$(1).xcu)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).xcd : \
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list : \
- $(call gb_Zip_get_target,fcfg_langpack_$(1)) \
- | $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).unzip/.dir
+ $(call gb_Configuration_get_target,fcfg_langpack)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).xcd : \
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list : \
- $(call gb_Zip_get_target,registry_$(1)) \
- $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)), \
- $(foreach driver,$(postprocess_DRIVERS),$(call gb_Zip_get_target,$(driver)_$(1))) \
- ) \
- $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)), \
- $(call gb_Zip_get_target,updchk_$(1)) \
- ) \
- | $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).unzip/.dir \
- $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)), \
- $(foreach driver,$(postprocess_DRIVERS), \
- $(call gb_CustomTarget_get_workdir,postprocess/registry)/$(driver)_$(1).unzip/.dir ) \
+ $(call gb_Configuration_get_target,registry) \
+ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
+ $(foreach driver,$(postprocess_DRIVERS),$(call gb_Configuration_get_target,$(driver))) \
) \
- $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)), \
- $(call gb_CustomTarget_get_workdir,postprocess/registry)/updchk_$(1).unzip/.dir \
- )
+ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),$(call gb_Configuration_get_target,updchk))
endef
$(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(lang))))
@@ -555,19 +541,19 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.xcd : \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --stringparam prefix $(call gb_XcuModuleTarget_get_outdir_target) -o $@ \
+ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ \
$(SOLARENV)/bin/packregistry.xslt $< \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- echo '<list><dependency file="main"/><filename>Langpack-$*.xcu</filename></list>' > $@
+ echo '<list><dependency file="main"/><filename>$(call gb_XcuLangpackTarget_get_outdir_target,Langpack-$*.xcu)</filename></list>' > $@
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.xcd : \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --stringparam prefix $(call gb_CustomTarget_get_workdir,postprocess/registry)/ \
+ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
)
@@ -577,64 +563,40 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.xcd : \
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
$(call gb_Helper_abbreviate_dirs, \
- cd $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$*.unzip \
- && rm -rf * \
- && $(postprocess_UNZIP) $< \
- && cd .. \
- && echo '<list>' > $@ \
- && ( find fcfg_langpack_$*.unzip -name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>\n') >> $@ \
- && echo '</list>' >> $@ \
+ echo '<list>' > $@ \
+ && ( find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) -name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \
+ && echo '</list>' >> $@ \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.xcd : \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --stringparam prefix $(call gb_CustomTarget_get_workdir,postprocess/registry)/ \
+ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- echo '<list>' > $@
- # Add registry_*.zip content to *.list:
- $(call gb_Helper_abbreviate_dirs, \
- cd $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$*.unzip \
- && rm -rf * \
- && $(postprocess_UNZIP) $(call gb_Zip_get_target,registry_$*) \
- && cd .. \
- && (find registry_$*.unzip -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>\n') >> $@ \
- )
-ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
- # Add fcfg_drivers_*.zip content to *.list:
- $(call gb_Helper_abbreviate_dirs, \
- true \
- $(foreach driver,$(postprocess_DRIVERS), \
- && cd $(call gb_CustomTarget_get_workdir,postprocess/registry)/$(driver)_$*.unzip \
- && rm -rf * \
- && $(postprocess_UNZIP) $(call gb_Zip_get_target,$(driver)_$*) \
- && cd .. \
- && (find $(driver)_$*.unzip -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>\n') >> $@ \
+ echo '<list>' > $@ \
+ && $(call gb_Helper_abbreviate_dirs, \
+ (find $(call gb_XcuResTarget_get_target,registry/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \
+ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
+ $(foreach driver,$(postprocess_DRIVERS), \
+ && (find $(call gb_XcuResTarget_get_target,$(driver)/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \
+ ) \
+ ) \
+ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+ && (find $(call gb_XcuResTarget_get_target,updchk/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \
+ ) \
) \
- )
-endif
-ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
- # Add updchk_*.zip content to *.list:
- $(call gb_Helper_abbreviate_dirs, \
- cd $(call gb_CustomTarget_get_workdir,postprocess/registry)/updchk_$*.unzip \
- && rm -rf * \
- && $(postprocess_UNZIP) $(call gb_Zip_get_target,updchk_$*) \
- && cd .. \
- && (find updchk_$*.unzip -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>\n') >> $@ \
- )
-endif
- echo '</list>' >> $@
+ && echo '</list>' >> $@
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --stringparam prefix $(OUTDIR)/xml/ \
+ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
)
@@ -642,6 +604,6 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
echo '<list>' $(foreach i,$(postprocess_DEPS_$*), '<dependency file="$i"/>') \
$(foreach i,$(postprocess_OPTDEPS_$*), '<dependency file="$i" optional="true"/>') \
- $(foreach i,$(postprocess_FILES_$*), '<filename>$i</filename>') '</list>' > $@
+ $(foreach i,$(postprocess_FILES_$*), '<filename>$(OUTDIR)/xml/$(i)</filename>') '</list>' > $@
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 5a169af..ca62c72 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -32,14 +32,13 @@
# => XcuLangpackTarget: langpack (per lang)
# => buildtools
# => Xcu data source
-# => zip (per lang)
-# => XcuResTarget: resources (per lang)
-# => buildtools
-# => XcuMergeTarget: merge
-# => buildtools (cfgex)
-# => Xcu data source
-# => *.po
-# => XcsTarget (schema)
+# => XcuResTarget: resources (per lang)
+# => buildtools
+# => XcuMergeTarget: merge
+# => buildtools (cfgex)
+# => Xcu data source
+# => *.po
+# => XcsTarget (schema)
# TODO: This is obsolete--we do not have multiple repos anymore. Drop
# the first arugment of gb_Configuration__get_source and clean up its
@@ -251,7 +250,7 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuMergeTarget_get_target,$*))
-# $(call gb_XcuMergeTarget_XcuMergeTarget,target,zipfile,prefix,xcufile)
+# $(call gb_XcuMergeTarget_XcuMergeTarget,target,configuration,prefix,xcufile)
define gb_XcuMergeTarget_XcuMergeTarget
$(call gb_XcuMergeTarget_get_target,$(1)) : \
$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
@@ -288,7 +287,7 @@ $(call gb_XcuResTarget_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuResTarget_get_target,$*))
-# $(call gb_XcuResTarget_XcuResTarget,target,zipfile,prefix,xcufile,lang)
+# $(call gb_XcuResTarget_XcuResTarget,target,configuration,prefix,xcufile,lang)
# this depends either on the source or on the merge target (if WITH_LANG)
define gb_XcuResTarget_XcuResTarget
ifeq ($(strip $(gb_WITH_LANG)),)
@@ -321,32 +320,18 @@ $(call gb_Configuration_get_preparation_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
-# TODO: ?
-define gb_Configuration_Configuration_nozip
-$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Configuration)
-endef
-
-# $(call gb_Configuration_Configuration,zipfile,repo,nodeliver)
+# $(call gb_Configuration_Configuration,configuration,repo,nodeliver)
# cannot use target local variable for REPO because it's needed in prereq
# last parameter may be used to turn off delivering of files
define gb_Configuration_Configuration
$(eval gb_Configuration_NODELIVER_$(1) := $(2))
-$(foreach lang,$(gb_Configuration_LANGS),$(eval \
- $(call gb_Zip_Zip_internal,$(1)_$(lang),$(call gb_XcuResTarget_get_target,$(1)/$(lang)))))
-$(foreach lang,$(gb_Configuration_LANGS),$(eval \
- $(call gb_Configuration_get_target,$(1)) : \
- $(call gb_Zip_get_final_target,$(1)_$(lang))))
-$(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))))
$(call gb_Helper_make_userfriendly_targets,$(1),Configuration)
endef
-# $(call gb_Configuration_add_schema,zipfile,prefix,xcsfile)
+# $(call gb_Configuration_add_schema,configuration,prefix,xcsfile)
# FIXME this is always delivered because commands depend on it...
# hopefully extensions do not need to add schemas with same name as officecfg
define gb_Configuration_add_schema
@@ -368,13 +353,13 @@ $(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\
endef
-#$(call gb_Configuration_add_schemas,zipfile,prefix,xcsfiles)
+#$(call gb_Configuration_add_schemas,configuration,prefix,xcsfiles)
define gb_Configuration_add_schemas
$(foreach xcs,$(3),$(call gb_Configuration_add_schema,$(1),$(2),$(xcs)))
endef
-# $(call gb_Configuration_add_data,zipfile,prefix,xcufile)
+# $(call gb_Configuration_add_data,configuration,prefix,xcufile)
define gb_Configuration_add_data
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuDataTarget_get_clean_target,$(2)/$(3))
@@ -402,13 +387,13 @@ endif
endef
-#$(call gb_Configuration_add_datas,zipfile,prefix,xcufiles)
+#$(call gb_Configuration_add_datas,configuration,prefix,xcufiles)
define gb_Configuration_add_datas
$(foreach xcu,$(3),$(call gb_Configuration_add_data,$(1),$(2),$(xcu)))
endef
-# $(call gb_Configuration_add_spool_module,zipfile,prefix,xcufile)
+# $(call gb_Configuration_add_spool_module,configuration,prefix,xcufile)
define gb_Configuration_add_spool_module
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3))
@@ -435,7 +420,7 @@ endif
endef
-# $(call gb_Configuration_add_spool_modules,zipfile,prefix,xcufiles)
+# $(call gb_Configuration_add_spool_modules,configuration,prefix,xcufiles)
define gb_Configuration_add_spool_modules
$(foreach xcu,$(3),$(call gb_Configuration_add_spool_module,$(1),$(2),$(xcu)))
@@ -462,14 +447,14 @@ $(call gb_Deliver_add_deliverable,\
endef
-# $(call gb_Configuration_add_spool_langpack,zipfile,prefix,xcufile)
+# $(call gb_Configuration_add_spool_langpack,configuration,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)
+# $(call gb_Configuration_add_localized_data,configuration,prefix,xcufile)
define gb_Configuration_add_localized_data
$(eval $(call gb_Configuration_add_data,$(1),$(2),$(3)))
ifneq ($(strip $(gb_WITH_LANG)),)
@@ -480,14 +465,15 @@ endif
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_XcuResTarget_XcuResTarget,$(1)/$(lang)/$(3),$(1),$(2),$(3),$(lang))))
$(foreach lang,$(gb_Configuration_LANGS),$(eval \
- $(call gb_Zip_add_file,$(1)_$(lang),$(3))))
+ $(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcuResTarget_get_target,$(1)/$(lang)/$(3))))
$(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)
+# $(call gb_Configuration_add_localized_datas,configuration,prefix,xcufile)
define gb_Configuration_add_localized_datas
$(foreach xcu,$(3),$(call gb_Configuration_add_localized_data,$(1),$(2),$(xcu)))
commit 0cf5b45ed55519a8406efd2445d0ff0b9b6a791c
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 18 14:18:02 2013 +0200
gbuild: use different announce strings for filter stuff
Change-Id: I7844c245e79c102a0a495a4ffe06b3541954c5df
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index f590c0d..53872f0 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -36,7 +36,7 @@ filter_XcuFilterTypesTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterTypesTarget/$(1)
$(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
- $(call gb_Output_announce,$*,$(true),XCU,1)
+ $(call gb_Output_announce,$*,$(true),FIT,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
RESPONSEFILE=`$(gb_MKTEMP)` && \
@@ -50,7 +50,7 @@ $(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
$(call filter_XcuFilterTypesTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,1)
+ $(call gb_Output_announce,$*,$(false),FIT,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call filter_XcuFilterTypesTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
@@ -84,7 +84,7 @@ filter_XcuFilterFiltersTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterFiltersTarget/$(1)
$(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
- $(call gb_Output_announce,$*,$(true),XCU,1)
+ $(call gb_Output_announce,$*,$(true),FIF,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
RESPONSEFILE=`$(gb_MKTEMP)` && \
@@ -98,7 +98,7 @@ $(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
$(call filter_XcuFilterFiltersTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,1)
+ $(call gb_Output_announce,$*,$(false),FIF,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call filter_XcuFilterFiltersTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
@@ -117,7 +117,7 @@ filter_XcuFilterOthersTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterOthersTarget/$(1)
$(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
- $(call gb_Output_announce,$*,$(true),XCU,1)
+ $(call gb_Output_announce,$*,$(true),FIO,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
RESPONSEFILE=`$(gb_MKTEMP)` && \
@@ -133,7 +133,7 @@ $(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
rm -f $${RESPONSEFILE} $${RESPONSEFILE2})
$(call filter_XcuFilterOthersTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,1)
+ $(call gb_Output_announce,$*,$(false),FIO,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call filter_XcuFilterOthersTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
@@ -155,7 +155,7 @@ filter_XcuFilterInternalTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterInternalTarget/$(1)
$(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
- $(call gb_Output_announce,$*,$(true),XCU,1)
+ $(call gb_Output_announce,$*,$(true),FII,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
RESPONSEFILE=`$(gb_MKTEMP)` && \
@@ -170,7 +170,7 @@ $(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
$(call filter_XcuFilterInternalTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,1)
+ $(call gb_Output_announce,$*,$(false),FII,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call filter_XcuFilterInternalTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
@@ -201,7 +201,7 @@ filter_XcuResTarget_get_target = \
$(call gb_XcuResTarget_get_target,fcfg_langpack/$(1)/$(filter_XCU_filter))
$(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCU,1)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FIU,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
RESPONSEFILE=`$(gb_MKTEMP)` && \
@@ -213,7 +213,7 @@ $(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET)
&& rm -f $${RESPONSEFILE})
$(filter_XcuFilterUiCleanTarget) :
- $(call gb_Output_announce,$(filter_XcuFilterUiTarget),$(false),XCU,1)
+ $(call gb_Output_announce,$(filter_XcuFilterUiTarget),$(false),FIU,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(filter_XcuFilterUiTarget))
commit 8531b8d015b1675d7af839728b121c500261d8fd
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 17 11:03:33 2013 +0200
gbuild: use different announce strings for xcu stuff
Change-Id: I650c810c4034019fc8928a07b11dd9d1f949a927
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 578e809..5a169af 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -167,7 +167,7 @@ $(call gb_XcsTarget_get_outdir_target,$(basename $(subst -,.,$(basename $(1)))).
endef
define gb_XcuModuleTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,3)
+$(call gb_Output_announce,$(2),$(true),XCM,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \
@@ -184,7 +184,7 @@ $(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \
$(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^))
$(call gb_XcuModuleTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,3)
+ $(call gb_Output_announce,$*,$(false),XCM,3)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuModuleTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
@@ -202,7 +202,7 @@ gb_XcuLangpackTarget__get_target_with_lang = \
gb_XcuLangpackTarget_SED_delcomment := $(OUTDIR)/xml/processing/delcomment.sed
define gb_XcuLangpackTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,4)
+$(call gb_Output_announce,$(2),$(true),XCL,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
sed -e "s/__LANGUAGE__/$(LANG)/" -f $(gb_XcuLangpackTarget_SED_delcomment)\
@@ -214,7 +214,7 @@ $(call gb_XcuLangpackTarget_get_target,%) : \
$(call gb_XcuLangpackTarget__command,$@,$*,$(filter %.tmpl,$^))
$(call gb_XcuLangpackTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,4)
+ $(call gb_Output_announce,$*,$(false),XCL,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(foreach lang,$(gb_Configuration_LANGS),\
$(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
@@ -227,7 +227,7 @@ gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfg
gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
define gb_XcuMergeTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,5)
+$(call gb_Output_announce,$(2),$(true),XCX,1)
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(POFILES) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\
@@ -247,7 +247,7 @@ $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXDEPS)
mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
$(call gb_XcuMergeTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,5)
+ $(call gb_Output_announce,$*,$(false),XCX,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuMergeTarget_get_target,$*))
@@ -266,7 +266,7 @@ endef
# locale is extracted from the stem (parameter $(2))
define gb_XcuResTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,6)
+$(call gb_Output_announce,$(2),$(true),XCR,2)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \
@@ -284,7 +284,7 @@ $(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \
$(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
$(call gb_XcuResTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),XCU,6)
+ $(call gb_Output_announce,$*,$(false),XCR,2)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuResTarget_get_target,$*))
@@ -308,12 +308,12 @@ endef
# Configuration class
$(call gb_Configuration_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),CFG,1)
+ $(call gb_Output_announce,$*,$(false),CFG,4)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Configuration_get_target,$*) $(call gb_Configuration_get_preparation_target,$*))
$(call gb_Configuration_get_target,%) :
- $(call gb_Output_announce,$*,$(true),CFG,1)
+ $(call gb_Output_announce,$*,$(true),CFG,4)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
commit 200f3df4e27f37ee7ef88745c359f3abc4cadbf9
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 17 09:45:05 2013 +0200
drop obsolete comment
Change-Id: I85d86244800f596faa52f89219a9cd4340daf600
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index fba1040..578e809 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -226,7 +226,6 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) :
gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfgex)
gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
-# PRJNAME is computed from the stem (parameter $(2))
define gb_XcuMergeTarget__command
$(call gb_Output_announce,$(2),$(true),XCU,5)
MERGEINPUT=`$(gb_MKTEMP)` && \
commit 203a59df05796d836cd5dc1495ab921c53556627
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 17 09:44:50 2013 +0200
add todo
Change-Id: Ia4c2e1a7ab479b6bd4ea66ed294567d624dcf694
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 11b5f07..fba1040 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -41,6 +41,9 @@
# => *.po
# => XcsTarget (schema)
+# TODO: This is obsolete--we do not have multiple repos anymore. Drop
+# the first arugment of gb_Configuration__get_source and clean up its
+# uses. Or just replace it by $(SRCDIR)/... .
# Per-repo pattern rules for each repository do not work for all targets
# because the prerequisites of some targets need to have the stem mangled
# and this does not seem to be possible in GNU make because when the stem is
More information about the Libreoffice-commits
mailing list