[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-70-gf94310a

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=f94310a380705f493142c8f130fc616c039e19fe

The branch, ng/master has been updated
       via  f94310a380705f493142c8f130fc616c039e19fe (commit)
       via  47962000102e426ff0f77b34cc8eff98283411c4 (commit)
       via  5c6ca5d71d1f1e707b71275608b6f9a99dddae89 (commit)
       via  326ff45b8da46ab409b4a69d4861ad3211f0e132 (commit)
       via  54ac5d47f719b4db1fe96e28e4b7218e70a877cc (commit)
       via  c12161817a71b7ab5410896294ac44254e002d3b (commit)
       via  6e249ed689839eaf9b3ef85b5082f7d8b6815872 (commit)
       via  7b3199fb4bdcff7304223e0a20808ed7d5681f31 (commit)
       via  072071c7d1c20fc1c85ee1e09796a08f6504d1d0 (commit)
      from  89233647eed3b8035226805555fcf81c7ed01737 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f94310a380705f493142c8f130fc616c039e19fe
Merge: 8923364 4796200
Author: Stefano Lattarini <address@hidden>
Date:   Thu Apr 12 20:08:56 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      news: remove older entry for "future backward incompatibilities"
      news: document fixes for bug#11222 and bug#11229
      vala: fix distcheck with c/vala mixed projects
      news: fix typo
      vala: fix vapi files handling
      vala: test vapi files handling (still failing)

-----------------------------------------------------------------------

Summary of changes:
 NEWS               |   39 ++++++----------------
 THANKS             |    1 +
 automake.in        |    8 +++-
 t/list-of-tests.mk |    1 +
 t/vala-mix.sh      |   11 ++++++-
 t/vala-vapi.sh     |   91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 119 insertions(+), 32 deletions(-)
 create mode 100755 t/vala-vapi.sh

diff --git a/NEWS b/NEWS
index 5c654ff..9b487a0 100644
--- a/NEWS
+++ b/NEWS
@@ -144,7 +144,7 @@ New in 1.11c:
             $(SHELL) $$1; \
           fi; \
         }
-      LOG_COMPILER = run_with_per_or_shell
+      LOG_COMPILER = run_with_perl_or_shell
 
   - The package authors can now use customary testsuite drivers within
     the framework provided by the 'parallel-tests' testsuite harness.
@@ -260,39 +260,20 @@ Bugs fixed in 1.11c:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-New in 1.11.4:
-
-* WARNING: Future backward-incompatibilities!
-
-  - The support for the "obscure" multilib feature has been deprecated,
-    and will be moved out of the automake core in the next major Automake
-    release (1.12).
-
-  - The support for ".log -> .html" conversion and the check-html and
-    recheck-html targets will be removed in the next major Automake
-    release (1.12).
-
-  - The obsolescent AM_WITH_REGEX  macro has been deprecated (since the
-    GNU rx library has been decommissioned), and will be removed in the
-    next major Automake release (1.12).
+Bugs fixed in 1.11.5:
 
-  - The `lzma' compression format for distribution archives has been
-    deprecated in favor of `xz' and `lzip', and will be removed in the
-    next major Automake release (1.12).
+* Bugs introduced by 1.11.3:
 
