From 0b6d78a5ce99a40a4d51a48caff5e9cd5558d94c Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Wed, 21 Feb 2007 14:35:46 +0000
Subject: [PATCH] * Update Java class file version to 1.4 in javac task. *
 Exclude ant classpath in javac task. * Exclude apache-dom.jar in binary
 build, include it in source build. * Change tarfilesets and zipfilesets to
 use include and exclude elements   instead of attributes.

---
 build/build.xml | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index efce742a..c1be80ca 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -100,12 +100,13 @@
         <replace file="${build.work}/src/helma/main/Server.java"
             token="__builddate__" value="${TODAY}"/>
         <javac srcdir="${build.work}/src"
-            source="1.3"
-            target="1.3"
+            source="1.4"
+            target="1.4"
             destdir="${build.classes}"
             debug="${debug}"
             deprecation="${deprecation}"
-            optimize="${optimize}">
+            optimize="${optimize}"
+            includeAntRuntime="no">
             <classpath refid="build.class.path" />
         </javac>
         <delete dir="${build.work}/src"/>
@@ -367,6 +368,7 @@
                 <include name="**"/>
                 <exclude name="start.sh"/>
                 <exclude name="**/jimi.jar"/>
+                <exclude name="**/apache-dom.jar"/>
             </tarfileset>
         </tar>
         <gzip zipfile="${build.dist}/${filename}.tar.gz" src="${build.dist}/${filename}.tar"/>
@@ -382,7 +384,12 @@
         <mkdir dir="${build.dist}" />
         <fixcrlf srcdir="${build.work}" eol="crlf" includes="**/*.txt, **/*.properties, **/*.hac, **/*.js, **/*.skin, **/*.xml" />
         <zip zipfile="${build.dist}/${filename}.zip">
-            <zipfileset dir="${build.work}" prefix="${filename}" includes="**" excludes="**/jimi.jar"/>
+            <zipfileset dir="${build.work}" prefix="${filename}">
+              <include name="**"/>
+              <exclude name="start.sh"/>
+              <exclude name="**/jimi.jar"/>
+              <exclude name="**/apache-dom.jar"/>
+            </zipfileset>
         </zip>
     </target>
 
@@ -394,8 +401,15 @@
     <target name="package-src-tgz" depends="init">
         <mkdir dir="${build.dist}" />
         <tar tarfile="${build.dist}/${filename}-src.tar">
-            <tarfileset prefix="${filename}" dir="${home.dir}"
-                includes="src/**,build/**,docs/**,license.txt,licenses/**,lib/jimi.jar"/>
+            <tarfileset prefix="${filename}" dir="${home.dir}">
+                <include name="src/**"/>
+                <include name="build/**"/>
+                <include name="docs/**"/>
+                <include name="licenses/**"/>
+                <include name="license.txt"/>
+                <include name="lib/jimi.jar"/>
+                <include name="lib/apache-dom.jar"/>
+            </tarfileset>
         </tar>
         <gzip zipfile="${build.dist}/${filename}-src.tar.gz" src="${build.dist}/${filename}-src.tar"/>
         <delete file="${build.dist}/${filename}-src.tar"/>
@@ -409,8 +423,15 @@
     <target name="package-src-zip" depends="init">
         <mkdir dir="${build.dist}" />
         <zip zipfile="${build.dist}/${filename}-src.zip">
-            <zipfileset dir="${home.dir}" prefix="${filename}" 
-             includes="src/**,build/**,docs/**,license.txt,licenses/**,lib/jimi.jar" />
+            <zipfileset dir="${home.dir}" prefix="${filename}">
+              <include name="src/**"/>
+              <include name="build/**"/>
+              <include name="docs/**"/>
+              <include name="licenses/**"/>
+              <include name="license.txt"/>
+              <include name="lib/jimi.jar"/>
+              <include name="lib/apache-dom.jar"/>
+            </zipfileset>
         </zip>
     </target>