diff options
| author | René Engelhard <rene@openoffice.org> | 2009-03-17 11:21:36 +0000 |
|---|---|---|
| committer | René Engelhard <rene@openoffice.org> | 2009-03-17 11:21:36 +0000 |
| commit | 96faff5b226c83ab415c844277cb139cd811b96b (patch) | |
| tree | db782b0d72797a09ce14d29818eb382c6770dd2e | |
| parent | 61c35dbc601985c9985ee759fca091193874816c (diff) | |
remove accidential commit to OOO310_m5....ooo/OOO310_m5
| -rw-r--r-- | reportbuilder/java/com/sun/star/report/pentaho/makefile.mk | 17 | ||||
| -rw-r--r-- | reportbuilder/util/makefile.mk | 5 |
2 files changed, 5 insertions, 17 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk index ae4b420..fc2abb5 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk @@ -42,14 +42,11 @@ nodep=true 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 .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 .ENDIF -.IF "$(SYSTEM_JFREEREPORT)" == "YES" || "$(SYSTEM_APACHE_COMMONS)" == "YES" -COMP=fix_system_libs -.ENDIF - JAVAFILES := $(shell @$(FIND) . -name "*.java") # JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/)) @@ -97,19 +94,13 @@ CUSTOMMANIFESTFILE = Manifest.mf $(JARTARGETN) : $(COMP) $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES) .ENDIF # "$(JARTARGETN)"!="" -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") +fix_system_jfreereport: + @echo "Fix Java Class-Path entry for JFree JFreeReport libraries from system." @$(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 file://$(COMMONS_LOGGING_JAR)#" \ + file://$(LIBREPOSITORY_JAR)\n file://$(LIBFONTS_JAR)\n file://$(LIBSERIALIZER_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 6cb9d98..0dd34f0 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -110,10 +110,7 @@ COMPONENT_EXTJARFILES += \ $(EXTENSIONDIR)$/librepository-1.0.0.jar \ $(EXTENSIONDIR)$/libxml-1.0.0.jar \ $(EXTENSIONDIR)$/flow-engine-0.9.2.jar \ - $(EXTENSIONDIR)$/sac.jar -.ENDIF -.IF "$(SYSTEM_APACHE_COMMONS)" != "YES" -COMPONENT_EXTJARFILES += \ + $(EXTENSIONDIR)$/sac.jar \ $(EXTENSIONDIR)$/commons-logging-1.1.1.jar .ENDIF |