[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-313-g5b76e39

[Peter Rosin]

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=5b76e39c947d9862f786dc0eeb86553f8944dbd9

The branch, master has been updated
       via  5b76e39c947d9862f786dc0eeb86553f8944dbd9 (commit)
       via  a89953333a36b8b8ebce393fe74034e4bfb739ab (commit)
      from  09cbcbb33ae6eb9f72b1857931f4b3879df92514 (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 5b76e39c947d9862f786dc0eeb86553f8944dbd9
Merge: 09cbcbb a899533
Author: Peter Rosin <address@hidden>
Date:   Mon Aug 16 10:00:23 2010 +0200

    Merge branch 'msvc'

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

Summary of changes:
 ChangeLog           |    9 +++++++++
 lib/compile         |   16 +++++++++++++++-
 tests/compile3.test |    4 ++++
 3 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ba4851..73123f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-16  Peter Rosin  <address@hidden>
+
+       Support more C++ file extensions for MSVC in the compile script.
+       * lib/compile (func_cl_wrapper): MSVC only recognizes the .cpp
+       file extension as C++, unless it's given a hint. So hint about
+       .cc, .CC, .cxx, .CXX, c++ and C++. Also do path conversion on
+       .c, .cpp, .CPP, .lib, .LIB and .Lib files.
+       * lib/compile3.test: Test the C++ hinting.
+
 2010-08-12  Peter Rosin  <address@hidden>
 
        Enable the use of "link -lib" as the wrapped archiver.
diff --git a/lib/compile b/lib/compile
index bdb4ccb..cd3b801 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2010-08-07.06; # UTC
+scriptversion=2010-08-16.07; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -129,6 +129,20 @@ func_cl_wrapper ()
          eat=1
          linker_opts="$linker_opts $2"
          ;;
+       -*)
+         set x "$@" "$1"
+         shift
+         ;;
+       *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+         func_file_conv "$1"
+         set x "$@" -Tp"$file"
+         shift
+         ;;
+       *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib)
+         func_file_conv "$1"
+         set x "$@" "$file"
+         shift
+         ;;
        *)
          set x "$@" "$1"
          shift
diff --git a/tests/compile3.test b/tests/compile3.test
index fc5cd8e..b77237b 100755
--- a/tests/compile3.test
+++ b/tests/compile3.test
@@ -42,4 +42,8 @@ test x"$opts" = x"-c foo.c -Fofoo.obj -Ibaz"
 opts=`./compile ./cl -c foo.c -o foo.o -Ibaz`
 test x"$opts" = x"-c foo.c -Fofoo.o -Ibaz"
 
+# Check if compile handles "foo.cc" as C++.
+opts=`./compile ./cl -c foo.cc -o foo.o -Ibaz`
+test x"$opts" = x"-c -Tpfoo.cc -Fofoo.o -Ibaz"
+
 :


hooks/post-receive
-- 
GNU Automake