From 17600cbdd3bdd41e8edf905dc85012ac00e217d2 Mon Sep 17 00:00:00 2001 From: Frank Peters Date: Fri, 19 Feb 2010 17:08:37 +0100 Subject: #i104543# --- helpcontent2/helpers/createmakefile.pl | 36 +++++++++++++++--------------- helpcontent2/helpers/linkmakefile.template | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/helpcontent2/helpers/createmakefile.pl b/helpcontent2/helpers/createmakefile.pl index 909384b4fd..3511eca164 100644 --- a/helpcontent2/helpers/createmakefile.pl +++ b/helpcontent2/helpers/createmakefile.pl @@ -146,13 +146,13 @@ for $d(@dirs) { $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAD $linklinkfiles = ''; @@ -174,13 +174,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAD $linklinkfiles = ''; @@ -202,13 +202,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAD $linklinkfiles = ''; @@ -230,12 +230,12 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAD $linklinkfiles = ''; @@ -258,7 +258,7 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip \\ + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_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 \\ @@ -269,7 +269,7 @@ LAF $linkaddeddeps = <<"LAD"; \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip \\ + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip \\ \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/default.css \\ \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/highcontrast1.css \\ \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/highcontrast2.css \\ @@ -294,13 +294,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAD $linklinkfiles = ''; @@ -324,13 +324,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAD $linklinkfiles = ''; @@ -351,13 +351,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAD $linklinkfiles = ''; @@ -377,12 +377,12 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip + -add $module.jar \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - \$(BIN)\$/xhp_${module}_LANGUAGE.zip + \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip LAD $linklinkfiles = ''; diff --git a/helpcontent2/helpers/linkmakefile.template b/helpcontent2/helpers/linkmakefile.template index 17a1ae718b..f63c69cd05 100644 --- a/helpcontent2/helpers/linkmakefile.template +++ b/helpcontent2/helpers/linkmakefile.template @@ -26,7 +26,7 @@ TARGET = util_%module% .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk -common_build_zip:= +#common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_%module% -- cgit v1.2.3 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 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 v1.2.3 From f5abeadcce76b40eb8cba6fff0316d10cd237a7a Mon Sep 17 00:00:00 2001 From: Frank Peters Date: Fri, 19 Feb 2010 17:13:35 +0100 Subject: #i104543# --- helpcontent2/source/auxiliary/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk index 1155e80369..691131ded6 100644 --- a/helpcontent2/source/auxiliary/makefile.mk +++ b/helpcontent2/source/auxiliary/makefile.mk @@ -82,7 +82,7 @@ $(LOCTREEFILES) : $(COMMONMISC)/unpack.done .ENDIF # "$(WITH_LANG)"!="" aux_dirs .PHONY : - echo aux_langdirs:=$(aux_langdirs) > $(INCCOM)$/aux_langs.mk + echo aux_langdirs:=$(aux_langdirs) > $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk $(COMMONBIN)$/helpimg.ilst .PHONY: -$(RM) $@ -- cgit v1.2.3 From 274595d7c039ca9816bea8919e07d7deb8ecd4b2 Mon Sep 17 00:00:00 2001 From: Frank Peters Date: Tue, 11 May 2010 16:11:22 +0200 Subject: #i104543# --- helpcontent2/settings.pmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk index 296f7b71b6..c9d2722258 100755 --- a/helpcontent2/settings.pmk +++ b/helpcontent2/settings.pmk @@ -1,4 +1,4 @@ -.INCLUDE : $(INCCOM)$/aux_langs.mk +.INCLUDE : $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$ -- cgit v1.2.3