diff options
| -rw-r--r-- | translations/CustomTarget_translate.mk (renamed from translations/translate/Makefile) | 52 | ||||
| -rw-r--r-- | translations/Module_translations.mk | 2 | ||||
| -rw-r--r-- | translations/Package_translate.mk | 36 |
3 files changed, 30 insertions, 60 deletions
diff --git a/translations/translate/Makefile b/translations/CustomTarget_translate.mk index d04ae515439..d5cc543d200 100644 --- a/translations/translate/Makefile +++ b/translations/CustomTarget_translate.mk @@ -25,51 +25,57 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -gb_PARTIALBUILD:=T -include $(GBUILDDIR)/gbuild_simple.mk +$(eval $(call gb_CustomTarget_CustomTarget,translations/translate,new_style)) -all: merge.done +TRTR := $(call gb_CustomTarget_get_workdir,translations/translate) + +$(call gb_CustomTarget_get_target,translations/translate) : $(TRTR)/merge.done -all_languages := $(shell cd $(SRCDIR)/translations/source && ls -1) ifeq ($(WITH_LANG),ALL) -my_languages := $(all_languages) +tr_langs := $(shell cd $(SRCDIR)/translations/source && ls -1) else -my_languages := $(filter-out en-US,$(WITH_LANG)) +tr_langs := $(filter-out en-US,$(WITH_LANG)) endif #TODO: remove localization_present.mk when translations are in tail_build -merge.done: $(foreach lang,$(my_languages),sdf-l10n/$(lang).sdf) sdf-l10n/qtz.sdf +$(TRTR)/merge.done : $(foreach lang,$(tr_langs),$(TRTR)/sdf-l10n/$(lang).sdf) \ + $(TRTR)/sdf-l10n/qtz.sdf + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MRG,2) $(call gb_Helper_abbreviate_dirs_native, \ - rm -rf sdf && mkdir sdf && \ - perl $(OUTDIR_FOR_BUILD)/bin/fast_merge.pl -sdf_files \ - $(call var2file,$(shell $(gb_MKTEMP)),100,$^) -merge_dir sdf && \ + rm -rf $(TRTR)/sdf && mkdir $(TRTR)/sdf && \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$^) && \ + perl $(OUTDIR_FOR_BUILD)/bin/fast_merge.pl -sdf_files $${RESPONSEFILE} \ + -merge_dir $(TRTR)/sdf \ + $(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \ + rm -f $${RESPONSEFILE} && \ cp -f $(SRCDIR)/translations/localization_present.mk \ - $(WORKDIR)/CustomTarget/translations/localization_present.mk && \ + $(WORKDIR)/CustomTarget/translations/localization_present.mk && \ touch $@) define lang_rule -sdf-l10n/$(1).sdf: sdf-template/en-US.sdf $(OUTDIR_FOR_BUILD)/bin/po2lo \ - $(shell find $(SRCDIR)/translations/source/$(1) -name "*\.po") | sdf-l10n +$(TRTR)/sdf-l10n/$(1).sdf : $(TRTR)/sdf-template/en-US.sdf $(OUTDIR_FOR_BUILD)/bin/po2lo \ + $$(shell find $(SRCDIR)/translations/source/$(1) -name "*\.po") | $(TRTR)/sdf-l10n/.dir + $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SDF,1) $$(call gb_Helper_abbreviate_dirs_native, \ $(gb_PYTHON) $(OUTDIR_FOR_BUILD)/bin/po2lo --skipsource -i \ $(SRCDIR)/translations/source/$(1) -t $$< -o $$@ -l $(1)) endef -$(foreach lang,$(my_languages),$(eval $(call lang_rule,$(lang)))) +$(foreach lang,$(tr_langs),$(eval $(call lang_rule,$(lang)))) -sdf-l10n/qtz.sdf: sdf-template/en-US.sdf $(OUTDIR_FOR_BUILD)/bin/keyidGen.pl | sdf-l10n +$(TRTR)/sdf-l10n/qtz.sdf : $(TRTR)/sdf-template/en-US.sdf \ + $(OUTDIR_FOR_BUILD)/bin/keyidGen.pl | $(TRTR)/sdf-l10n/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SDF,1) $(call gb_Helper_abbreviate_dirs_native, \ - perl $(OUTDIR_FOR_BUILD)/bin/keyidGen.pl $< $@) - -sdf-l10n: - mkdir $@ + perl $(OUTDIR_FOR_BUILD)/bin/keyidGen.pl $< $@ \ + $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -sdf-template/en-US.sdf: \ - $(foreach file,cfgex helpex localize propex transex3 ulfex xrmex, \ - $(OUTDIR_FOR_BUILD)/bin/$(file)) +$(TRTR)/sdf-template/en-US.sdf : $(OUTDIR_FOR_BUILD)/bin/propex \ + $(foreach exec,cfgex helpex localize transex3 ulfex xrmex, \ + $(call gb_Executable_get_target_for_build,$(exec))) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LOC,1) $(call gb_Helper_abbreviate_dirs_native, \ mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) $(SRCDIR) $@) -.DEFAULT_GOAL := all # vim: set noet sw=4 ts=4: diff --git a/translations/Module_translations.mk b/translations/Module_translations.mk index 1436c9fab2b..df8c8398de2 100644 --- a/translations/Module_translations.mk +++ b/translations/Module_translations.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,translations)) ifneq (,$(filter-out en-US,$(WITH_LANG))) $(eval $(call gb_Module_add_targets,translations,\ - Package_translate \ + CustomTarget_translate \ )) endif diff --git a/translations/Package_translate.mk b/translations/Package_translate.mk deleted file mode 100644 index 0804f52be50..00000000000 --- a/translations/Package_translate.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,translations_translations,$(WORKDIR)/CustomTarget/translations)) - -$(eval $(call gb_Package_add_customtarget,translations_translations,translations/translate)) - -$(eval $(call gb_CustomTarget_add_outdir_dependencies,translations/translate,\ - $(gb_Helper_PHONY) \ -)) - -# vim: set noet sw=4 ts=4: |