[Libreoffice-commits] .: jfreereport/java jfreereport/patches
Christian Lohmaier
cloph at kemper.freedesktop.org
Sun Jun 12 18:40:52 PDT 2011
jfreereport/java/libbase/makefile.mk | 30 +++++++--------
jfreereport/java/libfonts/makefile.mk | 22 +++++------
jfreereport/java/libloader/makefile.mk | 24 ++++++------
jfreereport/java/librepository/makefile.mk | 24 ++++++------
jfreereport/patches/common_build.patch | 10 ++++-
jfreereport/patches/libbase-1.1.6-deprecated.patch | 11 +++++
jfreereport/patches/libfonts-1.1.6-deprecated.patch | 11 +++++
jfreereport/patches/libloader-1.1.6-deprecated.patch | 11 +++++
jfreereport/patches/librepository-1.1.6-deprecated.patch | 11 +++++
9 files changed, 103 insertions(+), 51 deletions(-)
New commits:
commit f3a2418c42208b76fcab9c88931824d6433379a7
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon Jun 13 03:40:24 2011 +0200
silence warnings in jfreereport
don't attempt to copy nonexisting file
don't use deprecated version of function
also get rid of unnecessary path-delimiter escapes in affected makefiles
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index cdc5015..2c5fc51 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=jfreereport
TARGET=libbase
@@ -33,7 +33,7 @@ TARGET=libbase
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : $(PRJ)/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
@@ -43,7 +43,7 @@ TARFILE_MD5=eeb2c7ddf0d302fba4bfc6e97eac9624
#TARFILE_ROOTDIR=$(TARGET)
TARFILE_IS_FLAT=true
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBBASE_VERSION)-deprecated.patch
CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
@@ -65,27 +65,27 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(L10N_framework)"==""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBBASE_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
-$(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.
# Sucks.
-$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)$/commons-logging.jar
+$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)/commons-logging.jar
-$(CLASSDIR)$/commons-logging.jar :
+$(CLASSDIR)/commons-logging.jar :
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
- $(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging.jar
+ $(COPY) $(SOLARBINDIR)/commons-logging-1.1.1.jar $(CLASSDIR)/commons-logging.jar
.ELSE
- $(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar
+ $(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)/commons-logging.jar
.ENDIF
-$(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
+$(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 594562d..cffe2a9 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=jfreereport
TARGET=libfonts
@@ -34,7 +34,7 @@ TARGET=libfonts
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : $(PRJ)/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
@@ -42,7 +42,7 @@ TARGET=libfonts
TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION)
TARFILE_IS_FLAT=true
TARFILE_MD5=3bdf40c0d199af31923e900d082ca2dd
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBFONTS_VERSION)-deprecated.patch
CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
@@ -63,15 +63,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_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
+$(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/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index 356295b..c0741e3 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=jfreereport
TARGET=libloader
@@ -34,7 +34,7 @@ TARGET=libloader
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : $(PRJ)/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
@@ -42,7 +42,7 @@ TARGET=libloader
TARFILE_NAME=$(TARGET)-$(LIBLOADER_VERSION)
TARFILE_IS_FLAT=true
TARFILE_MD5=97b2d4dba862397f446b217e2b623e71
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBLOADER_VERSION)-deprecated.patch
CONVERTFILES=common_build.xml
.IF "$(L10N_framework)"==""
@@ -64,15 +64,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBLOADER_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
-$(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 38b091e..617572c 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=jfreereport
TARGET=librepository
@@ -34,7 +34,7 @@ TARGET=librepository
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : $(PRJ)/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
@@ -42,7 +42,7 @@ TARGET=librepository
TARFILE_NAME=$(TARGET)-$(LIBREPOSITORY_VERSION)
TARFILE_IS_FLAT=true
TARFILE_MD5=8ce2fcd72becf06c41f7201d15373ed9
-PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+PATCH_FILES=$(PACKAGE_DIR)/$(TARGET).patch $(PRJ)/patches/$(TARGET)-$(LIBREPOSITORY_VERSION)-deprecated.patch
CONVERTFILES=common_build.xml
.IF "$(L10N_framework)"==""
@@ -64,15 +64,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_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
-$(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/patches/common_build.patch b/jfreereport/patches/common_build.patch
index 7cdc7f8..2bc5459 100755
--- a/jfreereport/patches/common_build.patch
+++ b/jfreereport/patches/common_build.patch
@@ -39,7 +39,7 @@
<javac destdir="${classes.dir}"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
-@@ -1082,27 +1082,32 @@
+@@ -1082,27 +1087,32 @@
duplicate copying of resources from src tree (handled by compile.src_copy
if jar.include.source is set.
====================================================================-->
@@ -92,3 +92,11 @@
<!--=======================================================================
+@@ -1167,7 +1177,6 @@
+ <target name="generate.manifest" depends="init,set-build.id">
+ <delete file="${dist.manifest.file}" />
+ <touch file="${dist.manifest.file}" />
+- <copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" />
+
+ <manifest file="${dist.manifest.file}" mode="update">
+ <attribute name="Implementation-Title" value="${impl.title}" />
diff --git a/jfreereport/patches/libbase-1.1.6-deprecated.patch b/jfreereport/patches/libbase-1.1.6-deprecated.patch
new file mode 100644
index 0000000..da28c30
--- /dev/null
+++ b/jfreereport/patches/libbase-1.1.6-deprecated.patch
@@ -0,0 +1,11 @@
+--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2010-04-27 15:58:44.000000000 +0200
++++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2011-06-13 01:28:14.000000000 +0200
+@@ -48,7 +48,7 @@
+ */
+ public ModuleInitializeException(final String s, final Exception e)
+ {
+- super(s, e);
++ super(s, (Throwable) e);
+ }
+
+ /**
diff --git a/jfreereport/patches/libfonts-1.1.6-deprecated.patch b/jfreereport/patches/libfonts-1.1.6-deprecated.patch
new file mode 100644
index 0000000..eb2ab8c
--- /dev/null
+++ b/jfreereport/patches/libfonts-1.1.6-deprecated.patch
@@ -0,0 +1,11 @@
+--- misc/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2010-04-27 16:09:00.000000000 +0200
++++ misc/build/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2011-06-13 02:04:51.000000000 +0200
+@@ -39,7 +39,7 @@
+ */
+ public FontException(final String message, final Exception ex)
+ {
+- super(message, ex);
++ super(message, (Throwable) ex);
+ }
+
+ /**
diff --git a/jfreereport/patches/libloader-1.1.6-deprecated.patch b/jfreereport/patches/libloader-1.1.6-deprecated.patch
new file mode 100644
index 0000000..c098906
--- /dev/null
+++ b/jfreereport/patches/libloader-1.1.6-deprecated.patch
@@ -0,0 +1,11 @@
+--- misc/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2010-04-27 16:07:00.000000000 +0200
++++ misc/build/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2011-06-13 02:00:46.000000000 +0200
+@@ -42,7 +42,7 @@
+ */
+ public ResourceException(final String message, final Exception ex)
+ {
+- super(message, ex);
++ super(message, (Throwable) ex);
+ }
+
+ /**
diff --git a/jfreereport/patches/librepository-1.1.6-deprecated.patch b/jfreereport/patches/librepository-1.1.6-deprecated.patch
new file mode 100644
index 0000000..a266efc
--- /dev/null
+++ b/jfreereport/patches/librepository-1.1.6-deprecated.patch
@@ -0,0 +1,11 @@
+--- misc/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2010-04-27 16:04:50.000000000 +0200
++++ misc/build/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2011-06-13 01:44:35.000000000 +0200
+@@ -43,7 +43,7 @@
+ */
+ public ContentIOException(final String message, final Exception ex)
+ {
+- super(message, ex);
++ super(message, (Throwable) ex);
+ }
+
+ /**
More information about the Libreoffice-commits
mailing list