jug (2.0.0-2) build-xml.diff

Description: Various fixes to build.xml.
Forwarded: not-needed
Author: Thierry Carrez <thierry.carrez@ubuntu.com>
--- a/build.xml	2011-05-18 20:36:41.000000000 +0530
+++ b/build.xml	2011-05-19 09:32:33.000000000 +0530
@@ -104,6 +104,7 @@
         <delete dir="${DocDir}"/>
         <delete dir="${TestDir}"/>
         <delete dir="${DistDir}"/>
+        <delete dir="${JavaDocDir}"/>
     </target>
 
     <target name="compile_java" depends="prepare">
@@ -115,7 +116,6 @@
             <include name="org/safehaus/uuid/*.java" />
             <include name="org/safehaus/uuid/ext/*.java" />
             <include name="test/*.java" />
-            <classpath refid="classpath" />
         </javac>
     </target>
 
@@ -148,6 +148,7 @@
             <attribute name="Implementation-Title"   value="${JUG_TITLE}"/>
             <attribute name="Implementation-Version" value="${JUG_VERSION}"/>
             <attribute name="Implementation-Vendor"  value="${JUG_VENDOR}"/>
+            <attribute name="Class-Path"  value="log4j-1.2.jar"/>
           </manifest>
           <fileset dir="${BuildClassesDir}">
              <include name="org/safehaus/uuid/*.class" />
@@ -208,6 +209,7 @@
                 <include name="com/ccg/net/ethernet/**" />
                 <include name="org/safehaus/uuid/**" />
             </packageset>
+            <link offline="true" packagelistLoc="/usr/share/doc/default-jdk-doc/api" href="/usr/share/doc/default-jdk-doc/api/" />
         </javadoc>
     </target> 
 
@@ -254,9 +256,11 @@
         <available property="junit.present" classname="junit.framework.TestCase" />
     </target>
 
-    <target name="compile_test" depends="junit, jars" if="junit.present">
+    <target name="compile_test" depends="junit" if="junit.present">
         <javac SrcDir="${TestSrcDir}" destdir="${TestBuildDir}" debug="true">
             <include name="**/*.java" />
+            <!-- Test does not compile -->
+            <exclude name="org/safehaus/uuid/test/UUIDTimerTest.java" />
             <classpath>
                 <pathelement location="${BuildClassesDir}" />
             </classpath>     
@@ -264,7 +268,7 @@
     </target>
 
     <target name="test" depends="compile_test" if="junit.present">
-        <junit fork="yes" printsummary="yes" haltonfailure="no">
+        <junit fork="yes" printsummary="yes" haltonfailure="on">
             <batchtest fork="yes" todir="${TestXmlResultsDir}">
                 <fileset dir="${TestBuildDir}">
                     <include name="**/*Test.class"/>