From ecc7820a93ca5a8f678d75e13c2e94b1115382e2 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 19:01:17 +0200 Subject: Use po for merge of readme.xrm And delete old dmake rule Change-Id: Ia0a18b79579337ceb40e8a440e028cf0c2867bf5 Reviewed-on: https://gerrit.libreoffice.org/738 Reviewed-by: Andras Timar Tested-by: Andras Timar --- readlicense_oo/CustomTarget_readme.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'readlicense_oo') diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk index 6c74fc6a1e70..2871631d06a8 100644 --- a/readlicense_oo/CustomTarget_readme.mk +++ b/readlicense_oo/CustomTarget_readme.mk @@ -36,16 +36,19 @@ readlicense_oo_README_XRM := $(readlicense_oo_DIR)/readme.xrm $(readlicense_oo_DIR)/readme.xrm : \ $(SRCDIR)/readlicense_oo/docs/readme.xrm \ $(readlicense_XRMEXTARGET) \ - $(gb_SDFLOCATION)/readlicense_oo/docs/localize.sdf \ + $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) \ | $(readlicense_oo_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1) $(call gb_Helper_abbreviate_dirs, \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) > $${MERGEINPUT} && \ $(readlicense_XRMEXCOMMAND) \ -p readlicense_oo \ -i $< \ -o $@ \ - -m $(gb_SDFLOCATION)/readlicense_oo/docs/localize.sdf \ - -l all) + -m $${MERGEINPUT} \ + -l all && \ + rm -rf $${MERGEINPUT}) endif -- cgit From 39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 15:19:10 +0200 Subject: translations is a source-only module Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4 --- readlicense_oo/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'readlicense_oo') diff --git a/readlicense_oo/prj/build.lst b/readlicense_oo/prj/build.lst index 7cfbc48b0a32..3f972d5be920 100644 --- a/readlicense_oo/prj/build.lst +++ b/readlicense_oo/prj/build.lst @@ -1,4 +1,4 @@ -ro readlicense_oo : TRANSLATIONS:translations DESKTOP:l10ntools solenv LIBXSLT:libxslt NULL +ro readlicense_oo : DESKTOP:l10ntools solenv LIBXSLT:libxslt NULL ro readlicense_oo usr1 - all ro_root NULL ro readlicense_oo\prj nmake - all ro_prj NULL -- cgit From 23ffae787b9b052748f7f3a6f67c4e2f8f2c9cbb Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Tue, 20 Nov 2012 00:21:57 +0100 Subject: Reardme.xrm move up one directory just as the po file belong to it Change-Id: Ia5deea8816cbb5fc29669d6aa8c3c81472b0ed3f --- readlicense_oo/CustomTarget_readme.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'readlicense_oo') diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk index 2871631d06a8..248e495e63da 100644 --- a/readlicense_oo/CustomTarget_readme.mk +++ b/readlicense_oo/CustomTarget_readme.mk @@ -41,7 +41,7 @@ $(readlicense_oo_DIR)/readme.xrm : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1) $(call gb_Helper_abbreviate_dirs, \ MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) > $${MERGEINPUT} && \ + echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) > $${MERGEINPUT} && \ $(readlicense_XRMEXCOMMAND) \ -p readlicense_oo \ -i $< \ -- cgit