6978974: [langtools] <findbugs> task should use ${target.java.home}

Mon, 13 Sep 2010 11:40:58 -0700

author
jjg
date
Mon, 13 Sep 2010 11:40:58 -0700
changeset 681
e92ae290fb47
parent 680
80505c2026e7
child 682
6e2ccba61117

6978974: [langtools] <findbugs> task should use ${target.java.home}
Reviewed-by: mcimadamore

make/build.xml file | annotate | diff | comparison | revisions
     1.1 --- a/make/build.xml	Mon Sep 13 11:35:27 2010 -0700
     1.2 +++ b/make/build.xml	Mon Sep 13 11:40:58 2010 -0700
     1.3 @@ -275,6 +275,7 @@
     1.4              failOnError="false"
     1.5              errorProperty="findbugs.all.errors"
     1.6              warningsProperty="findbugs.all.warnings"
     1.7 +            jvm="${target.java.home}/bin/java"
     1.8              jvmargs="-Xmx512M">
     1.9              <class location="${build.classes.dir}"/>
    1.10              <sourcePath>
    1.11 @@ -938,7 +939,8 @@
    1.12          <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
    1.13      </target>
    1.14  
    1.15 -    <target name="-def-findbugs" unless="findbugs.defined" depends="-check-findbugs.home">
    1.16 +    <target name="-def-findbugs" unless="findbugs.defined"
    1.17 +        depends="-check-findbugs.home,-check-target.java.home">
    1.18          <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
    1.19              <classpath>
    1.20                  <pathelement location="${findbugs.home}/lib/findbugs.jar"/>
    1.21 @@ -958,6 +960,7 @@
    1.22                      failOnError="false"
    1.23                      errorProperty="findbugs.@{name}.errors"
    1.24                      warningsProperty="findbugs.@{name}.warnings"
    1.25 +                    jvm="${target.java.home}/bin/java"
    1.26                      jvmargs="-Xmx512M" >
    1.27                      <class location="${dist.dir}/lib/@{name}.jar"/>
    1.28                      <auxClasspath>

mercurial