ooo-build r15571 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Mar 18 21:56:49 2009
New Revision: 15571
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15571&view=rev

Log:
2009-03-18  Rene Engelhard  <rene debian org>

        * patches/dev300/cws-rptfix06.diff: update with more fixes from cws


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-rptfix06.diff

Modified: trunk/patches/dev300/cws-rptfix06.diff
==============================================================================
--- trunk/patches/dev300/cws-rptfix06.diff	(original)
+++ trunk/patches/dev300/cws-rptfix06.diff	Wed Mar 18 21:56:49 2009
@@ -1,5 +1,7 @@
---- reportbuilder/java/com/sun/star/report/pentaho/makefile.mk-old	2009-03-16 20:23:20.000000000 +0100
-+++ reportbuilder/java/com/sun/star/report/pentaho/makefile.mk	2009-03-16 20:51:45.000000000 +0100
+Index: reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+===================================================================
+--- reportbuilder/java/com/sun/star/report/pentaho/makefile.mk	(.../tags/OOO310_m5)	(Revision 269706)
++++ reportbuilder/java/com/sun/star/report/pentaho/makefile.mk	(.../cws/rptfix06)	(Revision 269706)
 @@ -42,11 +42,14 @@
  JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
  .IF "$(SYSTEM_JFREEREPORT)" == "YES"
@@ -39,8 +41,10 @@
  
  $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
  	@@-$(MKDIRHIER) $(@:d)
---- reportbuilder/util/makefile.mk-old	2009-03-16 20:39:34.000000000 +0100
-+++ reportbuilder/util/makefile.mk	2009-03-16 20:40:21.000000000 +0100
+Index: reportbuilder/util/makefile.mk
+===================================================================
+--- reportbuilder/util/makefile.mk	(.../tags/OOO310_m5)	(Revision 269706)
++++ reportbuilder/util/makefile.mk	(.../cws/rptfix06)	(Revision 269706)
 @@ -110,7 +110,10 @@
  	$(EXTENSIONDIR)$/librepository-1.0.0.jar					\
  	$(EXTENSIONDIR)$/libxml-1.0.0.jar							\
@@ -53,3 +57,123 @@
  	$(EXTENSIONDIR)$/commons-logging-1.1.1.jar
  .ENDIF
  
+Index: apache-commons/java/lang/makefile.mk
+===================================================================
+--- apache-commons/java/lang/makefile.mk	(.../tags/OOO310_m5)	(Revision 269706)
++++ apache-commons/java/lang/makefile.mk	(.../cws/rptfix06)	(Revision 269706)
+@@ -43,7 +43,7 @@
+ 
+ .INCLUDE : antsettings.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
++.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+ # --- Files --------------------------------------------------------
+ 
+ TARFILE_NAME=commons-lang-2.3-src
+@@ -71,7 +71,7 @@
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
++.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+ .INCLUDE : tg_ext.mk
+ .ENDIF
+ 
+Index: apache-commons/java/logging/makefile.mk
+===================================================================
+--- apache-commons/java/logging/makefile.mk	(.../tags/OOO310_m5)	(Revision 269706)
++++ apache-commons/java/logging/makefile.mk	(.../cws/rptfix06)	(Revision 269706)
+@@ -43,7 +43,7 @@
+ 
+ .INCLUDE : antsettings.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
++.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
+ # --- Files --------------------------------------------------------
+ 
+ TARFILE_NAME=commons-logging-1.1.1-src
+@@ -75,7 +75,7 @@
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
++.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
+ .INCLUDE : tg_ext.mk
+ .ENDIF
+ 
+Index: apache-commons/java/codec/makefile.mk
+===================================================================
+--- apache-commons/java/codec/makefile.mk	(.../tags/OOO310_m5)	(Revision 269706)
++++ apache-commons/java/codec/makefile.mk	(.../cws/rptfix06)	(Revision 269706)
+@@ -43,7 +43,7 @@
+ 
+ .INCLUDE : antsettings.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
++.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+ # --- Files --------------------------------------------------------
+ 
+ TARFILE_NAME=commons-codec-1.3-src
+@@ -71,7 +71,7 @@
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
++.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+ .INCLUDE : tg_ext.mk
+ .ENDIF
+ 
+Index: apache-commons/java/httpclient/makefile.mk
+===================================================================
+--- apache-commons/java/httpclient/makefile.mk	(.../tags/OOO310_m5)	(Revision 269706)
++++ apache-commons/java/httpclient/makefile.mk	(.../cws/rptfix06)	(Revision 269706)
+@@ -43,7 +43,7 @@
+ 
+ .INCLUDE : antsettings.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
++.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+ # --- Files --------------------------------------------------------
+ 
+ TARFILE_NAME=commons-httpclient-3.1-src
+@@ -74,7 +74,7 @@
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
++.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+ .INCLUDE : tg_ext.mk
+ .ENDIF
+ 
+Index: jfreereport/java/libbase/makefile.mk
+===================================================================
+--- jfreereport/java/libbase/makefile.mk	(.../tags/OOO310_m5)	(Revision 269706)
++++ jfreereport/java/libbase/makefile.mk	(.../cws/rptfix06)	(Revision 269706)
+@@ -66,13 +66,22 @@
+ .IF "$(SOLAR_JAVA)" != ""
+ .INCLUDE : tg_ext.mk
+ 
+-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)$/commons-logging-1.1.1.jar
+ ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+ 
+-$(CLASSDIR)$/commons-logging-1.1.1.jar : 
+-	$(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging-1.1.1.jar
+-	
+-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging-1.1.1.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
++# XCLASSPATH/CLASSPATH does not work and we only can give lib once. But
++# the build.xmls fortunately take *.jar out of lib so we can copy our
++# commons-logging.jar here - yes, even in the system-apache commons case.
++# Sucks.
++$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)$/commons-logging.jar
++
++$(CLASSDIR)$/commons-logging.jar : 
++.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
++	$(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging.jar
++.ELSE
++	$(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar
++.ENDIF
++
++$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ 	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ .ENDIF
+