|
2
by Thierry Carrez
Initial release. New Eucalyptus dependency. |
1 |
diff -Nur -x '*.orig' -x '*~' jug-2.0.0/build.xml jug-2.0.0.new/build.xml
|
2 |
--- jug-2.0.0/build.xml 2009-07-22 11:45:31.000000000 +0200
|
|
3 |
+++ jug-2.0.0.new/build.xml 2009-07-22 11:50:15.000000000 +0200
|
|
4 |
@@ -104,6 +104,7 @@
|
|
5 |
<delete dir="${DocDir}"/>
|
|
6 |
<delete dir="${TestDir}"/>
|
|
7 |
<delete dir="${DistDir}"/>
|
|
8 |
+ <delete dir="${JavaDocDir}"/>
|
|
9 |
</target> |
|
10 |
||
11 |
<target name="compile_java" depends="prepare"> |
|
12 |
@@ -115,7 +116,6 @@
|
|
13 |
<include name="org/safehaus/uuid/*.java" /> |
|
14 |
<include name="org/safehaus/uuid/ext/*.java" /> |
|
15 |
<include name="test/*.java" /> |
|
16 |
- <classpath refid="classpath" />
|
|
17 |
</javac> |
|
18 |
</target> |
|
19 |
||
20 |
@@ -254,9 +254,11 @@
|
|
21 |
<available property="junit.present" classname="junit.framework.TestCase" /> |
|
22 |
</target> |
|
23 |
||
24 |
- <target name="compile_test" depends="junit, jars" if="junit.present">
|
|
25 |
+ <target name="compile_test" depends="junit" if="junit.present">
|
|
26 |
<javac SrcDir="${TestSrcDir}" destdir="${TestBuildDir}" debug="true">
|
|
27 |
<include name="**/*.java" /> |
|
28 |
+ <!-- Test does not compile -->
|
|
29 |
+ <exclude name="org/safehaus/uuid/test/UUIDTimerTest.java" />
|
|
30 |
<classpath> |
|
31 |
<pathelement location="${BuildClassesDir}" />
|
|
32 |
</classpath> |
|
33 |
@@ -264,7 +266,7 @@
|
|
34 |
</target> |
|
35 |
||
36 |
<target name="test" depends="compile_test" if="junit.present"> |
|
37 |
- <junit fork="yes" printsummary="yes" haltonfailure="no">
|
|
38 |
+ <junit fork="yes" printsummary="yes" haltonfailure="on">
|
|
39 |
<batchtest fork="yes" todir="${TestXmlResultsDir}">
|
|
40 |
<fileset dir="${TestBuildDir}">
|
|
41 |
<include name="**/*Test.class"/> |