enable syntax highligh of Basic code in offline help

Change-Id: Ibe2d1ae405677e6357d6f62f4ed20158b94532ff

10 files changed, 21 insertions, 102 deletions

diff --git a/util/sbasic/makefile.mk b/util/sbasic/makefile.mk
index 9aaed3f5cf..d4c346364c 100644
--- a/util/sbasic/makefile.mk
+++ b/util/sbasic/makefile.mk
@@ -29,25 +29,16 @@ TARGET  = util_sbasic
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_sbasic
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/sbasic$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
 
 LINKNAME=sbasic
 LINKADDEDFILES= \
    -add sbasic.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sbasic.cfg \
-   -add sbasic.tree $(COMMONMISC)$/LANGUAGE$/sbasic.tree \
-   -add sbasic.jar  $(COMMONBIN)$/xhp_sbasic_LANGUAGE.zip
+   -add sbasic.tree $(COMMONMISC)$/LANGUAGE$/sbasic.tree
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/sbasic.cfg \
-   $(COMMONMISC)$/LANGUAGE$/sbasic.tree \
-   $(COMMONBIN)$/xhp_sbasic_LANGUAGE.zip
+   $(COMMONMISC)$/LANGUAGE$/sbasic.tree
 
 
 LINKLINKFILES= \
diff --git a/util/scalc/makefile.mk b/util/scalc/makefile.mk
index 03a835a06f..7a5c4fbe9f 100644
--- a/util/scalc/makefile.mk
+++ b/util/scalc/makefile.mk
@@ -30,25 +30,16 @@ TARGET  = util_scalc
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_scalc
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/scalc$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
 
 LINKNAME=scalc
 LINKADDEDFILES= \
    -add scalc.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.cfg \
-   -add scalc.tree $(COMMONMISC)$/LANGUAGE$/scalc.tree \
-   -add scalc.jar  $(COMMONBIN)$/xhp_scalc_LANGUAGE.zip
+   -add scalc.tree $(COMMONMISC)$/LANGUAGE$/scalc.tree
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.cfg \
-   $(COMMONMISC)$/LANGUAGE$/scalc.tree \
-   $(COMMONBIN)$/xhp_scalc_LANGUAGE.zip
+   $(COMMONMISC)$/LANGUAGE$/scalc.tree
 
 
 LINKLINKFILES= \
diff --git a/util/schart/makefile.mk b/util/schart/makefile.mk
index 51c14cea70..9c0d7d0e93 100644
--- a/util/schart/makefile.mk
+++ b/util/schart/makefile.mk
@@ -30,25 +30,16 @@ TARGET  = util_schart
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_schart
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/schart$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
 
 LINKNAME=schart
 LINKADDEDFILES= \
    -add schart.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/schart.cfg \
-   -add schart.tree $(COMMONMISC)$/LANGUAGE$/schart.tree \
-   -add schart.jar  $(COMMONBIN)$/xhp_schart_LANGUAGE.zip
+   -add schart.tree $(COMMONMISC)$/LANGUAGE$/schart.tree
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/schart.cfg \
-   $(COMMONMISC)$/LANGUAGE$/schart.tree \
-   $(COMMONBIN)$/xhp_schart_LANGUAGE.zip
+   $(COMMONMISC)$/LANGUAGE$/schart.tree
 
 
 LINKLINKFILES= \
diff --git a/util/sdatabase/makefile.mk b/util/sdatabase/makefile.mk
index 7fd0c9910a..6c102b2ce1 100644
--- a/util/sdatabase/makefile.mk
+++ b/util/sdatabase/makefile.mk
@@ -30,23 +30,12 @@ TARGET  = util_sdatabase
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_sdatabase
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/shared$/explorer$/database$/main.xhp
-
 LINKNAME=sdatabase
 LINKADDEDFILES= \
-   -add sdatabase.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdatabase.cfg \
-   -add sdatabase.jar  $(COMMONBIN)$/xhp_sdatabase_LANGUAGE.zip
-
+   -add sdatabase.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdatabase.cfg
 
 LINKADDEDDEPS= \
-   $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdatabase.cfg \
-   $(COMMONBIN)$/xhp_sdatabase_LANGUAGE.zip
+   $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdatabase.cfg
 
 
 LINKLINKFILES= \
diff --git a/util/sdraw/makefile.mk b/util/sdraw/makefile.mk
index 18105165f7..21a32ae89d 100644
--- a/util/sdraw/makefile.mk
+++ b/util/sdraw/makefile.mk
@@ -30,23 +30,14 @@ TARGET  = util_sdraw
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_sdraw
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/sdraw$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
 
 LINKNAME=sdraw
 LINKADDEDFILES= \
-   -add sdraw.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdraw.cfg \
-   -add sdraw.jar  $(COMMONBIN)$/xhp_sdraw_LANGUAGE.zip
+   -add sdraw.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdraw.cfg
 
 
 LINKADDEDDEPS= \
-   $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdraw.cfg \
-   $(COMMONBIN)$/xhp_sdraw_LANGUAGE.zip
+   $(PRJ)$/source$/auxiliary$/LANGUAGE$/sdraw.cfg
 
 
 LINKLINKFILES= \
