diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:20:06 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:20:06 +0000 |
| commit | dfbd9af2386cc4c9a1061c051890b0b5a414f822 (patch) | |
| tree | a245ae5fcc94ce09bd74dc08c34e9711db4c3b73 /helpcontent2/util/target.pmk | |
| parent | 9212b20a283ec02bb09c9e011f5733c61019986b (diff) | |
INTEGRATION: CWS helplinker01 (1.16.20); FILE MERGED
2007/05/24 08:50:14 cmc 1.16.20.2: #i70155# windows tweak, add WRAPCMD
2007/05/20 13:58:18 cmc 1.16.20.1: #i70155# use native HelpLinker
Diffstat (limited to 'helpcontent2/util/target.pmk')
| -rwxr-xr-x | helpcontent2/util/target.pmk | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index 8d671f88fe..a6c0c2727d 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -4,9 +4,9 @@ # # $RCSfile: target.pmk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: vg $ $Date: 2007-02-06 14:12:39 $ +# last change: $Author: ihi $ $Date: 2007-06-05 10:20:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -36,27 +36,7 @@ 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 -.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 - + $(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 $@) |