incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1201206 - /incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
Date Sat, 12 Nov 2011 06:13:31 GMT
Author: arielch
Date: Sat Nov 12 06:13:30 2011
New Revision: 1201206

URL: http://svn.apache.org/viewvc?rev=1201206&view=rev
Log:
reportbuilder: fix wrong Class-Path when SYSTEM_JFREEREPORT == YES

Modified:
    incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk

Modified: incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk?rev=1201206&r1=1201205&r2=1201206&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk (original)
+++ incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk Sat
Nov 12 06:13:30 2011
@@ -116,8 +116,13 @@ fix_system_libs: $(JARMANIFEST)
 .IF ("$(SYSTEM_JFREEREPORT)" != "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES")
 	@$(SED) -r -e "s#commons-logging-1.1.1.jar#file://$(COMMONS_LOGGING_JAR)#" \
 		-i $<
-.ENDIF
-.IF ("$(SYSTEM_JFREEREPORT)" == "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES")
+.ELIF ("$(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)\n
 commons-logging-1.1.1.jar#" \
+	-i $<
+.ELIF ("$(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\



Mime
View raw message