[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1700-g8f76fd5

[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=8f76fd511ed794810a7cff4d6043e1cdc6255754

The branch, master has been updated
       via  8f76fd511ed794810a7cff4d6043e1cdc6255754 (commit)
      from  2365d0885a174f2443c8a3306a7a943a374be4c7 (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 8f76fd511ed794810a7cff4d6043e1cdc6255754
Author: Paul Eggert <address@hidden>
Date:   Wed Jan 4 07:53:02 2012 -0800

    cosmetics: prefer the term "Windows" over "Win32"
    
    Microsoft has renamed the Win32 API to "Windows API":
      <http://msdn.microsoft.com/en-us/library/aa383723.aspx>
    
    Also, after some discussion on bug-gnulib, when talking about hosts and
    platforms we believe it's better to talk about "Windows" or "native
    Windows" instead:
      <https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00009.html>
      <https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00027.html>
    
    * doc/automake.texi: Mention "Windows", not "Win32".
    * lib/Automake/XFile.pm: Likewise.
    * lib/ar-lib: Likewise.
    * lib/compile: Likewise.
    * tests/compile2.test: Mention "Windows", not "w32".

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

Summary of changes:
 doc/automake.texi     |    2 +-
 lib/Automake/XFile.pm |    8 ++++----
 lib/ar-lib            |    7 +++----
 lib/compile           |    8 ++++----
 tests/compile2.test   |   11 +++++------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/doc/automake.texi b/doc/automake.texi
index a346233..9e2a989 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -10242,7 +10242,7 @@ test.  For instance, @command{false} (from GNU 
coreutils) is never
 successful, even for @option{--help} or @option{--version}.  You can list
 such programs in the variable @code{AM_INSTALLCHECK_STD_OPTIONS_EXEMPT}.
 Programs (not scripts) listed in this variable should be suffixed by
address@hidden(EXEEXT)} for the sake of Win32 or OS/2.  For instance, suppose we
address@hidden(EXEEXT)} for the sake of Windows or OS/2.  For instance, suppose 
we
 build @file{false} as a program but @file{true.sh} as a script, and that
 neither of them support @option{--help} or @option{--version}:
 
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 4ba84ce..b80025d 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2001, 2003, 2004, 2006, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2006, 2008, 2009, 2010, 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
@@ -176,8 +176,8 @@ C<\n> on input files.
 
 =cut
 
-# Some Win32/perl installations fail to translate \r\n to \n on input
-# so we do that here.
+# Some native Windows/perl installations fail to translate \r\n to \n on
+# input so we do that here.
 sub getline
 {
   local $_ = $_[0]->SUPER::getline;
diff --git a/lib/ar-lib b/lib/ar-lib
index 4883fef..1a1dbd0 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -2,10 +2,9 @@
 # Wrapper for Microsoft lib.exe
 
 me=ar-lib
-scriptversion=2010-09-02.19; # UTC
+scriptversion=2012-01-04.17; # UTC
 
-# Copyright (C) 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
 # Written by Peter Rosin <address@hidden>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -42,7 +41,7 @@ file_conv=
 
 # func_file_conv build_file
 # Convert a $build file to $host form and store it in $file
-# Currently only supports Win32 hosts.
+# Currently only supports Windows hosts.
 func_file_conv ()
 {
   file=$1
diff --git a/lib/compile b/lib/compile
index bac481c..b246777 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2010-11-15.09; # UTC
+scriptversion=2012-01-04.17; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <address@hidden>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@ file_conv=
 
 # func_file_conv build_file lazy
 # Convert a $build file to $host form and store it in $file
-# Currently only supports Win32 hosts. If the determined conversion
+# Currently only supports Windows hosts. If the determined conversion
 # type is listed in (the comma separated) LAZY, no conversion will
 # take place.
 func_file_conv ()
diff --git a/tests/compile2.test b/tests/compile2.test
index c89be9f..68ab44d 100755
--- a/tests/compile2.test
+++ b/tests/compile2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 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
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure `compile' deals correctly with w32 style paths.
+# Make sure `compile' deals correctly with Windows-style paths.
 
 am_create_testdir=empty
 . ./defs || Exit 1
@@ -61,11 +61,10 @@ export amtest_source amtest_object amtest_obj amtest_lock
 ./compile ./mycc -c "$amtest_source" -o "$amtest_object"
 test -f "$amtest_object"
 
-
-# Absolute w32 paths should be accepted.
-# Do not actually run this test on anything that could be w32.
+# Absolute Windows paths should be accepted.
+# Do not actually run this test on anything that could be Windows.
 if test -d 'C:\'; then
-  skip_ "this test shouldn't run on a win32-like system"
+  skip_ "this test shouldn't run on a Windows-like system"
 fi
 case $PATH_SEPARATOR in
  ';'|':');;


hooks/post-receive
-- 
GNU Automake