aboutsummaryrefslogtreecommitdiffstats
path: root/make/build-test.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-02-02 06:18:00 +0100
committerSven Gothel <[email protected]>2011-02-02 06:18:00 +0100
commitadb09d204b0d6d42ffd0c3622ea0adccc27b8b98 (patch)
treeed34c6da2ebe14a62baa32fb36441b13796c11ea /make/build-test.xml
parentaac2ba89a38d47fc24db10254e4b295717557b23 (diff)
parent8bec14de2d0160a253518da8a57b93c0e62af986 (diff)
Merge remote branch 'wwalker/bug_417' into pulled
Diffstat (limited to 'make/build-test.xml')
-rw-r--r--make/build-test.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index a2fbdd8b7..3c34abda1 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -87,8 +87,15 @@
<fileset file="${jogl.test.jar}" />
</delete>
<jar destfile="${jogl.test.jar}" filesonly="true">
+ <!-- get all class files, but skip any resource files that external tools
+ might have copied into the class directory (otherwise, it's possible
+ to get the same resource file twice in the jar) -->
<fileset dir="${classes}">
- <include name="${java.part.test}"/>
+ <include name="${java.part.test}/*.class"/>
+ </fileset>
+ <!-- include any resource files that tests may requre -->
+ <fileset dir="${src.test}">
+ <exclude name="**/*.java"/>
</fileset>
</jar>
</target>