diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 13:41:17 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 13:41:17 +0000 |
commit | dc0c53db2abd77ae481ba30280b153cca47c3230 (patch) | |
tree | 5c583b4e7449e3da488ecebff4723f5ed818cb2f /reportbuilder | |
parent | #i10000# fix from OOO310 (diff) | |
download | core-dc0c53db2abd77ae481ba30280b153cca47c3230.tar.gz core-dc0c53db2abd77ae481ba30280b153cca47c3230.zip |
CWS-TOOLING: integrate CWS rptfix06_DEV300
2009-03-19 08:14:23 +0100 rene r269715 : #i10000#
2009-03-18 23:48:16 +0100 rene r269709 : #i100334# also reportbuilder
2009-03-18 22:39:42 +0100 rene r269706 : #i100334# fix build with system apache-commons
2009-03-18 22:34:24 +0100 rene r269705 : #i100335# build libs only when needed
2009-03-17 13:24:17 +0100 rene r269600 : fix system-* for the SRB
Diffstat (limited to 'reportbuilder')
-rw-r--r-- | reportbuilder/java/com/sun/star/report/makefile.mk | 6 | ||||
-rw-r--r-- | reportbuilder/java/com/sun/star/report/pentaho/makefile.mk | 27 | ||||
-rw-r--r-- | reportbuilder/util/makefile.mk | 5 |
3 files changed, 28 insertions, 10 deletions
diff --git a/reportbuilder/java/com/sun/star/report/makefile.mk b/reportbuilder/java/com/sun/star/report/makefile.mk index 9c5c2998f5c0..5b36aff44ee8 100644 --- a/reportbuilder/java/com/sun/star/report/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/makefile.mk @@ -39,10 +39,10 @@ PACKAGE = com$/sun$/star$/report #----- 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\ diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk index fc2abb55e96a..5d448a6bc2be 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk @@ -41,10 +41,19 @@ nodep=true #----- 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) -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 +.ENDIF + +.IF "$(SYSTEM_APACHE_COMMONS)" == "YES" +XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(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 JAVAFILES := $(shell @$(FIND) . -name "*.java") @@ -94,13 +103,19 @@ CUSTOMMANIFESTFILE = Manifest.mf $(JARTARGETN) : $(COMP) $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES) .ENDIF # "$(JARTARGETN)"!="" -fix_system_jfreereport: - @echo "Fix Java Class-Path entry for JFree JFreeReport libraries from system." +fix_system_libs: + @echo "Fix Java Class-Path entry for libraries from system." +.IF ("$(SYSTEM_JFREEREPORT)" != "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES") + @$(SED) -r -e "s#commons-logging-1.1.1.jar#file://$(COMMONS_LOGGING_JAR)#" \ + -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF +.ENDIF +.IF ("$(SYSTEM_JFREEREPORT)" == "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES") @$(SED) '/flute/,/sac/d' -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF @$(SED) -r -e "s#^Class-Path.*#\0\n file://$(LIBBASE_JAR)\n file://$(SAC_JAR)\n file://$(LIBXML_JAR)\n\ file://$(FLUTE_JAR)\n file://$(JFREEREPORT_JAR)\n file://$(LIBLAYOUT_JAR)\n file://$(LIBLOADER_JAR)\n file://$(LIBFORMULA_JAR)\n\ - file://$(LIBREPOSITORY_JAR)\n file://$(LIBFONTS_JAR)\n file://$(LIBSERIALIZER_JAR)#" \ + file://$(LIBREPOSITORY_JAR)\n file://$(LIBFONTS_JAR)\n file://$(LIBSERIALIZER_JAR)\n file://$(COMMONS_LOGGING_JAR)#" \ -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF +.ENDIF $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties @@-$(MKDIRHIER) $(@:d) diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index 0dd34f039078..6cb9d9808087 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -110,7 +110,10 @@ COMPONENT_EXTJARFILES += \ $(EXTENSIONDIR)$/librepository-1.0.0.jar \ $(EXTENSIONDIR)$/libxml-1.0.0.jar \ $(EXTENSIONDIR)$/flow-engine-0.9.2.jar \ - $(EXTENSIONDIR)$/sac.jar \ + $(EXTENSIONDIR)$/sac.jar +.ENDIF +.IF "$(SYSTEM_APACHE_COMMONS)" != "YES" +COMPONENT_EXTJARFILES += \ $(EXTENSIONDIR)$/commons-logging-1.1.1.jar .ENDIF |