Mercurial > hg > openjdk > jdk6 > langtools
changeset 80:7306e2127357 jdk6-b19
6938326: Use of "ant -diagnostics" a problem with ant 1.8.0, exit code 1 now
Reviewed-by: jjg
author | ohair |
---|---|
date | Mon, 29 Mar 2010 14:59:59 -0700 |
parents | a07b39ff0fae |
children | 937c49732f33 |
files | make/Makefile |
diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Wed Mar 24 17:02:35 2010 -0700 +++ b/make/Makefile Mon Mar 29 14:59:59 2010 -0700 @@ -171,10 +171,16 @@ # All ant targets of interest ANT_TARGETS = build clean sanity post-sanity diagnostics # for now +# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1) +$(OUTPUTDIR)/build/ant-diagnostics.log: + @mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR) + @$(RM) $@ + $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \ + $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@ + # Create a make target for each -$(ANT_TARGETS): +$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log @ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR) - $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $(OUTPUTDIR)/build/ant-diagnostics.log $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@ #-------------------------------------------------------------------