Mercurial > hg > openjdk > jdk7 > langtools
changeset 680:e92ae290fb47
6978974: [langtools] <findbugs> task should use ${target.java.home}
Reviewed-by: mcimadamore
author | jjg |
---|---|
date | Mon, 13 Sep 2010 11:40:58 -0700 |
parents | 80505c2026e7 |
children | 6e2ccba61117 |
files | make/build.xml |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build.xml Mon Sep 13 11:35:27 2010 -0700 +++ b/make/build.xml Mon Sep 13 11:40:58 2010 -0700 @@ -275,6 +275,7 @@ failOnError="false" errorProperty="findbugs.all.errors" warningsProperty="findbugs.all.warnings" + jvm="${target.java.home}/bin/java" jvmargs="-Xmx512M"> <class location="${build.classes.dir}"/> <sourcePath> @@ -938,7 +939,8 @@ <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/> </target> - <target name="-def-findbugs" unless="findbugs.defined" depends="-check-findbugs.home"> + <target name="-def-findbugs" unless="findbugs.defined" + depends="-check-findbugs.home,-check-target.java.home"> <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"> <classpath> <pathelement location="${findbugs.home}/lib/findbugs.jar"/> @@ -958,6 +960,7 @@ failOnError="false" errorProperty="findbugs.@{name}.errors" warningsProperty="findbugs.@{name}.warnings" + jvm="${target.java.home}/bin/java" jvmargs="-Xmx512M" > <class location="${dist.dir}/lib/@{name}.jar"/> <auxClasspath>