Commits

Ocke Janssen [oj]  committed a17f7e9

srb1: #i99049# add new lib from pentaho

  • Participants
  • Parent commits 152a42c

Comments (0)

Files changed (3)

File reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf

 RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
 Class-Path: reportbuilderwizard.jar
-  flute-1.1.2.jar libserializer-1.1.2.jar libbase-1.1.2.jar
-  libfonts-1.1.2.jar libformula-1.1.2.jar liblayout-0.2.9.jar
-  libloader-1.1.2.jar librepository-1.1.2.jar libxml-1.1.2.jar
-  flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
+  flute-1.1.2.jar libserializer-1.1.3.jar libbase-1.1.3.jar
+  libfonts-1.1.3.jar libformula-1.1.3.jar liblayout-0.2.10.jar
+  libloader-1.1.3.jar librepository-1.1.3.jar libxml-1.1.3.jar
+  flow-engine-0.9.4.jar sac.jar commons-logging-1.1.1.jar
 UNO-Type-Path: 

File reportbuilder/java/com/sun/star/report/pentaho/makefile.mk

 nodep=true
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 
 #----- 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)
 .ELSE
-JARFILES += flute-1.1.2.jar libbase-1.1.2.jar libfonts-1.1.2.jar libformula-1.1.2.jar liblayout-0.2.9.jar libloader-1.1.2.jar librepository-1.1.2.jar libxml-1.1.2.jar flow-engine-0.9.2.jar sac.jar
+JARFILES += \
+	flute-$(FLUTE_VERSION).jar				            \
+	libserializer-$(LIBSERIALIZER_VERSION).jar			\
+	libbase-$(LIBBASE_VERSION).jar                      \
+	libfonts-$(LIBFONTS_VERSION).jar					\
+	libformula-$(LIBFORMULA_VERSION).jar				\
+	liblayout-$(LIBLAYOUT_VERSION).jar					\
+	libloader-$(LIBLOADER_VERSION).jar					\
+	librepository-$(LIBREPOSITORY_VERSION).jar			\
+	libxml-$(LIBXML_VERSION).jar						\
+	flow-engine-$(FLOW_ENGINE_VERSION).jar 	            \
+	sac.jar
 .ENDIF
 
 .IF "$(SYSTEM_APACHE_COMMONS)" == "YES"

File reportbuilder/util/makefile.mk

 
 # --- Settings ----------------------------------
 .INCLUDE :  makefile.pmk
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
+
 .IF "$(L10N_framework)"==""
 # ------------------------------------------------------------------
 # calready set in util$/makefile.pmk
 
 .IF "$(SYSTEM_JFREEREPORT)" != "YES"
 COMPONENT_EXTJARFILES += \
-	$(EXTENSIONDIR)$/flute-1.1.2.jar				            \
-	$(EXTENSIONDIR)$/libserializer-1.1.2.jar				    \
-	$(EXTENSIONDIR)$/libbase-1.1.2.jar                          \
-	$(EXTENSIONDIR)$/libfonts-1.1.2.jar							\
-	$(EXTENSIONDIR)$/libformula-1.1.2.jar						\
-	$(EXTENSIONDIR)$/liblayout-0.2.9.jar						\
-	$(EXTENSIONDIR)$/libloader-1.1.2.jar						\
-	$(EXTENSIONDIR)$/librepository-1.1.2.jar					\
-	$(EXTENSIONDIR)$/libxml-1.1.2.jar							\
-	$(EXTENSIONDIR)$/flow-engine-0.9.2.jar 	                    \
+	$(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar				            \
+	$(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar			\
+	$(EXTENSIONDIR)$/libbase-$(LIBBASE_VERSION).jar                     \
+	$(EXTENSIONDIR)$/libfonts-$(LIBFONTS_VERSION).jar					\
+	$(EXTENSIONDIR)$/libformula-$(LIBFORMULA_VERSION).jar						\
+	$(EXTENSIONDIR)$/liblayout-$(LIBLAYOUT_VERSION).jar					\
+	$(EXTENSIONDIR)$/libloader-$(LIBLOADER_VERSION).jar					\
+	$(EXTENSIONDIR)$/librepository-$(LIBREPOSITORY_VERSION).jar			\
+	$(EXTENSIONDIR)$/libxml-$(LIBXML_VERSION).jar						\
+	$(EXTENSIONDIR)$/flow-engine-$(FLOW_ENGINE_VERSION).jar 	        \
 	$(EXTENSIONDIR)$/sac.jar
 .ENDIF
 .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"