You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/10/06 22:56:47 UTC
svn commit: r1529686 - in /openoffice/branches/l10n40/main:
helpcontent2/prj/build.lst helpcontent2/source/text/simpress/makefile.mk
l10ntools/source/gConXhpWrap.cxx solenv/inc/tg_help.mk
Author: jani
Date: Sun Oct 6 20:56:47 2013
New Revision: 1529686
URL: http://svn.apache.org/r1529686
Log:
genLang merge integrated in helpcontent2. All files are generated, but there are postprocess problems.
Modified:
openoffice/branches/l10n40/main/helpcontent2/prj/build.lst
openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk
openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
openoffice/branches/l10n40/main/solenv/inc/tg_help.mk
Modified: openoffice/branches/l10n40/main/helpcontent2/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/prj/build.lst?rev=1529686&r1=1529685&r2=1529686&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/prj/build.lst (original)
+++ openoffice/branches/l10n40/main/helpcontent2/prj/build.lst Sun Oct 6 20:56:47 2013
@@ -8,7 +8,7 @@ h2 helpcontent2\source\text\sdraw
h2 helpcontent2\source\text\shared nmake - all hp2_shar hp2_aux NULL
h2 helpcontent2\source\text\simpress nmake - all hp2_simp hp2_aux NULL
h2 helpcontent2\source\text\smath nmake - all hp2_smat hp2_aux NULL
-h2 helpcontent2\source\text\swrite nmake - all hp2_swri hp2_aux NULL
+h2 helpcontent2\source\text\swriter nmake - all hp2_swri hp2_aux NULL
h2 helpcontent2\util\sbasic nmake - all hp2_ut_sbas hp2_aux hp2_sbas hp2_scal hp2_scha hp2_sdra hp2_shar hp2_simp hp2_smat hp2_swri NULL
h2 helpcontent2\util\schart nmake - all hp2_ut_scha hp2_ut_sbas NULL
h2 helpcontent2\util\scalc nmake - all hp2_ut_scal hp2_ut_sbas NULL
Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk?rev=1529686&r1=1529685&r2=1529686&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk Sun Oct 6 20:56:47 2013
@@ -26,65 +26,73 @@ PRJ = ..$/..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = help_simpress
-LANGUAGE_FILELIST= main0103.xhp \
+LANGUAGE_FILELIST= main0000.xhp \
+main0100.xhp \
+main0101.xhp \
+main0102.xhp \
+main0103.xhp \
main0104.xhp \
+main0105.xhp \
+main0106.xhp \
+main0107.xhp \
main0113.xhp \
-04/presenter.xhp \
-04/01020000.xhp \
+main0114.xhp \
+main0200.xhp \
+main0202.xhp \
+main0203.xhp \
+main0204.xhp \
+main0206.xhp \
main0209.xhp \
-02/11060000.xhp \
-02/10050000.xhp \
-02/10130000.xhp \
+main0210.xhp \
+main0211.xhp \
+main0213.xhp \
+main0212.xhp \
+main0214.xhp \
+main0503.xhp \
02/04010000.xhp \
-02/13160000.xhp \
-02/10080000.xhp \
+02/04020000.xhp \
+02/04030000.xhp \
+02/04040000.xhp \
02/04060000.xhp \
-02/10120000.xhp \
-02/10100000.xhp \
-02/13100000.xhp \
+02/04070000.xhp \
+02/08020000.xhp \
+02/08060000.xhp \
+02/10020000.xhp \
+02/10030000.xhp \
02/10030200.xhp \
-02/04040000.xhp \
-02/13180000.xhp \
-02/13060000.xhp \
+02/10050000.xhp \
+02/10060000.xhp \
+02/10070000.xhp \
+02/10080000.xhp \
02/10090000.xhp \
-02/13170000.xhp \
-02/04030000.xhp \
-02/13190000.xhp \
+02/10100000.xhp \
+02/10110000.xhp \
+02/10120000.xhp \
+02/10130000.xhp \
+02/11060000.xhp \
+02/11070000.xhp \
+02/11080000.xhp \
+02/11090000.xhp \
+02/11100000.xhp \
+02/11110000.xhp \
02/13010000.xhp \
02/13020000.xhp \
-02/13080000.xhp \
-02/11110000.xhp \
-02/08020000.xhp \
-02/10020000.xhp \
-02/11070000.xhp \
+02/13030000.xhp \
+02/13040000.xhp \
+02/13050000.xhp \
+02/13060000.xhp \
02/13070000.xhp \
-02/11080000.xhp \
+02/13080000.xhp \
02/13090000.xhp \
-02/10060000.xhp \
-02/13050000.xhp \
-02/13040000.xhp \
-02/04020000.xhp \
-02/13150000.xhp \
-02/10030000.xhp \
02/13140000.xhp \
-02/11100000.xhp \
-02/11090000.xhp \
-02/13030000.xhp \
-02/08060000.xhp \
-02/10110000.xhp \
-02/10070000.xhp \
-02/04070000.xhp \
-main0211.xhp \
-main0102.xhp \
-main0213.xhp \
-main0100.xhp \
-main0212.xhp \
-main0206.xhp \
-main0210.xhp \
-main0000.xhp \
-main0107.xhp \
-main0200.xhp \
-main0106.xhp \
+02/13150000.xhp \
+02/13160000.xhp \
+02/13100000.xhp \
+02/13180000.xhp \
+02/13170000.xhp \
+02/13190000.xhp \
+04/presenter.xhp \
+04/01020000.xhp \
00/00000402.xhp \
00/00000406.xhp \
00/00000404.xhp \
@@ -187,7 +195,6 @@ main0106.xhp \
01/04990400.xhp \
01/03152000.xhp \
01/05250500.xhp \
-main0203.xhp \
guide/show.xhp \
guide/individual.xhp \
guide/layers.xhp \
@@ -223,12 +230,6 @@ guide/layer_tipps.xhp \
guide/keyboard.xhp \
guide/3d_create.xhp \
guide/background.xhp \
-main0214.xhp \
-main0101.xhp \
-main0114.xhp \
-main0204.xhp \
-main0105.xhp \
-main0202.xhp \
minimizer/infobox.xhp \
minimizer/main.xhp \
minimizer/step5.xhp \
@@ -236,8 +237,7 @@ minimizer/shared.xhp \
minimizer/step1.xhp \
minimizer/step3.xhp \
minimizer/step4.xhp \
-minimizer/step2.xhp \
-main0503.xhp
+minimizer/step2.xhp
.IF "$(MAKETARGETS)"!="genPO"
Modified: openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx?rev=1529686&r1=1529685&r2=1529686&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx (original)
+++ openoffice/branches/l10n40/main/l10ntools/source/gConXhpWrap.cxx Sun Oct 6 20:56:47 2013
@@ -322,6 +322,7 @@ void convert_xhp::handleSpecial(char *yy
{
msCollector.erase(nX);
mcMemory.convertFromInetString(sText);
+ msCollector += sText;
}
}
Modified: openoffice/branches/l10n40/main/solenv/inc/tg_help.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/tg_help.mk?rev=1529686&r1=1529685&r2=1529686&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/tg_help.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/tg_help.mk Sun Oct 6 20:56:47 2013
@@ -49,7 +49,8 @@ $(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL
$(HELP_OUT)$/$(TARGET).done : $(HLANGXHPFILES)
.IF "$(WITH_LANG)"!=""
- $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+# $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+ $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(HELP_OUT) -v -f $(LANGUAGE_FILELIST) && $(TOUCH) $@
.ELSE # "$(WITH_LANG)"!=""
cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
.ENDIF # "$(WITH_LANG)"!=""