diff options
Diffstat (limited to 'jfreereport/patches')
-rwxr-xr-x | jfreereport/patches/common_build.patch | 76 | ||||
-rw-r--r-- | jfreereport/patches/flow-engine.patch | 4 | ||||
-rw-r--r-- | jfreereport/patches/flute.patch | 19 | ||||
-rw-r--r-- | jfreereport/patches/libbase.patch | 19 | ||||
-rw-r--r-- | jfreereport/patches/libfonts.patch | 10 | ||||
-rw-r--r-- | jfreereport/patches/libformula.patch | 27 | ||||
-rw-r--r-- | jfreereport/patches/liblayout.patch | 4 | ||||
-rw-r--r-- | jfreereport/patches/libloader.patch | 11 | ||||
-rw-r--r-- | jfreereport/patches/librepository.patch | 10 | ||||
-rw-r--r-- | jfreereport/patches/libserializer.patch | 10 | ||||
-rw-r--r-- | jfreereport/patches/libxml.patch | 10 |
11 files changed, 80 insertions, 120 deletions
diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch new file mode 100755 index 000000000000..3d5330b9e383 --- /dev/null +++ b/jfreereport/patches/common_build.patch @@ -0,0 +1,76 @@ +--- 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> +@@ -1061,6 +1061,11 @@ + Performs the actual compile + ====================================================================--> + <target name="compile.compile" depends="init"> ++ <copy todir="${classes.dir}"> ++ <fileset dir="source"> ++ <include name="**/*.properties"/> ++ </fileset> ++ </copy> + <javac destdir="${classes.dir}" + debug="${javac.debug}" + deprecation="${javac.deprecation}" +@@ -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> |