diff --git a/util/shared/makefile.mk b/util/shared/makefile.mk
index e1b6d6ad8a..9c32287bdc 100644
--- a/util/shared/makefile.mk
+++ b/util/shared/makefile.mk
@@ -30,18 +30,10 @@ TARGET  = util_shared
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_shared
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
 
 LINKNAME=shared
 LINKADDEDFILES= \
    -add shared.tree $(COMMONMISC)$/LANGUAGE$/shared.tree \
-   -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 \
@@ -52,7 +44,6 @@ LINKADDEDFILES= \
 
 LINKADDEDDEPS= \
    $(COMMONMISC)$/LANGUAGE$/shared.tree \
-   $(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/util/simpress/makefile.mk b/util/simpress/makefile.mk
index 1744945a7d..71c3d01dbd 100644
--- a/util/simpress/makefile.mk
+++ b/util/simpress/makefile.mk
@@ -30,25 +30,16 @@ TARGET  = util_simpress
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_simpress
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/simpress$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
 
 LINKNAME=simpress
 LINKADDEDFILES= \
    -add simpress.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/simpress.cfg \
-   -add simpress.tree $(COMMONMISC)$/LANGUAGE$/simpress.tree \
-   -add simpress.jar  $(COMMONBIN)$/xhp_simpress_LANGUAGE.zip
+   -add simpress.tree $(COMMONMISC)$/LANGUAGE$/simpress.tree
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/simpress.cfg \
-   $(COMMONMISC)$/LANGUAGE$/simpress.tree \
-   $(COMMONBIN)$/xhp_simpress_LANGUAGE.zip
+   $(COMMONMISC)$/LANGUAGE$/simpress.tree
 
 
 LINKLINKFILES= \
diff --git a/util/smath/makefile.mk b/util/smath/makefile.mk
index 0c2bd0684c..b0f7db51ed 100644
--- a/util/smath/makefile.mk
+++ b/util/smath/makefile.mk
@@ -30,25 +30,15 @@ TARGET  = util_smath
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_smath
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/smath$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-
 LINKNAME=smath
 LINKADDEDFILES= \
    -add smath.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \
-   -add smath.tree $(COMMONMISC)$/LANGUAGE$/smath.tree \
-   -add smath.jar  $(COMMONBIN)$/xhp_smath_LANGUAGE.zip
+   -add smath.tree $(COMMONMISC)$/LANGUAGE$/smath.tree
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \
-   $(COMMONMISC)$/LANGUAGE$/smath.tree \
-   $(COMMONBIN)$/xhp_smath_LANGUAGE.zip
+   $(COMMONMISC)$/LANGUAGE$/smath.tree
 
 
 LINKLINKFILES= \
diff --git a/util/swriter/makefile.mk b/util/swriter/makefile.mk
index 22f51b164a..6db6c0fcb0 100644
--- a/util/swriter/makefile.mk
+++ b/util/swriter/makefile.mk
@@ -30,25 +30,15 @@ TARGET  = util_swriter
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-#common_build_zip:=
-zip1generatedlangs=TRUE
-zip1langdirs=$(aux_alllangiso)
-ZIP1TARGET=xhp_swriter
-ZIP1FLAGS= -u -r
-ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
-ZIP1LIST=$(LANGDIR)$/text$/swriter$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
-
 LINKNAME=swriter
 LINKADDEDFILES= \
    -add swriter.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \
-   -add swriter.tree $(COMMONMISC)$/LANGUAGE$/swriter.tree \
-   -add swriter.jar  $(COMMONBIN)$/xhp_swriter_LANGUAGE.zip
+   -add swriter.tree $(COMMONMISC)$/LANGUAGE$/swriter.tree 
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \
-   $(COMMONMISC)$/LANGUAGE$/swriter.tree \
-   $(COMMONBIN)$/xhp_swriter_LANGUAGE.zip
+   $(COMMONMISC)$/LANGUAGE$/swriter.tree
 
 
 LINKLINKFILES= \
diff --git a/util/target.pmk b/util/target.pmk
index 34ede104c4..043023930a 100644
--- a/util/target.pmk
+++ b/util/target.pmk
@@ -27,5 +27,9 @@ $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:
     $(COMMAND_ECHO)$(HELPLINKER) @$(mktmp -mod $(LINKNAME) -src $(COMMONMISC) -sty $(XSL_DIR)/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@.$(INPATH))
     $(COMMAND_ECHO)$(HELPINDEXER) -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -dir $(MISC)$/ziptmp$(@:b)
     @echo [ building ZIP ] $(@:f)
-    $(COMMAND_ECHO)cd $(MISC)$/ziptmp$(@:b) && zip $(ZIP_VERBOSITY) -rX --filesync zipfile.zip $(LINKNAME).* *.css *.html
+.IF "$(LINKNAME)"=="sdatabase"
+    $(COMMAND_ECHO)cd $(MISC)$/ziptmp$(@:b) && zip $(ZIP_VERBOSITY) -0 -rX --filesync zipfile.zip $(LINKNAME).*
+.ELSE
+    $(COMMAND_ECHO)cd $(MISC)$/ziptmp$(@:b) && zip $(ZIP_VERBOSITY) -0 -rX $(LINKNAME).jar text/$(LINKNAME) && zip $(ZIP_VERBOSITY) -0 -rX --filesync zipfile.zip $(LINKNAME).* *.css *.html
+.ENDIF
     $(COMMAND_ECHO)$(RENAME) $(MISC)$/ziptmp$(@:b)$/zipfile.zip $@