git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
build
/
trailer.xml
diff --git
a/build/trailer.xml
b/build/trailer.xml
index d5082a7ce6403e635cf117a4b93b3b8a562bedef..95ba839c374248d0380a2959caa865339ad70c2d 100644
(file)
--- a/
build/trailer.xml
+++ b/
build/trailer.xml
@@
-40,6
+40,9
@@
<antcall target="test.d">
<param name="download.dir" value="${test.lib.dir}"/>
</antcall>
<antcall target="test.d">
<param name="download.dir" value="${test.lib.dir}"/>
</antcall>
+ <antcall target="ant.d">
+ <param name="download.dir" value="${ant.downloaded.lib.dir}"/>
+ </antcall>
<antcall target="module.test.deps">
<param name="download.dir" value="${test.lib.dir}"/>
</antcall>
<antcall target="module.test.deps">
<param name="download.dir" value="${test.lib.dir}"/>
</antcall>
@@
-56,8
+59,15
@@
</target>
<target name="clean-deps" depends="init_directory_properties">
</target>
<target name="clean-deps" depends="init_directory_properties">
- <delete dir="${external.lib.dir}"/>
- <delete dir="${test.lib.dir}"/>
+ <delete>
+ <fileset dir="${external.lib.dir}" includes="*"/>
+ </delete>
+ <delete>
+ <fileset dir="${test.lib.dir}" includes="*"/>
+ </delete>
+ <delete>
+ <fileset dir="${ant.downloaded.lib.dir}" includes="*"/>
+ </delete>
</target>
<!-- ============================================================================
</target>
<!-- ============================================================================
@@
-189,7
+199,7
@@
</delete>
</target>
</delete>
</target>
-<target name="dist-lite-product" depends="jar">
+<target name="dist-lite-product" depends="
deps,
jar">
<mkdir dir="${module.dist.dir}"/>
<delete>
<fileset dir="${module.dist.dir}" excludes="**/CVS" />
<mkdir dir="${module.dist.dir}"/>
<delete>
<fileset dir="${module.dist.dir}" excludes="**/CVS" />
@@
-204,7
+214,7
@@
</copy>
</target>
</copy>
</target>
-<target name="dist-lite-test" depends="testclasses">
+<target name="dist-lite-test" depends="
deps,
testclasses">
<jar destfile="${module.dist.dir}/${module.testjar.name}"
basedir="${module.testclasses.dir}"
includes="**/*.class"/>
<jar destfile="${module.dist.dir}/${module.testjar.name}"
basedir="${module.testclasses.dir}"
includes="**/*.class"/>
@@
-238,15
+248,23
@@
<target name="checkstyle" depends="testclasses">
<checkstyle config="${build.dir}/${checkstyle.rules}"
<target name="checkstyle" depends="testclasses">
<checkstyle config="${build.dir}/${checkstyle.rules}"
- failOnViolation="false" classpathref="module.testbuild.path">
+ failOnViolation="false">
+ <classpath>
+ <path refid="module.build.path"/>
+ </classpath>
<fileset dir="${module.source.dir}" includes="**/*.java" />
<formatter type="plain" />
</checkstyle>
<fileset dir="${module.source.dir}" includes="**/*.java" />
<formatter type="plain" />
</checkstyle>
+ <!--
<checkstyle config="${build.dir}/${checkstyle.test.rules}"
<checkstyle config="${build.dir}/${checkstyle.test.rules}"
- failOnViolation="false" classpathref="module.testbuild.path">
+ failOnViolation="false">
+ <classpath>
+ <pathelement path="${module.testbuild.path}"/>
+ </classpath>
<fileset dir="${module.test.dir}" includes="**/*.java" />
<formatter type="plain" />
</checkstyle>
<fileset dir="${module.test.dir}" includes="**/*.java" />
<formatter type="plain" />
</checkstyle>
+ -->
</target>
<!-- ============================================================================
</target>
<!-- ============================================================================