diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-12-03 13:41:14 +0100 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-12-03 13:41:14 +0100 |
commit | 791730540233ce60ffc6ac7a2f74e44db1ee6c05 (patch) | |
tree | ee5a5f0d4c938ccb61dec4d22110ac159ae9e315 /jfreereport/patches/common_build.patch | |
parent | 18b99658a2b7c3f459827931e97d79a02b5ce50f (diff) | |
parent | 620371fb9cc36f4be975b1d1de0f13624a5f84c9 (diff) |
CWS-TOOLING: integrate CWS srb1
Notes
Notes:
split repo tag: extensions_ooo/DEV300_m95
Diffstat (limited to 'jfreereport/patches/common_build.patch')
-rwxr-xr-x | jfreereport/patches/common_build.patch | 76 |
1 files changed, 76 insertions, 0 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> + + + <!--======================================================================= |