From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 18 Apr 2011 13:23:59 +0000 (+0200)
Subject: Merge branch 'java-coverage' into java-work
X-Git-Tag: ng-0.5a~123^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=141f17ca87d007fdfde0da85475dea7556c636a0;p=thirdparty%2Fautomake.git

Merge branch 'java-coverage' into java-work
---

141f17ca87d007fdfde0da85475dea7556c636a0
diff --cc ChangeLog
index ea292223a,9640a5388..3ece73c4a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,58 -1,12 +1,67 @@@
+ 2011-04-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	coverage: more on java support EXTRA_ and noinst_ prefixes
+ 	* tests/java-extra.test: New test, checking support for the
+ 	prefix `EXTRA_' with the JAVA primary.
+ 	* tests/java-noinst.test: New test, checking support for the
+ 	prefix `noinst_' with the JAVA primary.
+ 	* tests/Makefile.am (TESTS): Update.
+ 
 +2011-04-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	test defs: fix 'javac' requirement for older JDK versions
 +	The Java compiler from JDK 1.5 (and presumably earlier versions)
 +	cannot handle the `-version' option by itself; and while it does
 +	print the version number, it then errors out with an usage error:
 +	  $ javac -version
 +	  javac 1.5.0_22
 +	  javac: no source files
 +	  Usage: javac <options> <source files>
 +	  ...
 +	Luckily, adding the `-help' option to the `javac' invocation
 +	seems to fix this problem.
 +	* tests/defs.in (javac): Pass also the `-help' option to the
 +	`javac' program.  Add a comment explaining why it is needed.
 +	Report from Ralf Wildenhues.
 +
 +2011-04-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	test defs: new requirement for the default java compiler
 +	* tests/defs.in (for tool in $required): New requirement 'javac'.
 +	* tests/java.test: Use it instead of ad-hoc configure check.
 +	* tests/java-check.test: Likewise.
 +	* tests/instfail-java.test: Likewise.
 +	* tests/instdir-java.test: Likewise.
 +
 +2011-04-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	java: check_JAVA does not cause compilation by "make all" anymore
 +	Fixes automake bug#8234.
 +	* automake.in (handle_java): Make stamp of class files built from
 +	java sources in $(check_JAVA) a dependency of `check' target, not
 +	`all' target.
 +	* tests/java-check.test: New test.
 +	* tests/Makefile.am (TESTS): Update.
 +	* NEWS: Update.
 +	* THANKS: Update.
 +	Report from Petteri Räty.
 +
 +2011-04-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +	Clarify regex code in depcomp.
 +	* lib/depcomp: Add comment why we don't need regex-escaping here.
 +	Suggested by Stefano Lattarini.
 +
 +2011-04-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +	Fix makedepend depmode for VPATH builds.
 +	* lib/depcomp [makedepend]: Remove any VPATH prefix from the
 +	object file name, so a rebuild doesn't attempt to update the
 +	.Po files in the source tree.
 +	* tests/depcomp9.test: New test.
 +	* tests/Makefile.am (TESTS): Update.
 +	* NEWS: Update.
 +
  2011-04-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	tests: fix timestamp-related failures
diff --cc tests/Makefile.am
index bf07f2b0e,718ca2bce..96b7e892e
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -421,9 -420,10 +421,11 @@@ interp2.test 
  java.test \
  java2.test \
  java3.test \
 +java-check.test \
  javaprim.test \
  javasubst.test \
+ java-extra.test \
+ java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \
diff --cc tests/Makefile.in
index d8bf050e7,725ae4db7..dce3a0004
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -691,9 -690,10 +691,11 @@@ interp2.test 
  java.test \
  java2.test \
  java3.test \
 +java-check.test \
  javaprim.test \
  javasubst.test \
+ java-extra.test \
+ java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \