From 17ae85786dd0dc06a23b08cb9e37812824391e48 Mon Sep 17 00:00:00 2001 From: Uwe Fischer Date: Wed, 6 Jan 2010 14:05:10 +0100 Subject: hcshared25: commit before help id changes --- helpcontent2/util/sbasic/makefile.mk | 1 - helpcontent2/util/scalc/makefile.mk | 2 +- helpcontent2/util/schart/makefile.mk | 1 - helpcontent2/util/sdatabase/makefile.mk | 1 - helpcontent2/util/sdraw/makefile.mk | 1 - helpcontent2/util/simpress/makefile.mk | 1 - helpcontent2/util/smath/makefile.mk | 1 - helpcontent2/util/swriter/makefile.mk | 1 - 8 files changed, 1 insertion(+), 8 deletions(-) (limited to 'helpcontent2/util') diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk index 33b97abf3f..35d8e704a9 100644 --- a/helpcontent2/util/sbasic/makefile.mk +++ b/helpcontent2/util/sbasic/makefile.mk @@ -848,7 +848,6 @@ LINKLINKFILES= \ text$/shared$/autokorr$/08000000.xhp \ text$/shared$/autokorr$/09000000.xhp \ text$/shared$/autokorr$/10000000.xhp \ - text$/shared$/autokorr$/11000000.xhp \ text$/shared$/autokorr$/12000000.xhp \ text$/shared$/autokorr$/13000000.xhp \ text$/shared$/autopi$/01000000.xhp \ diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index 61bbcef62f..71e44e17df 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -315,6 +315,7 @@ LINKLINKFILES= \ text$/scalc$/guide$/multioperation.xhp \ text$/scalc$/guide$/multitables.xhp \ text$/scalc$/guide$/note_insert.xhp \ + text$/scalc$/guide$/numbers_text.xhp \ text$/scalc$/guide$/print_details.xhp \ text$/scalc$/guide$/print_exact.xhp \ text$/scalc$/guide$/print_landscape.xhp \ @@ -862,7 +863,6 @@ LINKLINKFILES= \ text$/shared$/autokorr$/08000000.xhp \ text$/shared$/autokorr$/09000000.xhp \ text$/shared$/autokorr$/10000000.xhp \ - text$/shared$/autokorr$/11000000.xhp \ text$/shared$/autokorr$/12000000.xhp \ text$/shared$/autokorr$/13000000.xhp \ text$/shared$/autopi$/01000000.xhp \ diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk index c40f0ebb83..23866b48da 100644 --- a/helpcontent2/util/schart/makefile.mk +++ b/helpcontent2/util/schart/makefile.mk @@ -551,7 +551,6 @@ LINKLINKFILES= \ text$/shared$/autokorr$/08000000.xhp \ text$/shared$/autokorr$/09000000.xhp \ text$/shared$/autokorr$/10000000.xhp \ - text$/shared$/autokorr$/11000000.xhp \ text$/shared$/autokorr$/12000000.xhp \ text$/shared$/autokorr$/13000000.xhp \ text$/shared$/autopi$/01000000.xhp \ diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk index fd99bb268b..c459d1f4a1 100644 --- a/helpcontent2/util/sdatabase/makefile.mk +++ b/helpcontent2/util/sdatabase/makefile.mk @@ -549,7 +549,6 @@ LINKLINKFILES= \ text$/shared$/autokorr$/08000000.xhp \ text$/shared$/autokorr$/09000000.xhp \ text$/shared$/autokorr$/10000000.xhp \ - text$/shared$/autokorr$/11000000.xhp \ text$/shared$/autokorr$/12000000.xhp \ text$/shared$/autokorr$/13000000.xhp \ text$/shared$/autopi$/01000000.xhp \ diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk index 18caa9f7f6..ebbb9107e1 100644 --- a/helpcontent2/util/sdraw/makefile.mk +++ b/helpcontent2/util/sdraw/makefile.mk @@ -784,7 +784,6 @@ LINKLINKFILES= \ text$/shared$/autokorr$/08000000.xhp \ text$/shared$/autokorr$/09000000.xhp \ text$/shared$/autokorr$/10000000.xhp \ - text$/shared$/autokorr$/11000000.xhp \ text$/shared$/autokorr$/12000000.xhp \ text$/shared$/autokorr$/13000000.xhp \ text$/shared$/autopi$/01000000.xhp \ diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk index a6ab94b35d..3965ee5df6 100644 --- a/helpcontent2/util/simpress/makefile.mk +++ b/helpcontent2/util/simpress/makefile.mk @@ -786,7 +786,6 @@ LINKLINKFILES= \ text$/shared$/autokorr$/08000000.xhp \ text$/shared$/autokorr$/09000000.xhp \ text$/shared$/autokorr$/10000000.xhp \ - text$/shared$/autokorr$/11000000.xhp \ text$/shared$/autokorr$/12000000.xhp \ text$/shared$/autokorr$/13000000.xhp \ text$/shared$/autopi$/01000000.xhp \ diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk index 51d8baface..2a2c0e726e 100644 --- a/helpcontent2/util/smath/makefile.mk +++ b/helpcontent2/util/smath/makefile.mk @@ -629,7 +629,6 @@ LINKLINKFILES= \ text$/shared$/autokorr$/08000000.xhp \ text$/shared$/autokorr$/09000000.xhp \ text$/shared$/autokorr$/10000000.xhp \ - text$/shared$/autokorr$/11000000.xhp \ text$/shared$/autokorr$/12000000.xhp \ text$/shared$/autokorr$/13000000.xhp \ text$/shared$/autopi$/01000000.xhp \ diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk index b54a27fb0f..90df0081b7 100644 --- a/helpcontent2/util/swriter/makefile.mk +++ b/helpcontent2/util/swriter/makefile.mk @@ -942,7 +942,6 @@ LINKLINKFILES= \ text$/shared$/autokorr$/08000000.xhp \ text$/shared$/autokorr$/09000000.xhp \ text$/shared$/autokorr$/10000000.xhp \ - text$/shared$/autokorr$/11000000.xhp \ text$/shared$/autokorr$/12000000.xhp \ text$/shared$/autokorr$/13000000.xhp \ text$/shared$/autopi$/01000000.xhp \ -- cgit From b09dc9a00d1eccf2b12ce59d44aa521151542b40 Mon Sep 17 00:00:00 2001 From: Frank Peters Date: Fri, 19 Feb 2010 17:10:42 +0100 Subject: #i104543# --- helpcontent2/util/sbasic/makefile.mk | 6 +++--- helpcontent2/util/scalc/makefile.mk | 6 +++--- helpcontent2/util/schart/makefile.mk | 6 +++--- helpcontent2/util/sdatabase/makefile.mk | 6 +++--- helpcontent2/util/sdraw/makefile.mk | 6 +++--- helpcontent2/util/shared/makefile.mk | 6 +++--- helpcontent2/util/simpress/makefile.mk | 6 +++--- helpcontent2/util/smath/makefile.mk | 6 +++--- helpcontent2/util/swriter/makefile.mk | 6 +++--- helpcontent2/util/target.pmk | 10 ++++++---- 10 files changed, 33 insertions(+), 31 deletions(-) mode change 100755 => 100644 helpcontent2/util/target.pmk (limited to 'helpcontent2/util') diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk index c55eafd34a..fbf50933ac 100644 --- a/helpcontent2/util/sbasic/makefile.mk +++ b/helpcontent2/util/sbasic/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_sbasic .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_sbasic @@ -38,13 +38,13 @@ LINKNAME=sbasic LINKADDEDFILES= \ -add sbasic.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sbasic.cfg \ -add sbasic.tree $(COMMONMISC)$/LANGUAGE$/sbasic.tree \ - -add sbasic.jar $(BIN)$/xhp_sbasic_LANGUAGE.zip + -add sbasic.jar $(COMMONBIN)$/xhp_sbasic_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/sbasic.cfg \ $(COMMONMISC)$/LANGUAGE$/sbasic.tree \ - $(BIN)$/xhp_sbasic_LANGUAGE.zip + $(COMMONBIN)$/xhp_sbasic_LANGUAGE.zip LINKLINKFILES= \ diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index 756d1b2bd9..c0cbf329cc 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_scalc .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_scalc @@ -38,13 +38,13 @@ LINKNAME=scalc LINKADDEDFILES= \ -add scalc.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.cfg \ -add scalc.tree $(COMMONMISC)$/LANGUAGE$/scalc.tree \ - -add scalc.jar $(BIN)$/xhp_scalc_LANGUAGE.zip + -add scalc.jar $(COMMONBIN)$/xhp_scalc_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.cfg \ $(COMMONMISC)$/LANGUAGE$/scalc.tree \ - $(BIN)$/xhp_scalc_LANGUAGE.zip + $(COMMONBIN)$/xhp_scalc_LANGUAGE.zip LINKLINKFILES= \ diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk index c40f0ebb83..60a507325b 100644 --- a/helpcontent2/util/schart/makefile.mk +++ b/helpcontent2/util/schart/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_schart .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_schart @@ -38,13 +38,13 @@ LINKNAME=schart LINKADDEDFILES= \ -add schart.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/schart.cfg \ -add schart.tree $(COMMONMISC)$/LANGUAGE$/schart.tree \ - -add schart.jar $(BIN)$/xhp_schart_LANGUAGE.zip + -add schart.jar $(COMMONBIN)$/xhp_schart_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/schart.cfg \ $(COMMONMISC)$/LANGUAGE$/schart.tree \ - $(BIN)$/xhp_schart_LANGUAGE.zip + $(COMMONBIN)$/xhp_schart_LANGUAGE.zip LINKLINKFILES= \ diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk index fd99bb268b..10466ee886 100644 --- a/helpcontent2/util/sdatabase/makefile.mk +++ b/helpcontent2/util/sdatabase/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_sdatabase .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_sdatabase @@ -37,12 +37,12 @@ ZIP1LIST=$(LANGDIR)$/text$/shared$/explorer$/database$/main.xhp LINKNAME=sdatabase LINKADDEDFILES= \ -add sdatabase.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdatabase.cfg \ - -add sdatabase.jar $(BIN)$/xhp_sdatabase_LANGUAGE.zip + -add sdatabase.jar $(COMMONBIN)$/xhp_sdatabase_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdatabase.cfg \ - $(BIN)$/xhp_sdatabase_LANGUAGE.zip + $(COMMONBIN)$/xhp_sdatabase_LANGUAGE.zip LINKLINKFILES= \ diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk index 18caa9f7f6..fdafc26271 100644 --- a/helpcontent2/util/sdraw/makefile.mk +++ b/helpcontent2/util/sdraw/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_sdraw .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_sdraw @@ -37,12 +37,12 @@ ZIP1LIST=$(LANGDIR)$/text$/sdraw$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x LINKNAME=sdraw LINKADDEDFILES= \ -add sdraw.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdraw.cfg \ - -add sdraw.jar $(BIN)$/xhp_sdraw_LANGUAGE.zip + -add sdraw.jar $(COMMONBIN)$/xhp_sdraw_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdraw.cfg \ - $(BIN)$/xhp_sdraw_LANGUAGE.zip + $(COMMONBIN)$/xhp_sdraw_LANGUAGE.zip LINKLINKFILES= \ diff --git a/helpcontent2/util/shared/makefile.mk b/helpcontent2/util/shared/makefile.mk index 6bc04ce32d..a5ccfb5e32 100644 --- a/helpcontent2/util/shared/makefile.mk +++ b/helpcontent2/util/shared/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_shared .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_shared @@ -37,7 +37,7 @@ ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x LINKNAME=shared LINKADDEDFILES= \ -add shared.tree $(COMMONMISC)$/LANGUAGE$/shared.tree \ - -add shared.jar $(BIN)$/xhp_shared_LANGUAGE.zip \ + -add shared.jar $(COMMONBIN)$/xhp_shared_LANGUAGE.zip \ -add default.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/default.css \ -add highcontrast1.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast1.css \ -add highcontrast2.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast2.css \ @@ -48,7 +48,7 @@ LINKADDEDFILES= \ LINKADDEDDEPS= \ $(COMMONMISC)$/LANGUAGE$/shared.tree \ - $(BIN)$/xhp_shared_LANGUAGE.zip \ + $(COMMONBIN)$/xhp_shared_LANGUAGE.zip \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/default.css \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast1.css \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast2.css \ diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk index a6ab94b35d..7143825171 100644 --- a/helpcontent2/util/simpress/makefile.mk +++ b/helpcontent2/util/simpress/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_simpress .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_simpress @@ -38,13 +38,13 @@ LINKNAME=simpress LINKADDEDFILES= \ -add simpress.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/simpress.cfg \ -add simpress.tree $(COMMONMISC)$/LANGUAGE$/simpress.tree \ - -add simpress.jar $(BIN)$/xhp_simpress_LANGUAGE.zip + -add simpress.jar $(COMMONBIN)$/xhp_simpress_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/simpress.cfg \ $(COMMONMISC)$/LANGUAGE$/simpress.tree \ - $(BIN)$/xhp_simpress_LANGUAGE.zip + $(COMMONBIN)$/xhp_simpress_LANGUAGE.zip LINKLINKFILES= \ diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk index 51d8baface..b45e1a6624 100644 --- a/helpcontent2/util/smath/makefile.mk +++ b/helpcontent2/util/smath/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_smath .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_smath @@ -38,13 +38,13 @@ LINKNAME=smath LINKADDEDFILES= \ -add smath.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \ -add smath.tree $(COMMONMISC)$/LANGUAGE$/smath.tree \ - -add smath.jar $(BIN)$/xhp_smath_LANGUAGE.zip + -add smath.jar $(COMMONBIN)$/xhp_smath_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \ $(COMMONMISC)$/LANGUAGE$/smath.tree \ - $(BIN)$/xhp_smath_LANGUAGE.zip + $(COMMONBIN)$/xhp_smath_LANGUAGE.zip LINKLINKFILES= \ diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk index b54a27fb0f..082efe08ec 100644 --- a/helpcontent2/util/swriter/makefile.mk +++ b/helpcontent2/util/swriter/makefile.mk @@ -26,7 +26,7 @@ TARGET = util_swriter .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_swriter @@ -38,13 +38,13 @@ LINKNAME=swriter LINKADDEDFILES= \ -add swriter.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \ -add swriter.tree $(COMMONMISC)$/LANGUAGE$/swriter.tree \ - -add swriter.jar $(BIN)$/xhp_swriter_LANGUAGE.zip + -add swriter.jar $(COMMONBIN)$/xhp_swriter_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \ $(COMMONMISC)$/LANGUAGE$/swriter.tree \ - $(BIN)$/xhp_swriter_LANGUAGE.zip + $(COMMONBIN)$/xhp_swriter_LANGUAGE.zip LINKLINKFILES= \ diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk old mode 100755 new mode 100644 index 58d9de8c79..c24d4aab97 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -29,7 +29,7 @@ # #************************************************************************* -LINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(BIN)$/$(LINKNAME)_$i.zip) +LINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(COMMONBIN)$/$(LINKNAME)_$i.zip) LINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES))) ALLTAR : $(LINKALLTARGETS) @@ -39,12 +39,14 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) .ENDIF $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst - $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) + $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@.$(INPATH)) .IF "$(SOLAR_JAVA)" == "TRUE" - $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsname _0 + $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@.$(INPATH) -checkcfsname _0 + $(RENAME) $@.$(INPATH) $@ .ELSE -$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.* -$(RM) $(MISC)$/ziptmp$(@:b)$/caption/*.* - zip -j -D $@ $(MISC)$/ziptmp$(@:b)$/* + zip -j -D $@.$(INPATH) $(MISC)$/ziptmp$(@:b)$/* + $(RENAME) $@.$(INPATH) $@ -$(RM) $(MISC)$/ziptmp$(@:b)$/*.* .ENDIF -- cgit From dd7f98a0fc3186fe74f835a99f03a949f3634219 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 12 May 2010 10:45:45 +0200 Subject: obo48: #i109700# lucene indexer generates segments_n (n>3) files --- helpcontent2/util/target.pmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'helpcontent2/util') diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index ba39195439..e162c80c74 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -37,7 +37,7 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) .IF "$(SOLAR_JAVA)" == "TRUE" - $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsname _0 + $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsandsegname _0 _3 .ELSE -$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.* -$(RM) $(MISC)$/ziptmp$(@:b)$/caption/*.* -- cgit From dd0b89d28397f8b16f7da9f4128cd98ae6e5195c Mon Sep 17 00:00:00 2001 From: Uwe Fischer Date: Thu, 10 Jun 2010 13:32:14 +0200 Subject: tl79:Help makefiles --- helpcontent2/util/sbasic/makefile.mk | 2 ++ helpcontent2/util/scalc/makefile.mk | 2 ++ helpcontent2/util/schart/makefile.mk | 2 ++ helpcontent2/util/sdatabase/makefile.mk | 2 ++ helpcontent2/util/sdraw/makefile.mk | 2 ++ helpcontent2/util/shared/makefile.mk | 1 + helpcontent2/util/simpress/makefile.mk | 2 ++ helpcontent2/util/smath/makefile.mk | 2 ++ helpcontent2/util/swriter/makefile.mk | 2 ++ 9 files changed, 17 insertions(+) (limited to 'helpcontent2/util') diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk index 3f0ee12cf5..b79cb6bcc9 100644 --- a/helpcontent2/util/sbasic/makefile.mk +++ b/helpcontent2/util/sbasic/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" @@ -425,6 +426,7 @@ LINKLINKFILES= \ text$/shared$/01$/01100300.xhp \ text$/shared$/01$/01100400.xhp \ text$/shared$/01$/01100500.xhp \ + text$/shared$/01$/01100600.xhp \ text$/shared$/01$/01110000.xhp \ text$/shared$/01$/01110100.xhp \ text$/shared$/01$/01110101.xhp \ diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index f3d6a23a86..c5d9b0cbf5 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" @@ -438,6 +439,7 @@ LINKLINKFILES= \ text$/shared$/01$/01100300.xhp \ text$/shared$/01$/01100400.xhp \ text$/shared$/01$/01100500.xhp \ + text$/shared$/01$/01100600.xhp \ text$/shared$/01$/01110000.xhp \ text$/shared$/01$/01110100.xhp \ text$/shared$/01$/01110101.xhp \ diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk index 80264b8dd7..0eb859a989 100644 --- a/helpcontent2/util/schart/makefile.mk +++ b/helpcontent2/util/schart/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" @@ -126,6 +127,7 @@ LINKLINKFILES= \ text$/shared$/01$/01100300.xhp \ text$/shared$/01$/01100400.xhp \ text$/shared$/01$/01100500.xhp \ + text$/shared$/01$/01100600.xhp \ text$/shared$/01$/01110000.xhp \ text$/shared$/01$/01110100.xhp \ text$/shared$/01$/01110101.xhp \ diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk index d80596bdc9..3af9db8e5c 100644 --- a/helpcontent2/util/sdatabase/makefile.mk +++ b/helpcontent2/util/sdatabase/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" @@ -124,6 +125,7 @@ LINKLINKFILES= \ text$/shared$/01$/01100300.xhp \ text$/shared$/01$/01100400.xhp \ text$/shared$/01$/01100500.xhp \ + text$/shared$/01$/01100600.xhp \ text$/shared$/01$/01110000.xhp \ text$/shared$/01$/01110100.xhp \ text$/shared$/01$/01110101.xhp \ diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk index 38e29beaed..ea99a877b3 100644 --- a/helpcontent2/util/sdraw/makefile.mk +++ b/helpcontent2/util/sdraw/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" @@ -359,6 +360,7 @@ LINKLINKFILES= \ text$/shared$/01$/01100300.xhp \ text$/shared$/01$/01100400.xhp \ text$/shared$/01$/01100500.xhp \ + text$/shared$/01$/01100600.xhp \ text$/shared$/01$/01110000.xhp \ text$/shared$/01$/01110100.xhp \ text$/shared$/01$/01110101.xhp \ diff --git a/helpcontent2/util/shared/makefile.mk b/helpcontent2/util/shared/makefile.mk index 35581be8be..b613deb7a0 100644 --- a/helpcontent2/util/shared/makefile.mk +++ b/helpcontent2/util/shared/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk index 9fc38e1c9f..e1cb5db140 100644 --- a/helpcontent2/util/simpress/makefile.mk +++ b/helpcontent2/util/simpress/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" @@ -361,6 +362,7 @@ LINKLINKFILES= \ text$/shared$/01$/01100300.xhp \ text$/shared$/01$/01100400.xhp \ text$/shared$/01$/01100500.xhp \ + text$/shared$/01$/01100600.xhp \ text$/shared$/01$/01110000.xhp \ text$/shared$/01$/01110100.xhp \ text$/shared$/01$/01110101.xhp \ diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk index 63b2833794..de5ede8126 100644 --- a/helpcontent2/util/smath/makefile.mk +++ b/helpcontent2/util/smath/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" @@ -204,6 +205,7 @@ LINKLINKFILES= \ text$/shared$/01$/01100300.xhp \ text$/shared$/01$/01100400.xhp \ text$/shared$/01$/01100500.xhp \ + text$/shared$/01$/01100600.xhp \ text$/shared$/01$/01110000.xhp \ text$/shared$/01$/01110100.xhp \ text$/shared$/01$/01110101.xhp \ diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk index c3eb209631..6e89183d78 100644 --- a/helpcontent2/util/swriter/makefile.mk +++ b/helpcontent2/util/swriter/makefile.mk @@ -25,6 +25,7 @@ # #************************************************************************* + # edit to match directory level PRJ = ..$/.. # same for all makefiles in "helpcontent2" @@ -517,6 +518,7 @@ LINKLINKFILES= \ text$/shared$/01$/01100300.xhp \ text$/shared$/01$/01100400.xhp \ text$/shared$/01$/01100500.xhp \ + text$/shared$/01$/01100600.xhp \ text$/shared$/01$/01110000.xhp \ text$/shared$/01$/01110100.xhp \ text$/shared$/01$/01110101.xhp \ -- cgit From 1f3915313afc1a67510ad795909be2e1ad15b91c Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 14 Jun 2010 09:41:43 +0200 Subject: masterfix: #i112339# check indexer output only when needed --- helpcontent2/util/target.pmk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'helpcontent2/util') diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index c5649de4dc..44b73709b4 100644 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -37,7 +37,11 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@.$(INPATH)) .IF "$(SOLAR_JAVA)" == "TRUE" +.IF "$(CHECK_LUCENCE_INDEXER_OUTPUT)" == "" + $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@.$(INPATH) +.ELSE $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@.$(INPATH) -checkcfsandsegname _0 _3 +.ENDIF $(RENAME) $@.$(INPATH) $@ .ELSE -$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.* -- cgit