summaryrefslogtreecommitdiff
path: root/helpcontent2/util
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/util')
-rw-r--r--helpcontent2/util/sbasic/makefile.mk7
-rw-r--r--helpcontent2/util/scalc/makefile.mk7
-rw-r--r--helpcontent2/util/schart/makefile.mk7
-rw-r--r--helpcontent2/util/sdatabase/makefile.mk7
-rw-r--r--helpcontent2/util/sdraw/makefile.mk7
-rw-r--r--helpcontent2/util/shared/makefile.mk6
-rw-r--r--helpcontent2/util/simpress/makefile.mk7
-rw-r--r--helpcontent2/util/smath/makefile.mk7
-rw-r--r--helpcontent2/util/swriter/makefile.mk7
-rw-r--r--[-rwxr-xr-x]helpcontent2/util/target.pmk10
10 files changed, 33 insertions, 39 deletions
diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index f57576b5c2..3f0ee12cf5 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -38,7 +38,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
@@ -50,13 +50,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= \
@@ -862,7 +862,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 8e4dc65de9..f3d6a23a86 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -38,7 +38,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
@@ -50,13 +50,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= \
@@ -875,7 +875,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 cefb048b63..80264b8dd7 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -38,7 +38,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
@@ -50,13 +50,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= \
@@ -563,7 +563,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 9a5365dc9c..d80596bdc9 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -38,7 +38,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
@@ -49,12 +49,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= \
@@ -561,7 +561,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 71d5f6401d..38e29beaed 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -38,7 +38,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
@@ -49,12 +49,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= \
@@ -796,7 +796,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/shared/makefile.mk b/helpcontent2/util/shared/makefile.mk
index 76237f68ad..35581be8be 100644
--- a/helpcontent2/util/shared/makefile.mk
+++ b/helpcontent2/util/shared/makefile.mk
@@ -38,7 +38,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
@@ -49,7 +49,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 \
@@ -60,7 +60,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 0b4e518846..9fc38e1c9f 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -38,7 +38,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
@@ -50,13 +50,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= \
@@ -798,7 +798,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 8b7b83f647..63b2833794 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -38,7 +38,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
@@ -50,13 +50,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= \
@@ -641,7 +641,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 02509d4834..c3eb209631 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -38,7 +38,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
@@ -50,13 +50,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= \
@@ -954,7 +954,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/target.pmk b/helpcontent2/util/target.pmk
index ba39195439..c5649de4dc 100755..100644
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk
@@ -25,7 +25,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)
@@ -35,12 +35,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) $(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 $@.$(INPATH) -checkcfsandsegname _0 _3
+ $(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
generated by cgit (git 2.34.1) at 2025-01-09 16:13:31 +0000