[SCM] GNU Libtool branch, master, updated. v2.2.6-79-gd356bfc
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 Libtool. The branch, master has been updated via d356bfc32fd946b3a62eec391fefa9e1714ff53d (commit) from 9f559243e8d9c2cc161acfab7ee4d274c7c422c5 (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 d356bfc32fd946b3a62eec391fefa9e1714ff53d Author: Peter Rosin p...@lysator.liu.se Date: Thu Jan 29 08:55:08 2009 +0100 Make modified libtool script in cwrapper test executable * tests/cwrapper.at: Make modified libtool script executable. Report by Roumen Petrov. --- Summary of changes: ChangeLog |6 ++ tests/cwrapper.at |1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e823ff7..f7fd4d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-29 Peter Rosin p...@lysator.liu.se + + Make modified libtool script in cwrapper test executable + * tests/cwrapper.at: Make modified libtool script executable. + Report by Roumen Petrov. + 2009-01-28 Akim Demaille demai...@gostai.com Clean space uses. diff --git a/tests/cwrapper.at b/tests/cwrapper.at index ce4572e..42f8d0f 100644 --- a/tests/cwrapper.at +++ b/tests/cwrapper.at @@ -58,6 +58,7 @@ orig_LIBTOOL=$LIBTOOL for restrictive_flags in '-Wall -Werror' '-std=c89 -Wall -Werror' '-std=c99 -Wall -Werror'; do CFLAGS=$orig_CFLAGS $restrictive_flags sed s/LTCFLAGS=.*/' $restrictive_flags'/ $orig_LIBTOOL ./libtool + chmod +x libtool LIBTOOL=./libtool # make sure $restrictive_flags do not cause a failure hooks/post-receive -- GNU Libtool
[SCM] GNU Libtool branch, master, updated. v2.2.6-80-g3e0beef
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 Libtool. The branch, master has been updated via 3e0beef8eb35a734514d5c4871f19a32c5edb145 (commit) from d356bfc32fd946b3a62eec391fefa9e1714ff53d (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 3e0beef8eb35a734514d5c4871f19a32c5edb145 Author: Akim Demaille demai...@gostai.com Date: Thu Jan 29 18:39:58 2009 +0100 Normalize compiler output due to compiler wrappers. * tests/testsuite.at (LT_AT_NORMALIZE_COMPILER_OUTPUT): New macro, to normalize ccache and distcc output. * tests/localization.at (localized compiler messages): Use it. Signed-off-by: Ralf Wildenhues ralf.wildenh...@gmx.de --- Summary of changes: ChangeLog |8 tests/localization.at | 12 +--- tests/testsuite.at| 14 ++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7fd4d1..3c2871d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-01-29 Akim Demaille demai...@gostai.com + Ralf Wildenhues ralf.wildenh...@gmx.de + + Normalize compiler output due to compiler wrappers. + * tests/testsuite.at (LT_AT_NORMALIZE_COMPILER_OUTPUT): New + macro, to normalize ccache and distcc output. + * tests/localization.at (localized compiler messages): Use it. + 2009-01-29 Peter Rosin p...@lysator.liu.se Make modified libtool script in cwrapper test executable diff --git a/tests/localization.at b/tests/localization.at index 92b19ac..119b38d 100644 --- a/tests/localization.at +++ b/tests/localization.at @@ -43,15 +43,13 @@ AT_CHECK([$CC $CPPFLAGS $CFLAGS -c b.c || exit 77], [], [stdout], [stderr]) # Find out about expected output. AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c || exit 1], [1], [stdout], [stderr]) -LT_AT_UNIFY_NL([stdout], [expected-stdout]) -LT_AT_UNIFY_NL([stderr], [expected-stderr]) +LT_AT_NORMALIZE_COMPILER_OUTPUT([stdout], [expected-stdout]) +LT_AT_NORMALIZE_COMPILER_OUTPUT([stderr], [expected-stderr]) AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || exit 1], [1], [stdout], [stderr]) -LT_AT_UNIFY_NL([stderr]) -AT_CHECK([diff expected-stderr stderr]) -LTBASE=`$ECHO $LIBTOOL | sed 's,^.*/,,'` -grep -v ^$LTBASE: compile stdout libtool-stdout -LT_AT_UNIFY_NL([libtool-stdout]) +LT_AT_NORMALIZE_COMPILER_OUTPUT([stdout], [libtool-stdout]) +LT_AT_NORMALIZE_COMPILER_OUTPUT([stderr], [libtool-stderr]) +AT_CHECK([diff expected-stderr libtool-stderr]) AT_CHECK([diff expected-stdout libtool-stdout]) # check that we get our quoting right. diff --git a/tests/testsuite.at b/tests/testsuite.at index 24e8174..92e786e 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -218,6 +218,20 @@ m4_define([LT_AT_UNIFY_NL], esac]) +# LT_AT_NORMALIZE_COMPILER_OUTPUT(FILE, [RESULT-FILE]) +# +# Normalize differences in compiler output stemming from, e.g., +# - distcc process numbers, +# - ccache file location, +# - newline encoding, +# - location of the libtool script. +m4_define([LT_AT_NORMALIZE_COMPILER_OUTPUT], +[_ltbase=`$ECHO $LIBTOOL | sed 's,^.*/,,'` +[sed /^distcc\[[0-9]*\]/d; /^$_ltbase: compile/d $1 $1.t] +LT_AT_UNIFY_NL([$1.t], [m4_default([$2], [$1])])[]dnl +]) + + # LT_AT_EXEC_CHECK(EXECUTABLE, [STATUS = 0], [STDOUT], [STDERR], # [ARGS-OR-STATUS-ADJUST]) # -- hooks/post-receive -- GNU Libtool
[SCM] GNU Libtool branch, master, updated. v2.2.6-81-g18c6031
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 Libtool.
The branch, master has been updated
via 18c603141ee49f71c49c0e54f9f831316c023b91 (commit)
from 3e0beef8eb35a734514d5c4871f19a32c5edb145 (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 18c603141ee49f71c49c0e54f9f831316c023b91
Author: Ralf Wildenhues ralf.wildenh...@gmx.de
Date: Thu Jan 29 18:53:13 2009 +0100
func_version copes with multi-line copyright headers.
* libltdl/config/getopt.m4sh (func_version): Slurp in copyright
lines until a period is found.
* libltdl/config/ltmain.m4sh: Multi-line copyright is ok to use
now.
* tests/help.at (standard command line options): New file, new
tests. Make this test group the first one for libtool tests,
moving the banner ...
* tests/duplicate_members.at: ... from here.
* Makefile.am (TESTSUITE_AT): Add tests/help.at.
Signed-off-by: Ralf Wildenhues ralf.wildenh...@gmx.de
---
Summary of changes:
ChangeLog | 13 +
Makefile.am|1 +
libltdl/config/getopt.m4sh | 13 +++--
libltdl/config/ltmain.m4sh |3 ++-
tests/duplicate_members.at |3 +--
tests/{cdemo-exec.test = help.at} | 24 ++--
6 files changed, 42 insertions(+), 15 deletions(-)
copy tests/{cdemo-exec.test = help.at} (57%)
mode change 100755 = 100644
diff --git a/ChangeLog b/ChangeLog
index 3c2871d..7c92026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-29 Ralf Wildenhues ralf.wildenh...@gmx.de
+
+ func_version copes with multi-line copyright headers.
+ * libltdl/config/getopt.m4sh (func_version): Slurp in copyright
+ lines until a period is found.
+ * libltdl/config/ltmain.m4sh: Multi-line copyright is ok to use
+ now.
+ * tests/help.at (standard command line options): New file, new
+ tests. Make this test group the first one for libtool tests,
+ moving the banner ...
+ * tests/duplicate_members.at: ... from here.
+ * Makefile.am (TESTSUITE_AT): Add tests/help.at.
+
2009-01-29 Akim Demaille demai...@gostai.com
Ralf Wildenhues ralf.wildenh...@gmx.de
diff --git a/Makefile.am b/Makefile.am
index 7a61846..b6b1bfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -451,6 +451,7 @@ dist-hook:
TESTSUITE = tests/testsuite
TESTSUITE_AT = tests/testsuite.at \
tests/libtoolize.at \
+ tests/help.at \
tests/duplicate_members.at \
tests/duplicate_conv.at \
tests/duplicate_deps.at \
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 8cf99de..5f20320 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -1,6 +1,7 @@
m4_if([getopt.m4sh -- getopt helper functions -*- Autoconf -*-
- Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+ Foundation, Inc.
Written by Gary V. Vaughan, 2004
This file is part of GNU Cvs-utils.
@@ -35,7 +36,15 @@ M4SH_VERBATIM([[
# Echo version message to standard output and exit.
func_version ()
{
-$SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+$SED -n '/(C)/!b go
+ :more
+ /\./! {
+ N
+ s/\n# //
+ b more
+ }
+ :go
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 08045bf..83bfaf4 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4,7 +4,8 @@ m4_divert_push([SCRIPT])# @configure_input@
# libtool (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
# Written by Gordon Matzigkeit g...@gnu.ai.mit.edu, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/tests/duplicate_members.at b/tests/duplicate_members.at
index afa9d20..657e307 100755
--- a/tests/duplicate_members.at
+++ b/tests/duplicate_members.at
@@ -1,6 +1,6 @@
# duplicate_members.at -- duplicate members in archive tests -*- Autotest -*-
-# Copyright (C) 2005, 2007,
[SCM] GNU Libtool branch, master, updated. v2.2.6-82-gb93a3db
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 Libtool.
The branch, master has been updated
via b93a3db892cb3203ec5cfe10cb673999b13e13d2 (commit)
from 18c603141ee49f71c49c0e54f9f831316c023b91 (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 b93a3db892cb3203ec5cfe10cb673999b13e13d2
Author: Ralf Wildenhues ralf.wildenh...@gmx.de
Date: Thu Jan 29 19:54:31 2009 +0100
Document --mode short-hands better, and test them.
* doc/libtool.texi (Invoking libtool): Give examples for using
the `--mode=MODE' short-hand `MODE', or abbreviations thereof.
* libltdl/config/ltmain.m4sh: Mention the short-hand for MODE
in the --help output.
* tests/help.at (mode short-hands): New test group.
Suggestion by Bruno Haible.
---
Summary of changes:
ChangeLog |8 ++
doc/libtool.texi | 10 +++-
libltdl/config/ltmain.m4sh |3 +-
tests/help.at | 52
4 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7c92026..2a54a64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-01-29 Ralf Wildenhues ralf.wildenh...@gmx.de
+ Document --mode short-hands better, and test them.
+ * doc/libtool.texi (Invoking libtool): Give examples for using
+ the `--mode=MODE' short-hand `MODE', or abbreviations thereof.
+ * libltdl/config/ltmain.m4sh: Mention the short-hand for MODE
+ in the --help output.
+ * tests/help.at (mode short-hands): New test group.
+ Suggestion by Bruno Haible.
+
func_version copes with multi-line copyright headers.
* libltdl/config/getopt.m4sh (func_version): Slurp in copyright
lines until a period is found.
diff --git a/doc/libtool.texi b/doc/libtool.texi
index c3a2906..02340d9 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1161,8 +1161,16 @@ operation mode, and exit.
Use @var{mode} as the operation mode. When using libtool from the
command line, you can give just @var{mode} (or a unique abbreviation
of it) as the first argument as a shorthand for the full
-...@option{--mode=@var{mode}}.
+...@option{--mode=@var{mode}}. For example, the following are equivalent:
+...@example
+$ @kbd{libtool --mode=execute --dry-run gdb prog.exe}
+$ @kbd{libtoolexecute --dry-run gdb prog.exe}
+$ @kbd{libtoolexe --dry-run gdb prog.exe}
+$ @kbd{libtoole --dry-run gdb prog.exe}
+...@end example
+
+...@noindent
@var{mode} must be set to one of the following:
@table @option
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 83bfaf4..de63a83 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -59,7 +59,8 @@ m4_divert_push([SCRIPT])# @configure_input@
# link create a library or an executable
# uninstall remove libraries from an installed directory
#
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE. When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
diff --git a/tests/help.at b/tests/help.at
index f0e7e94..3460a2b 100644
--- a/tests/help.at
+++ b/tests/help.at
@@ -36,3 +36,55 @@ AT_CHECK([$LIBTOOL --version], [], [stdout])
AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
AT_CLEANUP
+
+
+AT_SETUP([mode short-hands])
+
+AT_DATA([a.c],
+[[int a () { return 0; }
+]])
+
+AT_DATA([main.c],
+[[extern int a ();
+int main () { return a (); }
+]])
+
+inst=`pwd`/inst
+libdir=$inst/lib
+bindir=$inst/bin
+mkdir $inst $libdir $bindir
+
+AT_CHECK([$LIBTOOL compile $CC $CPPFLAGS $CFLAGS -c a.c],
+[], [ignore], [ignore])
+AT_CHECK([$LIBTOOL co $CC $CPPFLAGS $CFLAGS -c main.c],
+[], [ignore], [ignore])
+AT_CHECK([$LIBTOOL co $CC $CPPFLAGS $CFLAGS -c main.c],
+[], [ignore], [ignore])
+AT_CHECK([$LIBTOOL link $CC $CFLAGS $LDFLAGS -o liba.la a.lo ]dnl
+[-no-undefined -rpath $libdir], [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL l $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.lo ]dnl
+[liba.la], [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL execute --dry-run ./main$EXEEXT],
+[], [ignore], [ignore])
+AT_CHECK([$LIBTOOL exe --dry-run ./main$EXEEXT],
+[], [ignore], [ignore])
+AT_CHECK([$LIBTOOL e --dry-run ./main$EXEEXT],
+[], [ignore], [ignore])
+AT_CHECK([$LIBTOOL
[SCM] GNU Libtool branch, master, updated. v2.2.6-83-g13ef1b3
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 Libtool.
The branch, master has been updated
via 13ef1b34b7a17af22769817f243c347b4412a890 (commit)
from b93a3db892cb3203ec5cfe10cb673999b13e13d2 (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 13ef1b34b7a17af22769817f243c347b4412a890
Author: Akim Demaille demai...@gostai.com
Date: Mon Jan 5 11:56:24 2009 +0100
Fix func_exec_init.
* tests/defs.m4sh (func_exec_init): Instead of using the undefined
my_dir, call func_dirname_and_basename and use its result.
(func_make): For consistency, don't use the useless local variable
my_dir.
---
Summary of changes:
ChangeLog |8
tests/defs.m4sh | 12 +---
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2a54a64..df36a16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-29 Akim Demaille demai...@gostai.com
+
+ Fix func_exec_init.
+ * tests/defs.m4sh (func_exec_init): Instead of using the undefined
+ my_dir, call func_dirname_and_basename and use its result.
+ (func_make): For consistency, don't use the useless local variable
+ my_dir.
+
2009-01-29 Ralf Wildenhues ralf.wildenh...@gmx.de
Document --mode short-hands better, and test them.
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 27c6f77..58296da 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -2,7 +2,7 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
# @configure_input@
# defs -- Defines for Libtool testing environment.
#
-# Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software
+# Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software
# Foundation, Inc.
# Written by Gord Matzigkeit, 1996
# Rewritten by Gary V. Vaughan, 2003
@@ -102,7 +102,7 @@ func_get_config ()
my_build_regex=false
fi
my_first=:
-
+
for my_varname in $my_varname_list; do
if $my_build_regex; then
$my_first || my_regex=$my_regex|
@@ -247,9 +247,7 @@ func_make ()
$opt_debug
my_args=${1+$@}
func_dirname_and_basename `pwd`
-my_dir=$func_basename_result
-
-func_msg Running \`$MAKE $my_args' in $my_dir
+func_msg Running \`$MAKE $my_args' in $func_basename_result
eval $MAKE $my_args || exit $EXIT_FAIL
}
@@ -288,7 +286,8 @@ func_make_uninstall ()
func_exec_init ()
{
$opt_debug
-func_msg Executing $1 programs in $my_dir
+func_dirname_and_basename `pwd`
+func_msg Executing $1 programs in $func_basename_result
# Windows hosts search for dlls in the command path
PATH=$prefix/lib:$PATH
@@ -359,4 +358,3 @@ func_msg Running $progname
# sh-indentation:2
# End:
]])
-
hooks/post-receive
--
GNU Libtool
[SCM] GNU Libtool branch, master, updated. v2.2.6-85-g0980a39
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 Libtool. The branch, master has been updated via 0980a3993a6138895d4884f92ff9764d426b148d (commit) from 425841cbdee3b690eb89a92403e97b0852f95771 (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 0980a3993a6138895d4884f92ff9764d426b148d Author: Akim Demaille demai...@gostai.com Date: Fri Jan 30 02:52:17 2009 -0500 Fix cwrapper warnings from MSVC 2005. * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src) [file scope]: define _CRT_SECURE_NO_DEPRECATE. --- Summary of changes: ChangeLog |6 ++ libltdl/config/ltmain.m4sh |3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 135229c..fb41b86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-30 Akim Demaille demai...@gostai.com + + Fix cwrapper warnings from MSVC 2005. + * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src) + [file scope]: define _CRT_SECURE_NO_DEPRECATE. + 2009-01-29 Akim Demaille demai...@gostai.com Fix bootstrap with older libtool.m4 in reach of aclocal. diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index de63a83..5f66471 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -2712,6 +2712,9 @@ func_emit_cwrapperexe_src () */ EOF cat EOF +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include stdio.h #include stdlib.h #ifdef _MSC_VER hooks/post-receive -- GNU Libtool
