Fri, 26 Mar 2010 22:37:04 -0700
6938326: Use of "ant -diagnostics" a problem with ant 1.8.0, exit code 1 now
Reviewed-by: jjg
make/Makefile | file | annotate | diff | comparison | revisions |
1.1 --- a/make/Makefile Wed Mar 24 17:02:35 2010 -0700 1.2 +++ b/make/Makefile Fri Mar 26 22:37:04 2010 -0700 1.3 @@ -188,10 +188,16 @@ 1.4 # All ant targets of interest 1.5 ANT_TARGETS = build clean sanity post-sanity diagnostics # for now 1.6 1.7 +# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1) 1.8 +$(OUTPUTDIR)/build/ant-diagnostics.log: 1.9 + @mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR) 1.10 + @$(RM) $@ 1.11 + $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \ 1.12 + $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@ 1.13 + 1.14 # Create a make target for each 1.15 -$(ANT_TARGETS): 1.16 +$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log 1.17 @ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR) 1.18 - $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $(OUTPUTDIR)/build/ant-diagnostics.log 1.19 $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@ 1.20 1.21 #-------------------------------------------------------------------