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/13 01:20:59 UTC
svn commit: r1531606 - in /openoffice/branches/l10n40/main:
helpcontent2/source/text/sbasic/ helpcontent2/source/text/scalc/
helpcontent2/source/text/schart/ helpcontent2/source/text/sdraw/
helpcontent2/source/text/shared/ helpcontent2/source/text/simp...
Author: jani
Date: Sat Oct 12 23:20:58 2013
New Revision: 1531606
URL: http://svn.apache.org/r1531606
Log:
update zip file generation.
Modified:
openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk
openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk
openoffice/branches/l10n40/main/solenv/inc/extension_helplink.mk
openoffice/branches/l10n40/main/solenv/inc/tg_help.mk
Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk?rev=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/makefile.mk Sat Oct 12 23:20:58 2013
@@ -19,9 +19,11 @@
#
#**************************************************************
-PRJ=../../..
+PRJ=..$/..$/..
PRJNAME=help_sbasic
-TARGET=helper
+PACKAGE = text/sbasic
+TARGET = text_sbasic
+MODULE = sbasic
LANGUAGE_FILELIST= guide/create_dialog.xhp \
guide/insert_control.xhp \
@@ -324,7 +326,14 @@ shared/main0601.xhp \
guide/control_properties.xhp
-
+.IF "$(MAKETARGETS)"!="genPO"
.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/settings.pmk
+
+.INCLUDE : target.mk
+.INCLUDE : tg_help.mk
+.ELSE
+.INCLUDE : settings.mk
+.INCLUDE : target.mk
+.ENDIF
-.INCLUDE : target.mk
Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk?rev=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/makefile.mk Sat Oct 12 23:20:58 2013
@@ -23,14 +23,9 @@
# edit to match directory level
PRJ = ..$/..$/..
-# same for all makefiles in "helpcontent2"
PRJNAME = help_scalc
-# edit to match the current package
PACKAGE = text/scalc
-# uniqe name (module wide);
-# using a modified form of package should do here
TARGET = text_scalc
-# edit to match the current module
MODULE = scalc
# --- Settings -----------------------------------------------------
@@ -355,32 +350,7 @@ main0503.xhp
.IF "$(MAKETARGETS)"!="genPO"
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-
-# this list matches the *.xhp files to process
-XHPFILES = \
- main0000.xhp \
- main0100.xhp \
- main0101.xhp \
- main0102.xhp \
- main0103.xhp \
- main0104.xhp \
- main0105.xhp \
- main0106.xhp \
- main0107.xhp \
- main0112.xhp \
- main0200.xhp \
- main0202.xhp \
- main0203.xhp \
- main0205.xhp \
- main0206.xhp \
- main0208.xhp \
- main0210.xhp \
- main0214.xhp \
- main0218.xhp \
- main0503.xhp
-# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
.INCLUDE : tg_help.mk
.ELSE
Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk?rev=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/schart/makefile.mk Sat Oct 12 23:20:58 2013
@@ -23,15 +23,9 @@
# edit to match directory level
PRJ = ..$/..$/..
-# same for all makefiles in "helpcontent2"
PRJNAME = help_schart
-
-# edit to match the current package
PACKAGE = text/schart
-# uniqe name (module wide);
-# using a modified form of package should do here
TARGET = text_schart
-# edit to match the current module
MODULE = schart
# --- Settings -----------------------------------------------------
@@ -95,14 +89,6 @@ main0503.xhp
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-# this list matches the *.xhp files to process
-XHPFILES = \
- main0000.xhp \
- main0202.xhp \
- main0503.xhp
-
-# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
.INCLUDE : tg_help.mk
.ELSE
Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk?rev=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/sdraw/makefile.mk Sat Oct 12 23:20:58 2013
@@ -23,15 +23,9 @@
# edit to match directory level
PRJ = ..$/..$/..
-# same for all makefiles in "helpcontent2"
PRJNAME = help_sdraw
-
-# edit to match the current package
PACKAGE = text/sdraw
-# uniqe name (module wide);
-# using a modified form of package should do here
TARGET = text_sdraw
-# edit to match the current module
MODULE = sdraw
# --- Settings -----------------------------------------------------
@@ -72,24 +66,6 @@ main0503.xhp
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-# this list matches the *.xhp files to process
-XHPFILES = \
- main0000.xhp \
- main0100.xhp \
- main0101.xhp \
- main0102.xhp \
- main0103.xhp \
- main0104.xhp \
- main0105.xhp \
- main0106.xhp \
- main0200.xhp \
- main0202.xhp \
- main0210.xhp \
- main0213.xhp \
- main0503.xhp
-
-# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
.INCLUDE : tg_help.mk
.ELSE
Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk?rev=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/makefile.mk Sat Oct 12 23:20:58 2013
@@ -23,15 +23,9 @@
# edit to match directory level
PRJ = ..$/..$/..
-# same for all makefiles in "helpcontent2"
PRJNAME = help_shared
-
-# edit to match the current package
PACKAGE = text/shared
-# uniqe name (module wide);
-# using a modified form of package should do here
TARGET = text_shared
-# edit to match the current module
MODULE = shared
# --- Settings -----------------------------------------------------
@@ -931,29 +925,6 @@ tree_strings.xhp
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-# this list matches the *.xhp files to process
-XHPFILES = \
- 3dsettings_toolbar.xhp \
- fontwork_toolbar.xhp \
- main0108.xhp \
- main0201.xhp \
- main0204.xhp \
- main0208.xhp \
- main0209.xhp \
- main0212.xhp \
- main0213.xhp \
- main0214.xhp \
- main0226.xhp \
- main0227.xhp \
- main0400.xhp \
- main0500.xhp \
- main0600.xhp \
- main0650.xhp \
- main0800.xhp \
- tree_strings.xhp
-
-# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
.INCLUDE : tg_help.mk
.ELSE
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=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/simpress/makefile.mk Sat Oct 12 23:20:58 2013
@@ -23,8 +23,10 @@
# edit to match directory level
PRJ = ..$/..$/..
-# same for all makefiles in "helpcontent2"
PRJNAME = help_simpress
+PACKAGE = text/simpress
+TARGET = text_simpress
+MODULE = simpress
LANGUAGE_FILELIST= main0000.xhp \
main0100.xhp \
@@ -241,47 +243,9 @@ minimizer/step2.xhp
.IF "$(MAKETARGETS)"!="genPO"
-# edit to match the current package
-PACKAGE = text/simpress
-# uniqe name (module wide);
-# using a modified form of package should do here
-TARGET = text_simpress
-# edit to match the current module
-MODULE = simpress
-
-# --- Settings -----------------------------------------------------
-
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-# this list matches the *.xhp files to process
-XHPFILES = \
- main0000.xhp \
- main0100.xhp \
- main0101.xhp \
- main0102.xhp \
- main0103.xhp \
- main0104.xhp \
- main0105.xhp \
- main0106.xhp \
- main0107.xhp \
- main0113.xhp \
- main0114.xhp \
- main0200.xhp \
- main0202.xhp \
- main0203.xhp \
- main0204.xhp \
- main0206.xhp \
- main0209.xhp \
- main0210.xhp \
- main0211.xhp \
- main0212.xhp \
- main0213.xhp \
- main0214.xhp \
- main0503.xhp
-
-# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
.INCLUDE : tg_help.mk
.ELSE
Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk?rev=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/smath/makefile.mk Sat Oct 12 23:20:58 2013
@@ -23,8 +23,10 @@
# edit to match directory level
PRJ = ..$/..$/..
-# same for all makefiles in "helpcontent2"
PRJNAME = help_smath
+PACKAGE = text/smath
+TARGET = text_smath
+MODULE = smath
LANGUAGE_FILELIST= main0103.xhp \
04/01020000.xhp \
@@ -107,35 +109,10 @@ main0503.xhp
.IF "$(MAKETARGETS)"!="genPO"
-# edit to match the current package
-PACKAGE = text/smath
-# uniqe name (module wide);
-# using a modified form of package should do here
-TARGET = text_smath
-# edit to match the current module
-MODULE = smath
-
-# --- Settings -----------------------------------------------------
-
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
# this list matches the *.xhp files to process
-XHPFILES = \
- main0000.xhp \
- main0100.xhp \
- main0101.xhp \
- main0102.xhp \
- main0103.xhp \
- main0105.xhp \
- main0106.xhp \
- main0107.xhp \
- main0200.xhp \
- main0202.xhp \
- main0203.xhp \
- main0503.xhp
-
-# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.INCLUDE : tg_help.mk
Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk?rev=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/swriter/makefile.mk Sat Oct 12 23:20:58 2013
@@ -23,8 +23,10 @@
# edit to match directory level
PRJ = ..$/..$/..
-# same for all makefiles in "helpcontent2"
PRJNAME = help_swriter
+PACKAGE = text/swriter
+TARGET = text_swriter
+MODULE = swriter
LANGUAGE_FILELIST= main0103.xhp \
main0104.xhp \
@@ -419,48 +421,9 @@ main0503.xhp
.IF "$(MAKETARGETS)"!="genPO"
-# edit to match the current package
-PACKAGE = text/swriter
-# uniqe name (module wide);
-# using a modified form of package should do here
-TARGET = text_swriter
-# edit to match the current module
-MODULE = swriter
-
-# --- Settings -----------------------------------------------------
-
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
-# this list matches the *.xhp files to process
-XHPFILES = \
- main0000.xhp \
- main0100.xhp \
- main0101.xhp \
- main0102.xhp \
- main0103.xhp \
- main0104.xhp \
- main0105.xhp \
- main0106.xhp \
- main0107.xhp \
- main0110.xhp \
- main0200.xhp \
- main0202.xhp \
- main0203.xhp \
- main0204.xhp \
- main0205.xhp \
- main0206.xhp \
- main0208.xhp \
- main0210.xhp \
- main0213.xhp \
- main0214.xhp \
- main0215.xhp \
- main0216.xhp \
- main0220.xhp \
- main0503.xhp
-
-# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
.INCLUDE : tg_help.mk
.ELSE
Modified: openoffice/branches/l10n40/main/solenv/inc/extension_helplink.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/extension_helplink.mk?rev=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/extension_helplink.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/extension_helplink.mk Sat Oct 12 23:20:58 2013
@@ -44,10 +44,10 @@ XSL_DIR*:=$(SOLARBINDIR)
XHPLINKSRC*:=$(XHPDEST)
STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl
-.IF "$(XHPFILES)"!="" && "$(HELP_OUT)"!=""
+.IF "$(LANGUAGE_FILELIST)"!="" && "$(HELP_OUT)"!=""
$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(HELP_OUT)/$(TARGET).done
LINKDEPS+=$(HELP_OUT)/xhp_changed.flag
-.ENDIF # "$(XHPFILES)"!="" && "$(HELP_OUT)"!=""
+.ENDIF # "$(LANGUAGE_FILELIST)"!="" && "$(HELP_OUT)"!=""
$(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKDEPS))
@echo Building help index for $(@:b:s/_/./:e:s/.//)
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=1531606&r1=1531605&r2=1531606&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/tg_help.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/tg_help.mk Sat Oct 12 23:20:58 2013
@@ -35,7 +35,7 @@ HELP_OUT:=$(COMMONMISC)
HELP_OUT:=$(MISC)
.ENDIF # "$(XHPDEST)"==""
-HLANGXHPFILES*:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
+HLANGXHPFILES*:=$(foreach,i,$(LANGUAGE_FILELIST) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
ALLTAR : $(HELP_OUT)$/$(TARGET).done $(HELP_OUT)$/xhp_changed.flag optix
@@ -49,10 +49,10 @@ $(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) $(LANGUAGE_FILELIST))))) -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) $@
+ cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(LANGUAGE_FILELIST)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
.ENDIF # "$(WITH_LANG)"!=""
.IF "$(OS)"=="SOLARIS"
@$(ECHONL) " "