From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 18 Sep 2011 16:05:43 +0000 (+0200)
Subject: Merge branch 'python-work' into maint
X-Git-Tag: v1.11.1b~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd7e620bf9ef468a762be8594c61c7e5bb0b0d27;p=thirdparty%2Fautomake.git

Merge branch 'python-work' into maint

* python-work:
  cosmetics: fix various typos and grammaros
  py-compile: '--' and non-option arguments terminate the option list
  py-compile: complain on unrecognized options
  py-compile: normalize error and help messages
  python tests: add "unit tests" on py-compile
  py-compile: the '--destdir' option now accepts a blank argument
  python: run the 'py-compile' script with $(SHELL)
---

dd7e620bf9ef468a762be8594c61c7e5bb0b0d27
diff --cc ChangeLog
index 386fedaf0,d7eb52565..56a8d1ca3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,57 -1,13 +1,67 @@@
+ 2011-09-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	cosmetics: fix various typos and grammaros
+ 	* NEWS: Fix typos.
+ 	* tests/py-compile-basic.test: Likewise.
+ 	* tests/py-compile-basedir.test: Fix botched wording in comments.
+ 	* tests/py-compile-option-terminate.test: Fix typo and incomplete
+ 	comment.
+ 	Suggestions by Peter Rosin.
+ 
 +2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	coverage: test interactions of `nobase_' and `nodist_'
 +	* tests/nobase-nodist.test: New test.
 +	* tests/Makefile.am (TESTS): Add it.
 +
 +2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	java: fix various blunders in test 'java-mix.test'
 +	* tests/java-mix.test: Add missing call to `set -e'.  Fix inverted
 +	semantics (`.java' files are expected *not* to be distributed by
 +	default, not the other way round).  Fix various typos in the name
 +	of the `.java' files.  Correct other minor blunders.  Improve some
 +	comments.
 +
 +2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	java: allow both JAVA and nobase_JAVA in the same Makefile.am
 +	* automake.in (handle_java): Also strip `nobase_' from the given
 +	prefix, when needed.
 +	* tests/java-clean.test: Update and extend.
 +	* tests/java-compile-install.test: Likewise.
 +	* tests/java-no-duplicate.test: Likewise.
 +	* tests/java-sources.test: Likewise.
 +	* tests/java-noinst.test: Likewise.
 +	* tests/java-mix-dist-nodist.test: Renamed to ...
 +	* tests/java-mix.test: ... this, and extended.
 +	* tests/java-nobase.test: New test, still xfailing due to
 +	unrelated issues.
 +	* tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
 +
 +2011-04-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
 +	Fixes automake bug#8434.
 +	* automake.in (handle_java): Strip `dist_' and `nodist_' from
 +	the given prefix.  Define a new internal Makefile variable
 +	`am__java_sources'.  Related adjustments.
 +	* lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the
 +	first time this am file is processed.
 +	(class%DIR%.stamp): Stamp file renamed ...
 +	(class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_'
 +	prefixes are stripped from the name of the stampfile.  Adjust
 +	declaration of dependencies by using the new automake-generated
 +	internal variable `$(am__java_sources)'.  In the rule, use `$@'
 +	as the name of the target, rather than hard-coding it.
 +	* tests/java.test: Update and extend.
 +	* tests/java-no-duplicate.test: New test.
 +	* tests/java-mix-dist-nodist.test: Likewise.
 +	* tests/java-compile-and-install.test: Likewise.
 +	* tests/java-clean.test: Likewise.
 +	* tests/java-sources.test: Likewise.
 +	* tests/Makefile.am (TESTS): Update.
 +
  2011-09-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	tests: fix spurious failure on fast machines