Extracted the dependency checking into a shared build file which is also used

by the tests build file. Added a call to build the tests to the standard dist
call to discourage test rot. Modified build process to copy library
dependencies into dist/lib during build so that dist/ contains all build
dependencies and build results at the end of the build.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@1925 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2006-09-26 19:07:55 +00:00
parent c29a7e91d3
commit d79766f9f5
3 changed files with 182 additions and 146 deletions
+19 -2
View File
@@ -14,13 +14,17 @@
<path id="classpath">
<pathelement location="../${deploy.dir}/classes"/>
<pathelement location="${deploy.dir}/classes"/>
<fileset dir="../lib" includes="**/*.jar"/>
<fileset dir="lib" includes="**/*.jar"/>
<fileset dir="../${deploy.dir}/lib" includes="*.jar"/>
<fileset dir="${deploy.dir}/lib" includes="*.jar"/>
</path>
<!-- import some targets to check dependency availability -->
<import file="../depends-incl.xml"/>
<!-- prepares the application directories -->
<target name="prepare">
<mkdir dir="${deploy.dir}"/>
<mkdir dir="${deploy.dir}/lib"/>
<mkdir dir="${deploy.dir}/classes"/>
<copy todir="${deploy.dir}/classes">
<fileset dir="${src.dir}" includes="**/*.properties"/>
@@ -29,6 +33,9 @@
<copy todir="${deploy.dir}/classes/rsrc">
<fileset dir="rsrc" includes="**/*"/>
</copy>
<copy todir="${deploy.dir}/lib">
<fileset dir="lib" includes="**/*.jar"/>
</copy>
</target>
<!-- cleans out the installed application -->
@@ -41,6 +48,16 @@
<javac srcdir="${src.dir}" destdir="${deploy.dir}/classes"
debug="on" optimize="off" deprecation="off">
<classpath refid="classpath"/>
<exclude name="com/samskivert/io/**" unless="build.io"/>
<exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/>
<exclude name="com/samskivert/jdbc/depot/**" unless="build.depot"/>
<exclude name="com/samskivert/net/**" unless="build.net"/>
<exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
<exclude name="com/samskivert/swing/**" unless="build.swing"/>
<exclude name="com/samskivert/test/**" unless="build.test"/>
<exclude name="com/samskivert/util/**" unless="build.util"/>
<exclude name="com/samskivert/velocity/**" unless="build.velocity"/>
<exclude name="com/samskivert/xml/**" unless="build.xml"/>
</javac>
</target>