diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2012-09-10 20:31:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-20 18:46:11 +0000 |
| commit | 161f4ac95ae3df1daaede762862ea1c3ac4bb399 (patch) | |
| tree | 10a13b0c1347a0222493cced74c42c4bd383b6ff /solenv/gbuild/Configuration.mk | |
| parent | 42a2fb1c24750dde53b737d1fb45e2bb7286a3f2 (diff) | |
Use po file for merge 1. step
Make executables to waiting for po as input
Add some function to po files
Rewrite makefiles to use po files for merge
Change KeyId generator not to use xml special
charachters
One filetype remain: properties
Change-Id: If2bd2ae7afc61518c2d838a3cae301ef62dd9761
Reviewed-on: https://gerrit.libreoffice.org/593
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv/gbuild/Configuration.mk')
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 61254cea46bc..2ae4275ba753 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -38,7 +38,7 @@ # => XcuMergeTarget: merge # => buildtools (cfgex) # => Xcu data source -# => localize.sdf +# => *.po # => XcsTarget (schema) # Per-repo pattern rules for each repository do not work for all targets @@ -249,18 +249,24 @@ gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_C # PRJNAME is computed from the stem (parameter $(2)) define gb_XcuMergeTarget__command $(call gb_Output_announce,$(2),$(true),XCU,5) +POFILES=`$(gb_MKTEMP)` && \ +$(call gb_GetPoFiles,$(PO),$${POFILES}) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ -i $(call gb_Helper_symlinked_native,$(3)) \ -o $(1) \ - -m $(SDF) \ - -l all) + -m $${POFILES} \ + -l all) && \ +rm -rf $${POFILES} + endef $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET) - $(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@) + $(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\ + mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@,\ + $(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^))) $(call gb_XcuMergeTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,5) @@ -271,9 +277,8 @@ $(call gb_XcuMergeTarget_get_clean_target,%) : define gb_XcuMergeTarget_XcuMergeTarget $(call gb_XcuMergeTarget_get_target,$(1)) : \ $(call gb_Configuration__get_source,$(2),$(3)/$(4)) \ - $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) -$(call gb_XcuMergeTarget_get_target,$(1)) : \ - SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) + $(wildcard $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)) +$(call gb_XcuMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po endef |