gbuild: do not zip Configuration output
Change-Id: I9779cf6069737fcf10a592e1f5c750d5710d22e1
This commit is contained in:
David Tardon
@@ -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,\
|
||||
|
||||
@@ -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))) \
|
||||
$(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_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 ) \
|
||||
) \
|
||||
$(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:
|
||||
|
||||
@@ -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)))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user