Merge branch 'msvc'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 3 Nov 2011 14:23:22 +0000 (15:23 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 3 Nov 2011 14:23:22 +0000 (15:23 +0100)
* msvc:
  tests: various minor tweakings, mostly related to AM_PROG_AR

1  2 
ChangeLog
tests/alloca.test
tests/discover.test
tests/libobj3.test
tests/library2.test
tests/pluseq7.test
tests/stdlib.test

diff --cc ChangeLog
+++ b/ChangeLog
  2011-11-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       tests: various minor tweakings, mostly related to AM_PROG_AR
+       * tests/alloca.test: Adjust to new portability requirements due
+       to the new AM_PROG_AR macro.
+       * tests/discover.test: Likewise.
+       * tests/libobj3.test: Likewise.
+       * tests/pluseq7.test: Likewise.  Also, make grepping of automake
+       expected error message stricter.
+       * tests/stdlib.test: Likewise, and extend the test a bit.
+       * tests/parse.test (configure.in): Remove redundant call to
+       AC_PROG_RANLIB.
+       * tests/library2.test: Adjust to new portability requirements
+       due to the new AM_PROG_AR macro.  Also ...
+       (configure.in): ... add call to AC_PROG_CC, to ensure automake
+       really fails for the expected reason.
++2011-11-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +      Merge branch 'msvc' into master
 +
 +      * tests/instspc-tests.sh: Adjust to new portability requirements
 +      due to the new AM_PROG_AR macro.
 +      * tests/libobj-basic.test: Likewise.
 +      * tests/libobj2.test: Likewise.
 +      * tests/libobj15a.test: Likewise.
 +      * tests/libobj15b.test: Likewise.
 +      * tests/libobj15c.test: Likewise.
 +      * tests/libobj16a.test: Likewise.
 +      * tests/libobj16b.test: Likewise.
 +      * tests/libobj17.test: Likewise.
 +      * tests/libobj18.test: Likewise.
 +      * tests/libobj19.test: Likewise.
 +      * tests/libobj20a.test: Likewise.
 +      * tests/libobj20b.test: Likewise.
 +      * tests/libobj20c.test: Likewise.
 +      * tests/canon6.test: Likewise.
 +      * tests/canon6.test: Likewise.
 +      * tests/canon7.tests: Likewise.
 +      * tests/extra9.test: Likewise.
 +      * tests/extradep.test: Likewise.
 +      * tests/extradep2.test: Likewise.
 +      * tests/posixsubst-ldadd.test: Likewise.
 +      * tests/posixsubst-libraries.test: Likewise.
 +      * tests/posixsubst-ltlibraries.test: Likewise.
 +      * tests/python-virtualenv.test: Likewise.
 +      * tests/vartypos.test: Likewise.
 +      * tests/vartypo2.test: Likewise.
 +      * tests/suffix.test: Update to take into account previous
 +      master-only changes.
 +      * tests/suffix2.test: Likewise.
 +      * tests/libobj7.test: Call automake with the `--add-missing'
 +      option, instead of creating a dummy `ar-lib' file, since this
 +      test now also runs "./configure" and "make".
 +      * tests/suffix5.test: Copy the real `ar-lib' script file,
 +      instead of creating a dummy one, since this test now also
 +      runs "./configure" and "make".
 +      * tests/extra-portability2.test: Fix this test not to rely
 +      on the older, faulty semantics of "strictness specification
 +      always reset warning level", which has been fixed in commit
 +      v1.11-623-g1609491 (see also automake bug#7669 a.k.a. PR/547).
 +      Since we are at it, throw inf few other minor unrelated
 +      improvements.
 +      * tests/extra-portability.test: Explicitly pass `-Wall' to
 +      automake calls, for clarity.
 +
 +2011-10-21  Peter Rosin  <peda@lysator.liu.se>
 +
 +      warnings: new 'extra-portability' category, for AM_PROG_AR
 +      * lib/Automake/ChannelDefs.pm: Register new extra-portability
 +      warning channel.
 +      (switch_warning): Turn off extra-portability if portability is
 +      turned off, and turn on portability if extra-portability is
 +      turned on.
 +      (set_strictness): Silence extra-portability for --gnits, --gnu
 +      and --foreign.
 +      * tests/extra-portability2.test: New test, checking that the
 +      extra-portability channel is silenced by --gnits, --gnu and
 +      --foreign.
 +      * doc/automake.texi (Invoking Automake): Document the new warning
 +      category and its interaction with the portability category.
 +      * tests/extra-portability.test: New test, checking the interaction
 +      between the portability and extra-portability warning categories.
 +      * automake.in (handle_libraries, handle_ltlibraries): Move the
 +      AM_PROG_AR warnings to the new extra-portability channel.
 +      * tests/ar2.test: Adjust to the new warning channel.
 +      * tests/pr300-lib.test: Likewise.
 +      * tests/pr300-ltlib.test: Likewise.
 +      * tests/pr307.test: Likewise.
 +      * tests/pr401.test: Likewise.
 +      * tests/pr401b.test: Likewise.
 +      * tests/pr401c.test: Likewise.
 +      * tests/pr72.test: Likewise.
 +      * NEWS: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +2011-10-21  Peter Rosin  <peda@lysator.liu.se>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +          Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Add new 'AM_PROG_AR' macro, triggering the 'ar-lib' script.
 +      * m4/ar-lib.m4: New macro AM_PROG_AR, which locates an
 +      archiver and triggers the auxiliary 'ar-lib' script if needed.
 +      * m4/Makefile.am (dist_m4data_DATA): Update.
 +      * automake.in ($seen_ar): New variable.
 +      (scan_autoconf_traces): Set it.
 +      (handle_libraries, handle_ltlibraries): Require AM_PROG_AR for
 +      portability.
 +      * doc/automake.texi (Public Macros): Mention the new
 +      'AM_PROG_AR' macro.
 +      (Subpackages): Add AM_PROG_AR to the example.
 +      (A Library): Adjust recommendations for AR given the new
 +      AM_PROG_AR macro.
 +      * All relevant tests: Adjust to new portability requirements due
 +      to the new AM_PROG_AR macro.
 +      * tests/ar-lib2.test: New test, checking that AM_PROG_AR triggers
 +      install of ar-lib.
 +      * tests/ar-lib3.test: New test, checking that lib_LIBRARIES
 +      requires AM_PROG_AR.
 +      * tests/ar-lib4.test: New test, checking that lib_LTLIBRARIES
 +      requires AM_PROG_AR.
 +      * tests/ar-lib5a.test: New test, checking that AM_PROG_AR triggers
 +      use of ar-lib when the archiver is Microsoft lib.
 +      * tests/ar-lib5b.test: New test, checking that AM_PROG_AR triggers
 +      use of ar-lib when the archiver is a faked lib.
 +      * tests/ar-lib6a.test: New test, checking the ordering of
 +      AM_PROG_AR and LT_INIT.
 +      * tests/ar-lib6b.test: New test, checking the ordering of
 +      AM_PROG_AR and AC_PROG_LIBTOOL.
 +      * tests/ar-lib7.test: New test, checking that automake warns
 +      if ar-lib is missing.
 +      * tests/ar3.test: New test, checking that AR and ARFLAGS may
 +      be overridden by the user even if AM_PROG_AR is used.
 +      * tests/ar4.test: New test, checking that AM_PROG_AR bails out
 +      if it cannot determine the archiver interface.
 +      * tests/ar5.test: New test, checking that AM_PROG_AR runs its
 +      optional argument if it cannot determine the archiver interface.
 +      * tests/defs.in: New required entry 'lib'.
 +      * tests/Makefile.am (TESTS): Update.
 +      * NEWS: Update.
 +
  2011-11-03  Zack Weinberg <zackw@panix.com>  (tiny change)
            Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in <<'END'
+ AM_PROG_AR
  AC_PROG_CC
  END
  
Simple merge
  
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in << 'END'
  AC_PROG_RANLIB
+ AM_PROG_AR
  END
  
  cat > Makefile.am << 'END'
@@@ -30,8 -32,8 +31,10 @@@ libtu_a_SOURCES 
  libtu_a_LIBADD = @LIBOBJS@
  END
  
+ : > ar-lib
  $ACLOCAL
  AUTOMAKE_fails
 -grep 'Makefile.am:3:.*LIBOBJS' stderr
 +grep 'Makefile\.am:3:.*LIBOBJS' stderr
 +
 +:
  
  . ./defs || Exit 1
  
 -set -e
 -
+ cat >> configure.in << 'END'
+ AC_PROG_CC
+ END
  cat > Makefile.am << 'END'
  EXTRA_LIBRARIES = libfoo.a
  END
Simple merge
  
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in << 'END'
  AC_PROG_CC
+ AM_PROG_AR
  AC_PROG_RANLIB
  END