antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Update Java class file version to 1.4 in javac task.

Browse source 
* 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.
This commit is contained in:
hns 2007-02-21 14:35:46 +00:00
parent 4eb70e7b2e
commit 0b6d78a5ce
1 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
build/build.xml
View file

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