rpms/openoffice.org/devel workspace.targetedaot.patch,1.5,1.6
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Apr 22 18:11:56 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11222
Modified Files:
workspace.targetedaot.patch
Log Message:
rejig for OOB680
workspace.targetedaot.patch:
bin/deliver.pl | 0
config_office/configure.in | 59 +++++++++++++++++----------
config_office/set_soenv.in | 7 ---
filter/source/config/fragments/makefile.mk | 4 +
filter/source/config/tools/merge/makefile.mk | 3 +
helpcontent2/util/target.pmk | 5 +-
inc/settings.mk | 0
inc/target.mk | 0
inc/tg_jar.mk | 0
prj/d.lst | 0
solenv/bin/deliver.pl | 19 --------
solenv/inc/settings.mk | 5 --
solenv/inc/target.mk | 6 ++
solenv/inc/tg_jar.mk | 14 ++++++
source/com/sun/star/help/makefile.mk | 0
source/config/fragments/makefile.mk | 0
source/config/tools/merge/makefile.mk | 0
util/target.pmk | 0
xmlhelp/prj/d.lst | 1
xmlhelp/source/com/sun/star/help/makefile.mk | 3 +
20 files changed, 75 insertions(+), 51 deletions(-)
Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workspace.targetedaot.patch 22 Apr 2006 17:43:00 -0000 1.5
+++ workspace.targetedaot.patch 22 Apr 2006 18:11:49 -0000 1.6
@@ -150,9 +150,9 @@
+.ELSE
MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+.ENDIF
- PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
-
+ .IF "$(JDK)" == "gcj"
+ XALANCLASS=$(SOLARBINDIR)/xalan.jar
+ CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
Index: source/config/tools/merge/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v
@@ -177,16 +177,16 @@
diff -u -r1.13 target.pmk
--- openoffice.org.orig/helpcontent2/util/target.pmk 16 Mar 2006 11:10:20 -0000 1.13
+++ openoffice.org/helpcontent2/util/target.pmk 22 Apr 2006 16:37:36 -0000
-@@ -50,5 +50,9 @@
+@@ -50,5 +50,8 @@
$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
@+-$(MKDIR) -p $(@:d)
+.IF "$(JAVAAOTCOMPILER)" != ""
+ $(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -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 $@)
+-
++.ELSE
+ 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
-
Index: bin/deliver.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/deliver.pl,v
@@ -241,13 +241,16 @@
diff -u -r1.188 settings.mk
--- openoffice.org.orig/solenv/inc/settings.mk 9 Mar 2006 14:01:40 -0000 1.188
+++ openoffice.org/solenv/inc/settings.mk 22 Apr 2006 16:39:26 -0000
-@@ -188,10 +188,6 @@
+@@ -186,13 +186,8 @@
+ .ENDIF
+
#required arguments
+-.IF "$(JAVACACHE)" != ""
+-JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
+-JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
+-.ELSE
JAVAC=$(JAVACOMPILER)
JAVAI=$(JAVAINTERPRETER)
--.IF "$(JAVACACHE)" != ""
--JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
--JAVAI+=-Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
-.ENDIF
#classpath and response
More information about the fedora-cvs-commits
mailing list