libtool-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU Libtool branch, master, updated. v2.4.2.444-14-gda59d47


From: Gary V. Vaughan
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-14-gda59d47
Date: Fri, 03 Jan 2014 07:10:18 +0000

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  da59d47a448f0a623c7f56632dbe8c3f864a450a (commit)
       via  9ef95183f0ae64d1cdbfeb68d3ad6ce37e6e9b97 (commit)
       via  5b1d8fd0a05f2aec7f67082c9343a9a592910a2c (commit)
      from  9f8717edbcb133d0aa3fa797e56de83432acd941 (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 da59d47a448f0a623c7f56632dbe8c3f864a450a
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Jan 3 20:07:48 2014 +1300

    inline-source: gawk doesn't have boolean constants.
    
    I've been writing a lot of Lua lately, but still a silly mistake:(
    * gl/build-aux/inline-source (func_include): Use `magic` variable
    to count #! lines found, and only output the DO NOT EDIT warning
    after the first one.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 9ef95183f0ae64d1cdbfeb68d3ad6ce37e6e9b97
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Jan 3 18:21:40 2014 +1300

    edit-readme-alpha: adjust for recent README edits.
    
    * build-aux/edit-readme-alpha: Adjust regexps for recent README
    improvements.
    * README.md: Fix a SPACE-TAB sanity check failure.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 5b1d8fd0a05f2aec7f67082c9343a9a592910a2c
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Jan 3 18:20:40 2014 +1300

    bootstrap: fix test-dollar sanity check failure.
    
    * gl/build-aux/bootstrap.in (func_ensure_README): quote argument.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 README.md                   |    2 +-
 bootstrap                   |    6 +++---
 build-aux/edit-readme-alpha |   12 ++++++------
 gl/build-aux/bootstrap.in   |    6 +++---
 gl/build-aux/inline-source  |    6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 96898b4..5e41f2e 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ that further limiting of the recursive set of tests is 
possible.  For
 example, to run only the template tests within the `max_cmd_len`, use:
 
     gmake check TESTSUITEFLAGS="-v -x -k max_cmd_len \
-               INNER_TESTSUITEFLAGS=',template -v -x'"
+                INNER_TESTSUITEFLAGS=',template -v -x'"
 
 If you wish to report test failures to the libtool list, you need to
 send the file `tests/testsuite.log` to the [bug mailing list][].
diff --git a/bootstrap b/bootstrap
index 44cd0cd..e102622 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3029,17 +3029,17 @@ EOT
 # Without AM_INIT_AUTOMAKE([foreign]), automake will not run to
 # completion with no README file, even though README.md or README.txt
 # is often preferable.
-func_ensure_changelog ()
+func_ensure_README ()
 {
     $debug_cmd
 
     test -f README || {
       _G_README=
       for _G_readme in README.txt README.md README.rst; do
-        test -f $_G_readme && break
+        test -f "$_G_readme" && break
       done
 
-      test -f $_G_readme && $LN_S $_G_readme README
+      test -f "$_G_readme" && $LN_S $_G_readme README
       func_verbose "$LN_S $_G_readme README"
     }
 
diff --git a/build-aux/edit-readme-alpha b/build-aux/edit-readme-alpha
index 390994a..166584c 100755
--- a/build-aux/edit-readme-alpha
+++ b/build-aux/edit-readme-alpha
@@ -64,12 +64,12 @@ for file in "$@"; do
 
   # Make sure the paragraph we are matching has not been edited since
   # this script was written.
-  matched=`sed -n -e '/^This is GNU Libtool,/,/^interface\.$/p' $file \
+  matched=`sed -n -e '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable 
interface\.$/p' $file \
            |wc -l |sed 's|^ *||'`
 
   # Unless, of course, it was edited by this script already.
   test 3 = "$matched" \
-      || matched=`sed -n -e '/^This is an alpha testing release/,/behind a 
consistent, portable interface\.$/p' $file \
+      || matched=`sed -n -e '/^This is an alpha testing release/,/a 
consistent, portable interface\.$/p' $file \
                   |wc -l |sed 's|^ *||'`
 
   test 3 = "$matched" \
@@ -79,10 +79,10 @@ for file in "$@"; do
   trap 'x=$?; rm $file.T; exit $x' 1 2 13 15
 
   # Edit the first paragraph to be suitable for an alpha release.
-  sed -e '/^This is GNU Libtool,/,/^interface.$/c\
-This is an alpha testing release of GNU Libtool, a generic library\
-support script.  Libtool hides the complexity of using shared libraries\
-behind a consistent, portable interface.' $file > $file.T
+  sed -n '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable 
interface\.$/c\
+This is an alpha testing release of [GNU Libtool][libtool], a generic\
+library support script.  [Libtool][] hides the complexity of using shared\
+libraries behind a consistent, portable interface.' $file > $file.T
 
   # Diagnose redirection failure.
   test -f "$file.T" || func_fatal_error "Unable to write $file.T"
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index d596c84..848d344 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -695,17 +695,17 @@ EOT
 # Without AM_INIT_AUTOMAKE([foreign]), automake will not run to
 # completion with no README file, even though README.md or README.txt
 # is often preferable.
-func_ensure_changelog ()
+func_ensure_README ()
 {
     $debug_cmd
 
     test -f README || {
       _G_README=
       for _G_readme in README.txt README.md README.rst; do
-        test -f $_G_readme && break
+        test -f "$_G_readme" && break
       done
 
-      test -f $_G_readme && $LN_S $_G_readme README
+      test -f "$_G_readme" && $LN_S $_G_readme README
       func_verbose "$LN_S $_G_readme README"
     }
 
diff --git a/gl/build-aux/inline-source b/gl/build-aux/inline-source
index 54cce33..1e4772c 100755
--- a/gl/build-aux/inline-source
+++ b/gl/build-aux/inline-source
@@ -124,13 +124,13 @@ func_include ()
     test -n "$_G_scriptdir" || _G_scriptdir="./"
 
     $AWK '
-        BEGIN { domagic = true; }
+        BEGIN { magic = 0; }
 
-        /^#!/ && domagic == true {
+        /^#!/ && magic == 0 {
             print $0;
             print "## DO NOT EDIT - This file generated from '$1'";
             print "##               by '$progname' v'$scriptversion'";
-            domagic = false;
+            magic++;
             next;
         }
 


hooks/post-receive
-- 
GNU Libtool



reply via email to

[Prev in Thread] Current Thread [Next in Thread]