harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r820328 - /harmony/enhanced/classlib/trunk/make/properties.xml
Date Wed, 30 Sep 2009 16:05:09 GMT
Author: tellison
Date: Wed Sep 30 16:05:08 2009
New Revision: 820328

URL: http://svn.apache.org/viewvc?rev=820328&view=rev
Log:
Move findbugs taskdef into the macro to avoid multiple global definitions.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=820328&r1=820327&r2=820328&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Sep 30 16:05:08 2009
@@ -64,18 +64,6 @@
     <property name="hy.test.timeout" value="900000" />
     <property name="hy.test.vmargs" value="" />
 
-    <!-- FindBugs properties -->
-    <property name="findbugs.home" location="${basedir}/../../depends/oss/findbugs-1.3.9"/>
-    <available
-       classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
-       classpath="${findbugs.home}/lib/findbugs-ant.jar"
-       property="findbugs.available"/>
-    <taskdef
-       name="findbugs"
-       classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
-       classpath="${findbugs.home}/lib/findbugs-ant.jar"
-       onerror="ignore"/>
-
     <!-- Conditions for operating systems -->
     <condition property="is.windows">
         <os family="Windows" />
@@ -918,7 +906,20 @@
        <attribute name="excludeFilter"/>
        <attribute name="jarFile"/>
        <sequential>
+           <!-- Find and define findbugs task -->
+           <property name="findbugs.home" location="${basedir}/../../depends/oss/findbugs-1.3.9"/>
+           <available
+               classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+               classpath="${findbugs.home}/lib/findbugs-ant.jar"
+               property="findbugs.available"/>
+           <taskdef
+               name="findbugs"
+               classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+               classpath="${findbugs.home}/lib/findbugs-ant.jar"
+               onerror="ignore"/>
           <fail message="FindBugs is unavailable" unless="findbugs.available"/>
+
+          <!-- Run findbugs using the attributes given -->
           <dirname file="@{outputFile}" property="@{outputFile}.dir" />
           <mkdir dir="${@{outputFile}.dir}" />
           <findbugs home="${findbugs.home}"



Mime
View raw message