#i10000# removal of cws helplinker01

10 files changed, 68 insertions, 21 deletions

diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index fba81387dd..a750a63db7 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:20:29 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:20:35 $
 #*
-#*    $Revision: 1.29 $
+#*    $Revision: 1.30 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_sbasic
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_sbasic
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/sbasic$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=sbasic
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index 36edd42d7e..d37282a23d 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:20:46 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:22:12 $
 #*
-#*    $Revision: 1.33 $
+#*    $Revision: 1.34 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_scalc
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_scalc
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/scalc$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=scalc
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index a41a1702d8..13abe2db10 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:21:07 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:23:29 $
 #*
-#*    $Revision: 1.18 $
+#*    $Revision: 1.19 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_schart
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_schart
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/schart$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=schart
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index be10dca7b2..4c25219754 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:21:30 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:27:01 $
 #*
-#*    $Revision: 1.18 $
+#*    $Revision: 1.19 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_sdatabase
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_sdatabase
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/shared$/explorer$/database$/main.xhp
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=sdatabase
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index f069eb6ca7..7bb8ce27a4 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:21:56 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:28:42 $
 #*
-#*    $Revision: 1.30 $
+#*    $Revision: 1.31 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_sdraw
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_sdraw
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/sdraw$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=sdraw
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/shared/makefile.mk b/helpcontent2/util/shared/makefile.mk
index 9bf8689d15..3cb8c2e073 100644
--- a/helpcontent2/util/shared/makefile.mk
+++ b/helpcontent2/util/shared/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:22:16 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:29:59 $
 #*
-#*    $Revision: 1.16 $
+#*    $Revision: 1.17 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_shared
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_shared
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=shared
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index 8aaf6af836..5ee17ede47 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:22:47 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:31:27 $
 #*
-#*    $Revision: 1.29 $
+#*    $Revision: 1.30 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_simpress
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_simpress
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/simpress$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=simpress
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index f8be261823..c7cc06fcba 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:23:07 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:33:17 $
 #*
-#*    $Revision: 1.28 $
+#*    $Revision: 1.29 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_smath
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_smath
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/smath$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=smath
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 0d78bca3b2..958a8fc4ae 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: ihi $ $Date: 2007-06-05 10:23:24 $
+#*    last change       $Author: vg $ $Date: 2007-06-08 16:34:19 $
 #*
-#*    $Revision: 1.32 $
+#*    $Revision: 1.33 $
 #*
 #*    $Logfile:$
 #*
@@ -26,6 +26,7 @@ TARGET  = util_swriter
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
+.IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
@@ -33,6 +34,8 @@ ZIP1TARGET=xhp_swriter
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/swriter$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created"
+.ENDIF			# "$(SOLAR_JAVA)"!=""
+
 
 LINKNAME=swriter
 LINKADDEDFILES= \
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk
index a6c0c2727d..a335947196 100755
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: target.pmk,v $
 #
-#   $Revision: 1.17 $
+#   $Revision: 1.18 $
 #
-#   last change: $Author: ihi $ $Date: 2007-06-05 10:20:06 $
+#   last change: $Author: vg $ $Date: 2007-06-08 16:35:26 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -36,7 +36,27 @@
 LINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(BIN)$/$(LINKNAME)_$i.zip)
 LINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES)))
 
+.IF "$(SOLAR_JAVA)"!=""
 ALLTAR : $(LINKALLTARGETS)
+.ENDIF
+
+.IF "$(SYSTEM_DB)" != "YES"
+JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
+.ENDIF
+
+.IF "$(JDK)" != "gcj"
+JAVA_VM_HEAP_SIZE = -Xms256m -Xmx256m
+.ENDIF
+
+.IF "$(JAVAAOTCOMPILER)" != ""
+CLASSPATH!:=$(my_cp)
+.EXPORT : CLASSPATH
+.ENDIF
 
 $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
-    $(WRAPCMD) HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+.IF "$(JAVAAOTCOMPILER)" != ""
+    com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+.ELSE
+    $(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+.ENDIF
+