[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-283-g03f340d

[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=03f340dae2e4bd3370aa6b14df6e3d83d6fa607e

The branch, ng/master has been updated
       via  03f340dae2e4bd3370aa6b14df6e3d83d6fa607e (commit)
       via  8727098aa822d2ef12975adebd9a8d5c551fb07c (commit)
      from  9b5f37246d4a9947922725fbe6944ef2a810b800 (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 03f340dae2e4bd3370aa6b14df6e3d83d6fa607e
Author: Stefano Lattarini <address@hidden>
Date:   Sat Apr 14 18:33:14 2012 +0200

    [ng] automake: allow user to pass Makefile content (mostly) unprocessed
    
    All the lines starting with a '!' character are now passed unprocessed
    (apart from the stripping of that leading character) into the generated
    Makefile.in, and placed between the variables' definitions and the
    Makefile targets and recipes.  This will provide the users wanting to
    use more advanced GNU make features (like the 'ifeq' or 'define'
    builtins) with a mean to do so, without automake pre-processing getting
    in the way.  More importantly, this will provide us with a way to do
    so in out internal .am fragments ;-)
    
    This is basically just a quick hack to allow us to implement some further
    refactorings, and to move yet more logic and processing from the Automake
    script to the generated Makefiles.  Still, it's an unobtrusive and easy
    to implement hack, so there will be no problem in ripping it out if it
    turns out to be a bad idea.
    
    * automake.in ($output_verbatim): New global variable.
    (initialize_per_input): Reset it.
    (read_am_file, file_contents_internal): When a line starting with "!" is
    read, append its content to the '$output_verbatim', and do no further
    processing on it.
    * t/verbatim.sh: New test.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 8727098aa822d2ef12975adebd9a8d5c551fb07c
Author: Stefano Lattarini <address@hidden>
Date:   Tue May 22 09:20:07 2012 +0200

    [ng] cleanup: remove an hack for GNU make 3.80
    
    * lib/am/header-vars.am (am__lastword): Delete: now that we assume GNU
    make 3.80 we can simply use the '$(lastword)' builtin (which is also
    faster, for long lists).  This also get us rid of an erroneously
    truncated comment.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 automake.in           |   53 ++++++++++++++-----
 lib/am/header-vars.am |    8 +--
 t/verbatim.sh         |  141 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 182 insertions(+), 20 deletions(-)
 create mode 100755 t/verbatim.sh

diff --git a/automake.in b/automake.in
index 7596ada..7b0ac7a 100644
--- a/automake.in
+++ b/automake.in
@@ -528,6 +528,7 @@ my $output_deps_greatest_timestamp;
 # They hold the Makefile.in until it is ready to be printed.
 my $output_vars;
 my $output_header;
+my $output_verbatim;
 my $output_rules;
 my $output_trailer;
 
@@ -661,6 +662,7 @@ sub initialize_per_input ()
 
     $output_vars = '';
     $output_header = '';
+    $output_verbatim = '';
     $output_rules = '';
     $output_trailer = '';
 
@@ -6285,14 +6287,23 @@ sub read_am_file ($$)
     my $last_var_value = '';
     my $last_where;
     # FIXME: shouldn't use $_ in this loop; it is too big.
-    while ($_)
-    {
+    for (; defined $_; $_ = $am_file->getline)
+      {
        $where->set ("$amfile:$.");
 
        # Make sure the line is \n-terminated.
        chomp;
        $_ .= "\n";
 
+       if (s/^!//)
+         {
+           # A line starting with '!' must be passed verbatim to the
+           # output Makefile, placed after the variables' definitions
+           # and before the Makefile targets.
+           $output_verbatim .= $_;
+           next;
+         }
+
        # Don't look at MAINTAINER_MODE_TRUE here.  That shouldn't be
        # used by users.  @MAINT@ is an anachronism now.
        $_ =~ s/address@hidden@//g
@@ -6474,7 +6485,6 @@ sub read_am_file ($$)
        }
 
        $saw_bk = $new_saw_bk;
-       $_ = $am_file->getline;
     }
 
     $output_trailer .= $comment;
@@ -6759,24 +6769,36 @@ sub file_contents_internal ($$$%)
        # FIXME: no line number available.
        $where->set ($file);
 
+        # A line starting with '!' must be passed verbatim to the output
+        # Makefile, placed after the variables' definitions and before the
+        # Makefile targets.
+        if (s/^!//)
+          {
+            $output_verbatim .= "$_\n";
+          }
+
        # Sanity checks.
-       error $where, "blank line following trailing backslash:\n$_"
-         if /\\$/;
-       error $where, "comment following trailing backslash:\n$_"
-         if /\\#/;
+       elsif (/\\$/)
+          {
+           error $where, "blank line following trailing backslash:\n$_"
+          }
+       elsif (/\\#/)
+          {
+           error $where, "comment following trailing backslash:\n$_"
+          }
 
-       if (/^$/)
-       {
+       elsif (/^$/)
+         {
            $is_rule = 0;
            # Stick empty line before the incoming macro or rule.
            $spacing = "\n";
-       }
+         }
        elsif (/$COMMENT_PATTERN/mso)
-       {
+         {
            $is_rule = 0;
            # Stick comments before the incoming macro or rule.
            $comment = "$_\n";
-       }
+         }
 
        # Handle inclusion of other files.
        elsif (/$INCLUDE_PATTERN/o)
@@ -7829,8 +7851,11 @@ sub generate_makefile ($$)
   mkdir ($am_relative_dir, 0755) if ! -d $am_relative_dir;
 
   # We make sure that 'all:' is the first target.
-  my $output =
-    "$output_vars$output_header$output_rules$output_trailer";
+  my $output = $output_vars .
+               $output_header .
+               $output_verbatim .
+               $output_rules .
+               $output_trailer;
 
   # Decide whether we must update the output file or not.
   # We have to update in the following situations.
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 5cd86f6..79dde9c 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -65,10 +65,6 @@ am__make_dryrun := \
 # in some places.
 am__empty :=
 
-# GNU make 3.80 lacks $(lastword).
-## FIXME: the best thing to do here is ts
-am__lastword = $(word $(words $(1)),$(1))
-
 am__strip_firstword = $(wordlist 2,$(words $(1)),$(1))
 am__strip_lastword  = $(wordlist 2,$(words $(1)),dummy $(1))
 
@@ -82,10 +78,10 @@ am__uniq = $(strip \
     $(call am__uniq, \
       $(call am__strip_lastword, $(1))) \
 ## And append the last element, unless it was already present.
-      $(if $(filter $(call am__lastword, $(1)), \
+      $(if $(filter $(lastword $(1)), \
                     $(call am__strip_lastword, $(1))), \
            $(am__empty), \
-           $(call am__lastword,$(1)))))
+           $(lastword $(1)))))
 
 ## Simple memoization for recursive make variables.  It is useful for
 ## situations where immediate variables can't be used (due, say, to
diff --git a/t/verbatim.sh b/t/verbatim.sh
new file mode 100755
index 0000000..44151d9
--- /dev/null
+++ b/t/verbatim.sh
@@ -0,0 +1,141 @@
+#! /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/>.
+
+# A line starting with '!' is passed verbatim to the output Makefile,
+# and in the right place too.
+
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([Makefile2 Makefile3])
+AC_OUTPUT
+END
+
+long1=long
+long2="$long1 $long1"
+long4="$long2 $long2"
+long8="$long4 $long4"
+long16="$long8 $long8"
+long32="$long16 $long16"
+long64="$long32 $long32"
+long128="$long64 $long64"
+long256="$long128 $long128"
+long512="$long256 $long265"
+
+# Sanity check.
+case $long512 in
+  *' long long '*) ;;
+  *) fatal_ 'defining $long512' ;;
+esac
+
+cat > Makefile.am << END
+!x = $long256
+!!unmodified!
+!## unmodified
+! foo = \
+rule:
+END
+
+cat > Makefile2.am << 'END'
+!badrule1: ; @echo "'$@' unexpectedly won over 'all'!"; exit 1
+!badrule2:
+!      @echo "'$@' unexpectedly won over 'all'!"; exit 1
+all-local: verbatim-rule
+       test -f $<.ok
+!verbatim-rule:
+!ifeq (ok,ok)
+!      @echo $@ run correctly
+!      : > address@hidden
+!else
+!      echo $@ failure; exit 1
+!endif
+# We want this deliberately after verbatim-rule.
+x = ok
+END
+
+cat > Makefile3.am << 'END'
+x1 := 1
+x2 := 2
+
+foo = .
+
+!ifndef FOO
+!foo += $(x1)
+!else
+!foo += $(x2)
+!endif
+
+!ifeq ($(BAR),1)
+!bar = aaa
+!else
+!ifeq "$(BAR)" "2"
+!bar = lol
+!else
+!bar = default
+!endif # this comment should be comment ignored
+!endif
+
+check-var:
+       test '$($(var))' = '$(val)'
+END
+
+# Avoid interferences from the environment.
+FOO= BAR=; unset FOO BAR
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '^!' Makefile.in | grep -v '^!unmodified!$' && Exit 1
+grep '^!' Makefile[23].in && Exit 1
+
+# Use perl, to avoid possible issues with regex length in vendor greps.
+$PERL -e "
+  while (<>) { exit 0 if (/^x = $long256$/); }
+  exit 1;
+" Makefile.in
+
+grep '^!unmodified!$' Makefile.in
+grep '^## unmodified$' Makefile.in
+# FIXME: automake is not yet smart enough to handle line continuation
+# FIXME: on the last line of a '!' series correctly.
+#grep '^ foo = \\$' Makefile.in
+
+$EGREP 'foo|bar' Makefile3.in # For debugging.
+test `grep -c '^foo +=' Makefile3.in` -eq 2
+test `grep -c '^bar =' Makefile3.in` -eq 3
+
+$AUTOCONF
+./configure
+
+# FIXME: automake is not yet smart enough to handle line continuation
+# FIXME: on the last line of a '!' series correctly.
+#grep '^ foo = \\$' Makefile.in
+#$MAKE rule
+
+$MAKE -f Makefile2
+test -f verbatim-rule.ok
+
+$MAKE -f Makefile3 check-var var=foo val='. 1'
+$MAKE -f Makefile3 check-var var=foo val='. 1' FOO=''
+$MAKE -f Makefile3 check-var var=foo val='. 2' FOO=yes
+$MAKE -f Makefile3 check-var var=foo val='. 2' FOO=' who cares!'
+
+$MAKE -f Makefile3 check-var var=bar val=default
+$MAKE -f Makefile3 check-var var=bar val=aaa     BAR=1
+$MAKE -f Makefile3 check-var var=bar val=lol     BAR=2
+$MAKE -f Makefile3 check-var var=bar val=default BAR=3
+
+:


hooks/post-receive
-- 
GNU Automake