From: Stefano Lattarini Date: Sat, 23 Apr 2011 08:00:17 +0000 (+0200) Subject: Merge branch 'maint' into java-work X-Git-Tag: v1.11b~291^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bf20ac342d7d4e2eaede58e110faf356e34e167;p=platform%2Fupstream%2Fautomake.git Merge branch 'maint' into java-work --- 0bf20ac342d7d4e2eaede58e110faf356e34e167 diff --cc ChangeLog index 791d8e7,4417d9b..414f5cb --- a/ChangeLog +++ b/ChangeLog @@@ -1,35 -1,107 +1,139 @@@ + 2011-04-22 Stefano Lattarini + + testsuite: more environment sanitization + * tests/defs.in: Sanity check: abort if any of `parallel_tests' + or `required' is in the environment. + ($sed_unindent_prog): Initialize to empty, to avoid interferences + from the environment. + * tests/self-check-me-in-env.test: Renamed to ... + * tests/self-check-env-sanitize.test: ... this, and extended. + * tests/Makefile.am (TESTS): Update. + (TESTS_ENVIRONMENT): Unset variables `parallel_tests' and + `required'. Adjust comments. + + 2011-04-18 Stefano Lattarini + + tests: don't allow `$me' to be overridden from the environment + * tests/defs.in: Sanity check: abort if $me is in the environment. + * tests/self-check-me-in-env.test: New test. + * tests/Makefile.am (TESTS_ENVIRONMENT): Unset variable `me'. + (TESTS): Update. + Suggestion by Ralf Wildenhues. + + 2011-04-17 Stefano Lattarini + + test defs: allow overriding of `$me' + * tests/defs.in ($me): Allow overriding by the including test + script. Add some explicative comments. + + 2011-04-17 Stefano Lattarini + + depcomp tests: don't reject slower dependency extractors + * tests/depcomp8b.test: Add the `--enable-dependency-tracking' + option to `configure' invocations, so that slower dependency + extractors are not rejected. + * tests/depcomp8b.test: Likewise. Also ... + (foo.c): ... since we are at it, fix spacing to be consistent + with GNU coding standards. + + 2011-04-17 Stefano Lattarini + + m4: add missing serial numbers to a few files + Related to automake bug#8483. + * m4/amversion.in: Add serial number. + * m4/auxdir.m4: Likewise. + * m4/gcj.m4: Likewise. + * m4/install-sh.m4: Likewise. + * m4/mkdirp.m4: Likewise. + * m4/python.m4: Likewise. + * m4/runlog.m4: Likewise. + * m4/strip.m4: Likewise. + * m4/upc.m4: Likewise. + + 2011-04-16 Jim Meyering + + depcomp: correct invalid sed invocation + * lib/depcomp: Insert missing -e before '/:$/d'. + Otherwise, that use of sed would treat '/:$/d' as a file name. + + 2011-04-14 Stefano Lattarini + + maintainer check: quote literal `$' in Makefile rule + * Makefile.am (sc_tests_PATH_SEPARATOR): Escape literal `$' + character in double-quoted string. Fix a bug in which the rule + emitted an erroneously empty substring in its error message. + + 2011-04-12 Stefano Lattarini + + coverage: test for automake bug#8485 (known regression) + * tests/yacc-dist-nobuild-subdir.test: New test. + * tests/Makefile.am (TESTS, XFAIL_TESTS): Update. + + 2011-04-12 Stefano Lattarini + + test defs: define default $distdir (help reducing duplication) + * tests/defs.in ($distdir): New variable, might be used in + testcases checking distribution-related features. + * tests/pr9.test: Use it. + * tests/subdir9.test: Likewise. + * tests/vtexi3.test: Add comment explaining why we redefine + $distdir in this test. + + 2011-04-11 Stefano Lattarini + + depcomp: fix bugs in tests and in the depcomp script + * lib/depcomp (gcc): Remove duplicated `-e' from sed invocation. + * tests/depcomp10.test: Make it executable. Fix a blunder that + has left part of an intended comment not prefixed by `#', thus + causing shell syntax errors. In this same comment, break a + too-long reported error message on multiple lines, for clarity. + Add reference to the relevant bug report. Add a comment which + explains why the test result 'skipped' if the first "make" call + fails. Add other useful comments. + * tests/depcomp9.test: Slightly improve comments. + + 2011-04-11 Ralf Wildenhues + + Fix hp depmode for VPATH builds with GNU make. + * lib/depcomp: Be sure to remove VPATH-prefixed object from + dependency output when creating stub rule. + * tests/depcomp10.test: New test. + * tests/Makefile.am (TESTS): Update. + * NEWS: Update. + Report by Bruno Haible. + +2011-04-18 Stefano Lattarini + + 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-04-06 Stefano Lattarini + + 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 test defs: fix 'javac' requirement for older JDK versions