diff options
51 files changed, 280 insertions, 236 deletions
diff --git a/jfreereport/download/core.zip b/jfreereport/download/core.zip Binary files differdeleted file mode 100644 index 813d87d49573..000000000000 --- a/jfreereport/download/core.zip +++ /dev/null diff --git a/jfreereport/download/flow-engine-0.9.4.zip b/jfreereport/download/flow-engine-0.9.4.zip Binary files differnew file mode 100644 index 000000000000..f6ef1decf09e --- /dev/null +++ b/jfreereport/download/flow-engine-0.9.4.zip diff --git a/jfreereport/download/flute-1.1.2.zip b/jfreereport/download/flute-1.1.2.zip Binary files differnew file mode 100644 index 000000000000..bd1059fd728e --- /dev/null +++ b/jfreereport/download/flute-1.1.2.zip diff --git a/jfreereport/download/flute.zip b/jfreereport/download/flute.zip Binary files differdeleted file mode 100644 index ff1ade906ad4..000000000000 --- a/jfreereport/download/flute.zip +++ /dev/null diff --git a/jfreereport/download/libbase-1.1.3.zip b/jfreereport/download/libbase-1.1.3.zip Binary files differnew file mode 100644 index 000000000000..990b09ab2c55 --- /dev/null +++ b/jfreereport/download/libbase-1.1.3.zip diff --git a/jfreereport/download/libbase.zip b/jfreereport/download/libbase.zip Binary files differdeleted file mode 100644 index 88f555d9ef7c..000000000000 --- a/jfreereport/download/libbase.zip +++ /dev/null diff --git a/jfreereport/download/libfonts-1.1.3.zip b/jfreereport/download/libfonts-1.1.3.zip Binary files differnew file mode 100644 index 000000000000..cfb5b7cde3cd --- /dev/null +++ b/jfreereport/download/libfonts-1.1.3.zip diff --git a/jfreereport/download/libfonts.zip b/jfreereport/download/libfonts.zip Binary files differdeleted file mode 100644 index 91fbac87b3a6..000000000000 --- a/jfreereport/download/libfonts.zip +++ /dev/null diff --git a/jfreereport/download/libformat-1.1.3.zip b/jfreereport/download/libformat-1.1.3.zip Binary files differnew file mode 100644 index 000000000000..a1ebea8712e7 --- /dev/null +++ b/jfreereport/download/libformat-1.1.3.zip diff --git a/jfreereport/download/libformula-1.1.3.zip b/jfreereport/download/libformula-1.1.3.zip Binary files differnew file mode 100644 index 000000000000..42ed0f764e6f --- /dev/null +++ b/jfreereport/download/libformula-1.1.3.zip diff --git a/jfreereport/download/libformula.zip b/jfreereport/download/libformula.zip Binary files differdeleted file mode 100644 index c819c963767e..000000000000 --- a/jfreereport/download/libformula.zip +++ /dev/null diff --git a/jfreereport/download/liblayout-0.2.10.zip b/jfreereport/download/liblayout-0.2.10.zip Binary files differnew file mode 100644 index 000000000000..905a7bff6779 --- /dev/null +++ b/jfreereport/download/liblayout-0.2.10.zip diff --git a/jfreereport/download/liblayout.zip b/jfreereport/download/liblayout.zip Binary files differdeleted file mode 100644 index 1311fae496f5..000000000000 --- a/jfreereport/download/liblayout.zip +++ /dev/null diff --git a/jfreereport/download/libloader-1.1.3.zip b/jfreereport/download/libloader-1.1.3.zip Binary files differnew file mode 100644 index 000000000000..593c8f327575 --- /dev/null +++ b/jfreereport/download/libloader-1.1.3.zip diff --git a/jfreereport/download/libloader.zip b/jfreereport/download/libloader.zip Binary files differdeleted file mode 100644 index 505329e0b6ea..000000000000 --- a/jfreereport/download/libloader.zip +++ /dev/null diff --git a/jfreereport/download/librepository-1.1.3.zip b/jfreereport/download/librepository-1.1.3.zip Binary files differnew file mode 100644 index 000000000000..79e9c2e443bf --- /dev/null +++ b/jfreereport/download/librepository-1.1.3.zip diff --git a/jfreereport/download/librepository.zip b/jfreereport/download/librepository.zip Binary files differdeleted file mode 100644 index 9541579941cf..000000000000 --- a/jfreereport/download/librepository.zip +++ /dev/null diff --git a/jfreereport/download/libserializer-1.1.3.zip b/jfreereport/download/libserializer-1.1.3.zip Binary files differnew file mode 100644 index 000000000000..4bfd509cbb46 --- /dev/null +++ b/jfreereport/download/libserializer-1.1.3.zip diff --git a/jfreereport/download/libserializer.zip b/jfreereport/download/libserializer.zip Binary files differdeleted file mode 100644 index 94823b28e614..000000000000 --- a/jfreereport/download/libserializer.zip +++ /dev/null diff --git a/jfreereport/download/libxml-1.1.3.zip b/jfreereport/download/libxml-1.1.3.zip Binary files differnew file mode 100644 index 000000000000..0fe02e346e04 --- /dev/null +++ b/jfreereport/download/libxml-1.1.3.zip diff --git a/jfreereport/download/libxml.zip b/jfreereport/download/libxml.zip Binary files differdeleted file mode 100644 index be5cecb2490e..000000000000 --- a/jfreereport/download/libxml.zip +++ /dev/null diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk index 5c949ad4e7f1..42b8fdd3062b 100644 --- a/jfreereport/java/flute/makefile.mk +++ b/jfreereport/java/flute/makefile.mk @@ -33,28 +33,27 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=flute -VERSION=-1.3.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) -# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -# CONVERTFILES=build.xml - +TARFILE_NAME=$(TARGET)-$(FLUTE_VERSION) +TARFILE_IS_FLAT=true +PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +CONVERTFILES=common_build.xml .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" @@ -68,9 +67,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk .IF "$(L10N_framework)"=="" -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar + +$(PACKAGE_DIR)$/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(FLUTE_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy + +$(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(FLUTE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk index 6e83b0e23932..2c630f34b4ea 100644 --- a/jfreereport/java/jfreereport/makefile.mk +++ b/jfreereport/java/jfreereport/makefile.mk @@ -33,20 +33,19 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=flow-engine -VERSION=-0.9.2 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" -TARFILE_NAME=core -TARFILE_ROOTDIR=core +TARFILE_NAME=$(TARGET)-$(FLOW_ENGINE_VERSION) +TARFILE_IS_FLAT=true PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -# ADDITIONAL_FILES=MANIFEST.MF CONVERTFILES=build.xml .IF "$(JAVACISGCJ)"=="yes" @@ -67,8 +66,8 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk .IF "$(L10N_framework)"=="" -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar +$(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk index 9c1d8cf18660..04acff1621b3 100644 --- a/jfreereport/java/libbase/makefile.mk +++ b/jfreereport/java/libbase/makefile.mk @@ -33,27 +33,28 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=libbase -VERSION=-1.0.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) +TARFILE_NAME=$(TARGET)-$(LIBBASE_VERSION) +#TARFILE_ROOTDIR=$(TARGET) +TARFILE_IS_FLAT=true -# PATCH_FILES=$(PRJ)$/patches$/libbase.patch -# CONVERTFILES=build.xml +PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +CONVERTFILES=common_build.xml .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" @@ -67,8 +68,13 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(L10N_framework)"=="" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBBASE_VERSION).jar +$(PACKAGE_DIR)$/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBBASE_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy + # XCLASSPATH/CLASSPATH does not work and we only can give lib once. But # the build.xmls fortunately take *.jar out of lib so we can copy our # commons-logging.jar here - yes, even in the system-apache commons case. @@ -82,7 +88,7 @@ $(CLASSDIR)$/commons-logging.jar : $(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar .ENDIF -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +$(CLASSDIR)$/$(TARGET)-$(LIBBASE_VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBBASE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBBASE_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk index e7f6b174ad45..4de9039f1f8f 100644 --- a/jfreereport/java/libfonts/makefile.mk +++ b/jfreereport/java/libfonts/makefile.mk @@ -33,27 +33,27 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=libfonts -VERSION=-1.0.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) -PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -CONVERTFILES=build.xml +TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION) +TARFILE_IS_FLAT=true +PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +CONVERTFILES=common_build.xml .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" @@ -66,9 +66,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar + +$(PACKAGE_DIR)$/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFONTS_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy + +$(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBFONTS_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk index 35a5b0407740..5256b06956ab 100644 --- a/jfreereport/java/libformula/makefile.mk +++ b/jfreereport/java/libformula/makefile.mk @@ -33,29 +33,27 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=libformula -VERSION=-0.2.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) -PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -CONVERTFILES=build.xml \ - source$/org$/pentaho$/reporting$/libraries$/formula$/function$/datetime$/DateDifFunction.java \ - source$/org$/pentaho$/reporting$/libraries$/formula$/lvalues$/FormulaFunction.java +TARFILE_NAME=$(TARGET)-$(LIBFORMULA_VERSION) +TARFILE_IS_FLAT=true +PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +CONVERTFILES=common_build.xml .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -f $(ANT_BUILDFILE) jar .ENDIF @@ -69,9 +67,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar + +$(PACKAGE_DIR)$/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFORMULA_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy + +$(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBFORMULA_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar .ENDIF # $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties : diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk index 30633b040ef7..7a47e736ec17 100644 --- a/jfreereport/java/liblayout/makefile.mk +++ b/jfreereport/java/liblayout/makefile.mk @@ -33,18 +33,18 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=liblayout -VERSION=-0.2.9 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) +TARFILE_NAME=$(TARGET)-$(LIBLAYOUT_VERSION) +TARFILE_IS_FLAT=true PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch CONVERTFILES=build.xml @@ -66,9 +66,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar +$(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk index 6b6e95da5490..22757ffc969a 100644 --- a/jfreereport/java/libloader/makefile.mk +++ b/jfreereport/java/libloader/makefile.mk @@ -33,27 +33,28 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=libloader -VERSION=-1.0.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) -PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -CONVERTFILES=build.xml +TARFILE_NAME=$(TARGET)-$(LIBLOADER_VERSION) +TARFILE_IS_FLAT=true +PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +CONVERTFILES=common_build.xml + .IF "$(L10N_framework)"=="" .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" @@ -66,9 +67,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar + +$(PACKAGE_DIR)$/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBLOADER_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy + +$(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBLOADER_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk index 7ab0fd6ce623..5b620164340a 100644 --- a/jfreereport/java/librepository/makefile.mk +++ b/jfreereport/java/librepository/makefile.mk @@ -33,27 +33,28 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=librepository -VERSION=-1.0.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) -PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -CONVERTFILES=build.xml +TARFILE_NAME=$(TARGET)-$(LIBREPOSITORY_VERSION) +TARFILE_IS_FLAT=true +PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +CONVERTFILES=common_build.xml + .IF "$(L10N_framework)"=="" .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" @@ -66,9 +67,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar + +$(PACKAGE_DIR)$/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBREPOSITORY_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy + +$(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk index 04b4fdb8e760..b734bc220bef 100644 --- a/jfreereport/java/libserializer/makefile.mk +++ b/jfreereport/java/libserializer/makefile.mk @@ -33,27 +33,27 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=libserializer -VERSION=-1.0.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) -PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -CONVERTFILES=build.xml +TARFILE_NAME=$(TARGET)-$(LIBSERIALIZER_VERSION) +TARFILE_IS_FLAT=true +PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +CONVERTFILES=common_build.xml .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" @@ -66,9 +66,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar + +$(PACKAGE_DIR)$/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBSERIALIZER_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy + +$(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk index 708cdcbe2f0a..65f20ddbb58b 100644 --- a/jfreereport/java/libxml/makefile.mk +++ b/jfreereport/java/libxml/makefile.mk @@ -33,27 +33,27 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=libxml -VERSION=-1.0.0 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : antsettings.mk +.INCLUDE : $(PRJ)$/version.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" -TARFILE_NAME=$(TARGET) -TARFILE_ROOTDIR=$(TARGET) -PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch -CONVERTFILES=build.xml +TARFILE_NAME=$(TARGET)-$(LIBXML_VERSION) +TARFILE_IS_FLAT=true +PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch +CONVERTFILES=common_build.xml .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" @@ -66,9 +66,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" .IF "$(SOLAR_JAVA)" != "" .INCLUDE : tg_ext.mk -ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar -$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) - $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar +ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar + +$(PACKAGE_DIR)$/$(TARGET).patch : + @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) + ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBXML_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch ) + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy + +$(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBXML_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar .ENDIF .ENDIF diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk index f0982691b3a1..43aa15fe2db5 100644 --- a/jfreereport/java/sac/makefile.mk +++ b/jfreereport/java/sac/makefile.mk @@ -61,9 +61,9 @@ ADDITIONAL_FILES=build.xml .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) all .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch new file mode 100644 index 000000000000..69b5d734b4d7 --- /dev/null +++ b/jfreereport/patches/common_build.patch @@ -0,0 +1,64 @@ +--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100 ++++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100 +@@ -497,7 +497,7 @@ + Sets a property build.id to the either "development" or the svn revision + if in release mode + ====================================================================--> +- <target name="set-build.id" unless="build.id" depends="install-antcontrib"> ++ <target name="set-build.id" unless="build.id" > + <if> + <istrue value="${release}" /> + <then> +@@ -1082,27 +1082,32 @@ + duplicate copying of resources from src tree (handled by compile.src_copy + if jar.include.source is set. + ====================================================================--> +- <target name="compile.res_copy" depends="install-antcontrib"> +- <if> +- <available file="${res.dir}" /> +- <then> +- <copy todir="${classes.dir}"> +- <fileset dir="${res.dir}" /> +- </copy> +- </then> +- </if> ++ <target name="compile.res_copy" > ++ <condition property="copy.res.available"> ++ <available file="$(res.dir)" type="dir" /> ++ </condition> ++ <antcall target="copy.res" /> + +- <if> +- <not> +- <isset property="jar.include.source" /> +- </not> +- <then> +- <copy todir="${classes.dir}" flatten="false"> +- <fileset dir="${src.dir}" excludes="**/*.java" /> +- </copy> +- </then> +- </if> +- </target> ++ <condition property="copy.res.class.available"> ++ <not> ++ <isset property="jar.include.source" /> ++ </not> ++ </condition> ++ <antcall target="copy.res.class" /> ++ </target> ++ ++ <target name="copy.res" if="copy.res.available" > ++ <copy todir="${classes.dir}"> ++ <fileset dir="${res.dir}"/> ++ </copy> ++ </target> ++ ++ <target name="copy.res.class" if="copy.res.class.available" > ++ <uptodate targetfile="${classes.dir}" property="s"> ++ <srcfiles dir= "${src.dir}" excludes="**/*.java" /> ++ <flattenmapper/> ++ </uptodate> ++ </target> + + + <!--======================================================================= diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch index 13da432113fb..aef70cb7fef6 100644 --- a/jfreereport/patches/flow-engine.patch +++ b/jfreereport/patches/flow-engine.patch @@ -1,5 +1,5 @@ ---- misc/core/build.xml (Revision 6728) -+++ misc/build/core/build.xml (Arbeitskopie) +--- misc/flow-engine-0.9.4/build.xml (Revision 6728) ++++ misc/build/flow-engine-0.9.4/build.xml (Arbeitskopie) @@ -24,6 +24,6 @@ <!-- Setup the compile classpath --> <path id="classpath"> diff --git a/jfreereport/patches/flute.patch b/jfreereport/patches/flute.patch deleted file mode 100644 index aad7756c3b65..000000000000 --- a/jfreereport/patches/flute.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- misc/flute/build.xml (Revision 6820) -+++ misc/build/flute/build.xml (Arbeitskopie) -@@ -9,6 +9,7 @@ - <property name="build.doc" value="${build}/api"/> - <property name="build.lib" value="${build}/lib"/> - <property name="packagenames" value="org.w3c.flute.*"/> -+ <property name="lib" value="lib"/> - - <!-- Targets --> - <!-- Prepare build directories --> -@@ -21,7 +22,7 @@ - - <!-- Setup the compile classpath --> - <path id="classpath"> -- <fileset dir="lib"> -+ <fileset dir="${lib}"> - <include name="*.jar" /> - </fileset> - </path> diff --git a/jfreereport/patches/libbase.patch b/jfreereport/patches/libbase.patch deleted file mode 100644 index f6a7560de145..000000000000 --- a/jfreereport/patches/libbase.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- misc/libbase/build.xml (Revision 6728) -+++ misc/build/libbase/build.xml (Arbeitskopie) -@@ -6,6 +6,7 @@ - <property name="build.classes" value="${build}/classes"/> - <property name="build.doc" value="${build}/api"/> - <property name="build.lib" value="${build}/lib"/> -+ <property name="lib" value="lib"/> - - <!-- Targets --> - <!-- Prepare build directories --> -@@ -18,7 +19,7 @@ - - <!-- Setup the compile classpath --> - <path id="classpath"> -- <fileset dir="lib"> -+ <fileset dir="${lib}"> - <include name="*.jar" /> - </fileset> - </path> diff --git a/jfreereport/patches/libfonts.patch b/jfreereport/patches/libfonts.patch deleted file mode 100644 index 63c5a1a48f93..000000000000 --- a/jfreereport/patches/libfonts.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/libfonts/build.xml (Revision 6728) -+++ misc/build/libfonts/build.xml (Arbeitskopie) -@@ -23,6 +23,6 @@ - <!-- Setup the compile classpath --> - <path id="classpath"> -- <fileset dir="lib"> -+ <fileset dir="${lib}"> - <include name="*.jar" /> - </fileset> - </path> diff --git a/jfreereport/patches/libformula.patch b/jfreereport/patches/libformula.patch deleted file mode 100644 index 07968b448675..000000000000 --- a/jfreereport/patches/libformula.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- misc/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java 2008-12-12 13:04:46.000000000 +0100 -+++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java 2008-12-15 08:15:18.293125000 +0100 -@@ -198,12 +198,6 @@ - LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE); - } - -- if (res < 0) -- { -- throw new EvaluationException( -- LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE); -- } -- - //noinspection UnpredictableBigDecimalConstructorCall - return new TypeValuePair(NumberType.GENERIC_NUMBER, new BigDecimal((double) res)); - } ---- misc/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java 2008-12-12 13:04:46.000000000 +0100 -+++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java 2008-12-15 08:13:14.308750000 +0100 -@@ -161,7 +161,8 @@ - - for (int i = 0; i < parameters.length; i++) - { -- parameters[i].initialize(context); -+ if ( parameters[i] != null ) -+ parameters[i].initialize(context); - } - } - diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch index ef9cb5bb06b3..4b1c23100987 100644 --- a/jfreereport/patches/liblayout.patch +++ b/jfreereport/patches/liblayout.patch @@ -1,5 +1,5 @@ ---- misc/liblayout/build.xml (Revision 6728) -+++ misc/build/liblayout/build.xml (Arbeitskopie) +--- misc/liblayout-0.2.10/build.xml (Revision 6728) ++++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie) @@ -24,6 +24,6 @@ <!-- Setup the compile classpath --> <path id="classpath"> diff --git a/jfreereport/patches/libloader.patch b/jfreereport/patches/libloader.patch deleted file mode 100644 index 82a2624855a9..000000000000 --- a/jfreereport/patches/libloader.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libloader/build.xml 2009-02-12 18:01:56.000000000 +0100 -+++ misc/build/libloader/build.xml 2009-02-13 09:57:21.856601684 +0100 -@@ -23,7 +23,7 @@ - - <!-- Setup the compile classpath --> - <path id="classpath"> -- <fileset dir="lib"> -+ <fileset dir="${lib}"> - <include name="*.jar" /> - </fileset> - </path> diff --git a/jfreereport/patches/librepository.patch b/jfreereport/patches/librepository.patch deleted file mode 100644 index 8a981595798c..000000000000 --- a/jfreereport/patches/librepository.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/librepository/build.xml (Revision 6728) -+++ misc/build/librepository/build.xml (Arbeitskopie) -@@ -24,6 +24,6 @@ - <!-- Setup the compile classpath --> - <path id="classpath"> -- <fileset dir="lib"> -+ <fileset dir="${lib}"> - <include name="*.jar" /> - </fileset> - </path> diff --git a/jfreereport/patches/libserializer.patch b/jfreereport/patches/libserializer.patch deleted file mode 100644 index 830fdb9ca348..000000000000 --- a/jfreereport/patches/libserializer.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/libserializer/build.xml (Revision 6728) -+++ misc/build/libserializer/build.xml (Arbeitskopie) -@@ -24,6 +24,6 @@ - <!-- Setup the compile classpath --> - <path id="classpath"> -- <fileset dir="lib"> -+ <fileset dir="${lib}"> - <include name="*.jar" /> - </fileset> - </path> diff --git a/jfreereport/patches/libxml.patch b/jfreereport/patches/libxml.patch deleted file mode 100644 index 50981a462de2..000000000000 --- a/jfreereport/patches/libxml.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/libxml/build.xml (Revision 6728) -+++ misc/build/libxml/build.xml (Arbeitskopie) -@@ -24,6 +24,6 @@ - <!-- Setup the compile classpath --> - <path id="classpath"> -- <fileset dir="lib"> -+ <fileset dir="${lib}"> - <include name="*.jar" /> - </fileset> - </path> diff --git a/jfreereport/prj/d.lst b/jfreereport/prj/d.lst index a63f3a1312d5..2527cc676782 100644 --- a/jfreereport/prj/d.lst +++ b/jfreereport/prj/d.lst @@ -1 +1,2 @@ ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar +..\version.mk %_DEST%\bin%_EXT%\jfreereport_version.mk diff --git a/jfreereport/version.mk b/jfreereport/version.mk new file mode 100644 index 000000000000..999cb290d755 --- /dev/null +++ b/jfreereport/version.mk @@ -0,0 +1,12 @@ +FLUTE_VERSION=1.1.2 +LIBBASE_VERSION=1.1.3 +LIBFONTS_VERSION=1.1.3 +LIBFORMAT_VERSION=1.1.3 +LIBFORMULA_VERSION=1.1.3 +LIBLAYOUT_VERSION=0.2.10 +LIBLOADER_VERSION=1.1.3 +LIBREPOSITORY_VERSION=1.1.3 +LIBSERIALIZER_VERSION=1.1.3 +LIBXML_VERSION=1.1.3 +FLOW_ENGINE_VERSION=0.9.4 + diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk index 1025bcea7cb7..90060e44db32 100644 --- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk @@ -36,12 +36,15 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk #----- compile .java files ----------------------------------------- .IF "$(SYSTEM_JFREEREPORT)" == "YES" CLASSPATH!:==$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR) .ELSE -JARFILES += libbase-1.0.0.jar libformula-0.2.0.jar +JARFILES += \ + libbase-$(LIBBASE_VERSION).jar \ + libformula-$(LIBFORMULA_VERSION).jar .ENDIF JAVAFILES := AuthorFunction.java \ diff --git a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf index 70f3ff695cbb..ac543733876b 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf +++ b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf @@ -1,7 +1,7 @@ RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory Class-Path: reportbuilderwizard.jar - flute-1.3.0.jar libserializer-1.0.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 + 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: diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java index fc6021202e68..c093e5b9d8ef 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java @@ -35,6 +35,7 @@ import java.util.HashMap; import com.sun.star.report.InputRepository; import org.pentaho.reporting.libraries.resourceloader.ResourceData; +import org.pentaho.reporting.libraries.resourceloader.ResourceException; import org.pentaho.reporting.libraries.resourceloader.ResourceKey; import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException; import org.pentaho.reporting.libraries.resourceloader.ResourceLoader; @@ -169,4 +170,19 @@ public class InputRepositoryLoader implements ResourceLoader { return resourceManager; } + + public boolean isSupportedDeserializer(String string) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public String serialize(ResourceKey rk, ResourceKey rk1) throws ResourceException + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public ResourceKey deserialize(ResourceKey rk, String string) throws ResourceKeyCreationException + { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk index 36e83afac2d0..a26c4fde3ad8 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk @@ -37,13 +37,25 @@ PACKAGE = com$/sun$/star$/report$/pentaho 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.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 +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" diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk index 5ef3f02b0a1f..8962f3f69e12 100644 --- a/reportbuilder/java/com/sun/star/report/util/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk @@ -36,12 +36,16 @@ PACKAGE = com$/sun$/star$/report$/util # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk #----- compile .java files ----------------------------------------- .IF "$(SYSTEM_JFREEREPORT)" == "YES" CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR) .ELSE -JARFILES = libbase-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar +JARFILES += \ + libbase-$(LIBBASE_VERSION).jar \ + libxml-$(LIBXML_VERSION).jar \ + flow-engine-$(FLOW_ENGINE_VERSION).jar .ENDIF JAVAFILES = DefaultJobProperties.java DefaultParameterMap.java DefaultReportJobDefinition.java ManifestWriter.java diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index cd65b814abf9..78d6b6993ffb 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -32,7 +32,7 @@ PRJ=.. PRJNAME=reportbuilder TARGET=rpt -EXTENSION_VERSION_BASE=1.2.0 +EXTENSION_VERSION_BASE=1.2.1 .IF "$(CWS_WORK_STAMP)" == "" EXTENSION_VERSION=$(EXTENSION_VERSION_BASE) @@ -42,6 +42,8 @@ EXTENSION_VERSION_BASE=1.2.0 # --- Settings ---------------------------------- .INCLUDE : makefile.pmk +.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk + .IF "$(L10N_framework)"=="" # ------------------------------------------------------------------ # calready set in util$/makefile.pmk @@ -100,16 +102,16 @@ COMPONENT_EXTJARFILES = \ .IF "$(SYSTEM_JFREEREPORT)" != "YES" COMPONENT_EXTJARFILES += \ - $(EXTENSIONDIR)$/flute-1.3.0.jar \ - $(EXTENSIONDIR)$/libserializer-1.0.0.jar \ - $(EXTENSIONDIR)$/libbase-1.0.0.jar \ - $(EXTENSIONDIR)$/libfonts-1.0.0.jar \ - $(EXTENSIONDIR)$/libformula-0.2.0.jar \ - $(EXTENSIONDIR)$/liblayout-0.2.9.jar \ - $(EXTENSIONDIR)$/libloader-1.0.0.jar \ - $(EXTENSIONDIR)$/librepository-1.0.0.jar \ - $(EXTENSIONDIR)$/libxml-1.0.0.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" |