GNOME.org
 

ooo-build r15572 - trunk/patches/dev300

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

Log:
more bits for cws-rptfix06.diff

Modified:
   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 22:56:00 2009
@@ -1,16 +1,43 @@
+Index: reportbuilder/java/com/sun/star/report/makefile.mk
+===================================================================
+--- reportbuilder/java/com/sun/star/report/makefile.mk	(.../tags/OOO310_m5)	(Revision 269709)
++++ reportbuilder/java/com/sun/star/report/makefile.mk	(.../cws/rptfix06)	(Revision 269709)
+@@ -39,10 +39,10 @@
+ #----- compile .java files -----------------------------------------
+ 
+ JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
+-.IF "$(SYSTEM_JFREEREPORT)" == "YES"
+-XCLASSPATH!:==$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(COMMONS_LOGGING_JAR)
++.IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
++XCLASSPATH!:==$(XCLASSPATH)$(PATH_SEPERATOR)$(COMMONS_LOGGING_JAR)
+ .ELSE
+-JARFILES += jcommon-1.0.10.jar commons-logging-1.1.1.jar
++JARFILES += commons-logging-1.1.1.jar
+ .ENDIF
+ 
+ JAVAFILES       :=	DataRow.java\
 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 @@
+--- reportbuilder/java/com/sun/star/report/pentaho/makefile.mk	(.../tags/OOO310_m5)	(Revision 269709)
++++ reportbuilder/java/com/sun/star/report/pentaho/makefile.mk	(.../cws/rptfix06)	(Revision 269709)
+@@ -41,12 +41,21 @@
+ #----- compile .java files -----------------------------------------
  JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
  .IF "$(SYSTEM_JFREEREPORT)" == "YES"
- XCLASSPATH!:=$(XCLASSPATH)$(FLUTE_JAR)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(LIBSERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)$(PATH_SEPERATOR)$(COMMONS_LOGGING_JAR)
+-XCLASSPATH!:=$(XCLASSPATH)$(FLUTE_JAR)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(LIBSERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)$(PATH_SEPERATOR)$(COMMONS_LOGGING_JAR)
 -COMP=fix_system_jfreereport
++XCLASSPATH!:=$(XCLASSPATH)$(FLUTE_JAR)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(LIBSERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)
  .ELSE
- JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
+-JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
++JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar
  .ENDIF
  
++.IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
++XCLASSPATH!=$(XCLASSPATH)$(COMMONS_LOGGING_JAR)
++.ELSE
++JARFILES += commons-logging-1.1.1.jar
++.ENDIF
++
 +.IF "$(SYSTEM_JFREEREPORT)" == "YES" || "$(SYSTEM_APACHE_COMMONS)" == "YES"
 +COMP=fix_system_libs
 +.ENDIF
@@ -18,7 +45,7 @@
  JAVAFILES       := $(shell @$(FIND) . -name "*.java")
  # JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/))
  
-@@ -94,13 +97,19 @@
+@@ -94,13 +103,19 @@
  $(JARTARGETN) : $(COMP) $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES)
  .ENDIF          # "$(JARTARGETN)"!=""
  
@@ -43,8 +70,8 @@
  	@@-$(MKDIRHIER) $(@:d)
 Index: reportbuilder/util/makefile.mk
 ===================================================================
---- reportbuilder/util/makefile.mk	(.../tags/OOO310_m5)	(Revision 269706)
-+++ reportbuilder/util/makefile.mk	(.../cws/rptfix06)	(Revision 269706)
+--- reportbuilder/util/makefile.mk	(.../tags/OOO310_m5)	(Revision 269709)
++++ reportbuilder/util/makefile.mk	(.../cws/rptfix06)	(Revision 269709)
 @@ -110,7 +110,10 @@
  	$(EXTENSIONDIR)$/librepository-1.0.0.jar					\
  	$(EXTENSIONDIR)$/libxml-1.0.0.jar							\
@@ -59,8 +86,8 @@
  
 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)
+--- apache-commons/java/lang/makefile.mk	(.../tags/OOO310_m5)	(Revision 269709)
++++ apache-commons/java/lang/makefile.mk	(.../cws/rptfix06)	(Revision 269709)
 @@ -43,7 +43,7 @@
  
  .INCLUDE : antsettings.mk
@@ -81,8 +108,8 @@
  
 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)
+--- apache-commons/java/logging/makefile.mk	(.../tags/OOO310_m5)	(Revision 269709)
++++ apache-commons/java/logging/makefile.mk	(.../cws/rptfix06)	(Revision 269709)
 @@ -43,7 +43,7 @@
  
  .INCLUDE : antsettings.mk
@@ -103,8 +130,8 @@
  
 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)
+--- apache-commons/java/codec/makefile.mk	(.../tags/OOO310_m5)	(Revision 269709)
++++ apache-commons/java/codec/makefile.mk	(.../cws/rptfix06)	(Revision 269709)
 @@ -43,7 +43,7 @@
  
  .INCLUDE : antsettings.mk
@@ -125,8 +152,8 @@
  
 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)
+--- apache-commons/java/httpclient/makefile.mk	(.../tags/OOO310_m5)	(Revision 269709)
++++ apache-commons/java/httpclient/makefile.mk	(.../cws/rptfix06)	(Revision 269709)
 @@ -43,7 +43,7 @@
  
  .INCLUDE : antsettings.mk
@@ -147,8 +174,8 @@
  
 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)
+--- jfreereport/java/libbase/makefile.mk	(.../tags/OOO310_m5)	(Revision 269709)
++++ jfreereport/java/libbase/makefile.mk	(.../cws/rptfix06)	(Revision 269709)
 @@ -66,13 +66,22 @@
  .IF "$(SOLAR_JAVA)" != ""
  .INCLUDE : tg_ext.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]