rpms/openoffice.org/devel workspace.targetedaot.patch,1.7,1.8

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Apr 22 18:53:45 UTC 2006


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19110

Modified Files:
	workspace.targetedaot.patch 
Log Message:
more would be needed

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/antsettings.mk                           |    0 
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/antsettings.mk                    |    8 ---
 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 +
 22 files changed, 76 insertions(+), 58 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- workspace.targetedaot.patch	22 Apr 2006 18:29:31 -0000	1.7
+++ workspace.targetedaot.patch	22 Apr 2006 18:53:42 -0000	1.8
@@ -337,3 +337,30 @@
  
  # --- Targets ------------------------------------------------------
  
+Index: inc/antsettings.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/antsettings.mk,v
+retrieving revision 1.2
+diff -u -r1.2 antsettings.mk
+--- openoffice.org.orig/solenv/inc/antsettings.mk	31 Jan 2006 18:48:27 -0000	1.2
++++ openoffice.org/solenv/inc/antsettings.mk	22 Apr 2006 18:49:44 -0000
+@@ -72,18 +72,12 @@
+ .IF "$(JDK)"=="gcj"
+ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+-ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \
+- -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \
+- -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \
+- -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+- -Dcommon.doc=$(SOLARCOMMONDOCDIR) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+-.ELSE
++.ENDIF
+ ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
+  -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
+  -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
+  -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
+  -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+-.ENDIF
+ .ELSE # No java
+ ANT=
+ ANT_FLAGS=




More information about the fedora-cvs-commits mailing list