-  - The `--acdir' option of aclocal is deprecated, and will probably be
-    removed in the next major Automake release (1.12).
+  - Vala files with '.vapi' extension are now recognized and handled
+    correctly again.  See automake bug#11222.
 
-  - The exact order in which the directories in the aclocal macro
-    search path are looked up is probably going to be changed in the
-    next Automake release (1.12).
+  - Vala support work again for projects that contain some program
+    built from '.vala' (and possibly '.c') sources and some other
+    program built from '.c' sources *only*.  See automake bug#11229.
 
-  - The Automake support for automatic de-ANSI-fication will be removed
-    in the next major Automake release (1.12).
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  - Starting from the next Automake release (1.12), warnings in the
-    `extra-portability' category will be enabled by `-Wall' (right now,
-    one has to use `-Wextra-portability' explicitly).
+New in 1.11.4:
 
 * Miscellaneous changes:
 
diff --git a/THANKS b/THANKS
index f66bcba..4deb265 100644
--- a/THANKS
+++ b/THANKS
@@ -220,6 +220,7 @@ Manu Rouat          address@hidden
 Marcus Brinkmann       address@hidden
 Marcus G. Daniels      address@hidden
 Marius Vollmer         address@hidden
+Marc-Antoine Perennou  address@hidden
 Mark D. Baushke                address@hidden
 Mark Eichin            address@hidden
 Mark Elbrecht          address@hidden
diff --git a/automake.in b/automake.in
index cadb083..820285b 100644
--- a/automake.in
+++ b/automake.in
@@ -5734,16 +5734,20 @@ sub lang_vala_finish_target ($$)
   my $var = var "${derived}_SOURCES";
   return unless $var;
 
-  my @vala_sources = grep { /\.vala$/ } ($var->value_as_list_recursive);
+  my @vala_sources = grep { /\.(vala|vapi)$/ } ($var->value_as_list_recursive);
+
+  # For automake bug#11229.
+  return unless @vala_sources;
 
   foreach my $vala_file (@vala_sources)
     {
-      (my $c_file = $vala_file) =~ s/(.*)\.vala$/$1.c/;
+      my $c_file = $vala_file;
       $output_rules .= "\$(srcdir)/$c_file: \$(srcdir)/${derived}_vala.stamp\n"
         . "address@hidden test -f \$@; then :; else rm -f 
\$(srcdir)/${derived}_vala.stamp; fi\n"
         . "address@hidden test -f \$@; then :; else \\\n"
         . "\t  \$(MAKE) \$(srcdir)/${derived}_vala.stamp; \\\n"
         . "\tfi\n"
+        if $c_file =~ s/(.*)\.vala$/$1.c/;
     }
 
   # Add rebuild rules for generated header and vapi files
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 365d918..dd2109e 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1187,6 +1187,7 @@ t/vala2.sh \
 t/vala3.sh \
 t/vala4.sh \
 t/vala5.sh \
+t/vala-vapi.sh \
 t/vala-vpath.sh \
 t/vala-mix.sh \
 t/vala-mix2.sh \
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index 065a40b..d08fc1a 100755
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -27,12 +27,13 @@ AC_OUTPUT
 END
 
 cat > Makefile.am <<'END'
-bin_PROGRAMS = zardoz mu
+bin_PROGRAMS = zardoz mu baz
 AM_VALAFLAGS = --profile=posix
 zardoz_SOURCES = foo.vala bar.c
 mu_SOURCES = 1.vala 2.c
 mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run
 mu_CFLAGS = -DHAVE_MU
+baz_SOURCES = baz.c
 END
 
 if cross_compiling; then :; else
@@ -72,6 +73,14 @@ chocke me
 #endif
 END
 
+# For automake bug#11229.
+cat > baz.c <<'END'
+int main (void)
+{
+  return 0;
+}
+END
+
 $ACLOCAL
 $AUTOMAKE -a
 $AUTOCONF
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
new file mode 100755
index 0000000..7ad8742
--- /dev/null
+++ b/t/vala-vapi.sh
@@ -0,0 +1,91 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test and that vapi files are correctly handled by Vala support.
+
+required='valac cc GNUmake'
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_VALAC([0.7.3])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = zardoz
+AM_VALAFLAGS = --profile=posix
+zardoz_SOURCES = zardoz.vala foo.vapi foo.h
+END
+
+cat > zardoz.vala <<'END'
+int main ()
+{
+    stdout.printf (BARBAR);
+    return 0;
+}
+END
+
+echo '#define BARBAR "Zardoz!\n"' > foo.h
+
+cat > foo.vapi <<'END'
+[CCode (cprefix="", lower_case_cprefix="", cheader_filename="foo.h")]
+public const string BARBAR;
+END
+
+if cross_compiling; then :; else
+  unindent >> Makefile.am <<'END'
+    check-local: test2
+    .PHONY: test1 test2
+    test1:
+       ./zardoz
+       ./zardoz | grep 'Zardoz!'
+    test2:
+       ./zardoz
+       ./zardoz | grep 'Quux!'
+END
+fi
+
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+
+./configure --enable-dependency-tracking
+
+$MAKE
+ls -l        # For debugging.
+cat zardoz.c # Likewise.
+grep 'BARBAR' zardoz.c
+$MAKE test1
+
+# Simple check on remake rules.
+$sleep
+echo '#define BAZBAZ "Quux!\n"' > foo.h
+sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || Exit 99
+$MAKE && Exit 1
+sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99
+$MAKE
+cat zardoz.c # For debugging.
+grep 'BAZBAZ' zardoz.c
+$MAKE test2
+
+# Check the distribution.
+$MAKE distcheck
+
+:


hooks/post-receive
-- 
GNU Automake