[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-53-geedc660

[Ralf Wildenhues]

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=eedc6603a4ad6f768f9e512b9b47cb9d3ee168d0

The branch, branch-1-10 has been updated
       via  eedc6603a4ad6f768f9e512b9b47cb9d3ee168d0 (commit)
      from  b353073e953d61067e54708eaed2070fc20fbd02 (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 eedc6603a4ad6f768f9e512b9b47cb9d3ee168d0
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Nov 22 11:46:39 2008 +0100

    When installing COPYING, recommend adding the file to VCS.
    
    * automake.in (require_file_internal): If installing `COPYING',
    mention that we install the GPLv3 file and recommend adding the
    file to version control.
    * doc/automake.texi (Invoking Automake): Point to `Gnits' node
    for `--add-missing'.
    (Gnits): Clarify semantics: that for strictness gnu or higher,
    INSTALL is installed, and that COPYING is installed as GPLv3
    if no COPYING file exists.
    * tests/license2.test: New test.
    * tests/Makefile.am: Update.
    * NEWS, THANKS: Update.
    Report by Brian Cameron.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                              |   16 ++++++++++++++++
 NEWS                                   |    4 ++++
 THANKS                                 |    1 +
 automake.in                            |   14 +++++++++++++-
 doc/automake.texi                      |   11 +++++++++++
 tests/Makefile.am                      |    1 +
 tests/Makefile.in                      |    1 +
 tests/{libtoo11.test => license2.test} |   31 +++++++++++++++++--------------
 8 files changed, 64 insertions(+), 15 deletions(-)
 copy tests/{libtoo11.test => license2.test} (67%)

diff --git a/ChangeLog b/ChangeLog
index 993ea2e..1a8efba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-11-22  Ralf Wildenhues  <address@hidden>
+
+       When installing COPYING, recommend adding the file to VCS.
+       * automake.in (require_file_internal): If installing `COPYING',
+       mention that we install the GPLv3 file and recommend adding the
+       file to version control.
+       * doc/automake.texi (Invoking Automake): Point to `Gnits' node
+       for `--add-missing'.
+       (Gnits): Clarify semantics: that for strictness gnu or higher,
+       INSTALL is installed, and that COPYING is installed as GPLv3
+       if no COPYING file exists.
+       * tests/license2.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS, THANKS: Update.
+       Report by Brian Cameron.
+
 2008-11-20  William Pursell  <address@hidden>
 
        * doc/automake.texi (Timeline): Fix typos and grammaros.
diff --git a/NEWS b/NEWS
index ea96842..8cba308 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,10 @@ Bugs fixed in 1.10.1a:
 
   - The manual is now distributed under the terms of the GNU FDL 1.3.
 
+  - When `automake --add-missing' causes the COPYING file to be installed,
+    it will also warn that the license file should be added to source
+    control.
+
 
 New in 1.10.1:
 
diff --git a/THANKS b/THANKS
index 9c6b33e..4ac04b0 100644
--- a/THANKS
+++ b/THANKS
@@ -42,6 +42,7 @@ Bob Proulx            address@hidden
 Bob Rossi              address@hidden
 Braden N. McDaniel     address@hidden
 Brendan O'Dea          address@hidden
+Brian Cameron          address@hidden
 Brian Ford             address@hidden
 Brian Gough            address@hidden
 Brian Jones            address@hidden
diff --git a/automake.in b/automake.in
index 21ce4df..30b18f6 100755
--- a/automake.in
+++ b/automake.in
@@ -7184,6 +7184,7 @@ sub require_file_internal ($$$@)
                }
 
              my $trailer = '';
+             my $trailer2 = '';
              my $suppress = 0;
 
              # Only install missing files according to our desired
@@ -7199,6 +7200,17 @@ sub require_file_internal ($$$@)
                      # can, copy if we must.  Note: delete the file
                      # first, in case it is a dangling symlink.
                      $message = "installing `$fullfile'";
+
+                     # The license file should not be volatile.
+                     if ($file eq "COPYING")
+                       {
+                         $message .= " using GNU General Public License v3 
file";
+                         $trailer2 = "\n    Consider adding the COPYING file"
+                                   . " to the version control system"
+                                   . "\n    for your code, to avoid questions"
+                                   . " about which license your project uses.";
+                       }
+
                      # Windows Perl will hang if we try to delete a
                      # file that doesn't exist.
                      unlink ($fullfile) if -f $fullfile;
@@ -7251,7 +7263,7 @@ sub require_file_internal ($$$@)
              next
                if !$suppress && rule $file;
 
-             msg ($suppress ? 'note' : 'error', $where, "$message$trailer");
+             msg ($suppress ? 'note' : 'error', $where, 
"$message$trailer$trailer2");
            }
        }
     }
diff --git a/doc/automake.texi b/doc/automake.texi
index 52dd2ea..ed65bdf 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2377,6 +2377,9 @@ Therefore, @code{AC_CONFIG_AUX_DIR}'s setting affects 
whether a
 file is considered missing, and where the missing file is added
 (@pxref{Optional}).
 
+In some strictness modes, additional files are installed, see @ref{Gnits}
+for more information.
+
 @item address@hidden
 @opindex --libdir
 Look for Automake data files in directory @var{dir} instead of in the
@@ -9046,6 +9049,14 @@ The files @file{INSTALL}, @file{NEWS}, @file{README}, 
@file{AUTHORS},
 and @file{ChangeLog}, plus one of @file{COPYING.LIB}, @file{COPYING.LESSER}
 or @file{COPYING}, are required at the topmost directory of the package.
 
+If the @option{--add-missing} option is given, @command{automake} will
+add a generic version of the @file{INSTALL} file as well as the
address@hidden file containing the text of the current version of the
+GNU General Public License existing at the time of this Automake release
+(version 3 as this is written, 
@uref{http://www.gnu.org/@/copyleft/@/gpl.html}).
+However, an existing @file{COPYING} file will never be overwritten by
address@hidden
+
 @item
 The options @option{no-installman} and @option{no-installinfo} are
 prohibited.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e2a9ab0..8e329bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -336,6 +336,7 @@ libtool9.test \
 libtoo10.test \
 libtoo11.test \
 license.test \
+license2.test \
 link_c_cxx.test        \
 link_dist.test \
 link_f90_only.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0938b6c..887207d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -469,6 +469,7 @@ libtool9.test \
 libtoo10.test \
 libtoo11.test \
 license.test \
+license2.test \
 link_c_cxx.test        \
 link_dist.test \
 link_f90_only.test \
diff --git a/tests/libtoo11.test b/tests/license2.test
similarity index 67%
copy from tests/libtoo11.test
copy to tests/license2.test
index 030e2d3..f16ed00 100755
--- a/tests/libtoo11.test
+++ b/tests/license2.test
@@ -14,25 +14,28 @@
 # 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 config.lt is removed with Libtool 2.2.x's LT_OUTPUT.
-# Report by Charles Wilson.
+# Check that installing `COPYING' outputs a warning.
 
-required=libtoolize
 . ./defs || Exit 1
+
 set -e
 
-cat >> configure.in << 'END'
-AC_PROG_LIBTOOL
-m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
-AC_OUTPUT
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
 END
 
-: > Makefile.am
+: >AUTHORS
+: >NEWS
+: >README
+: >ChangeLog
+: >INSTALL
 
-libtoolize
 $ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-./configure
-$MAKE distcheck
-:
+AUTOMAKE_fails
+grep 'COPYING' stderr
+
+AUTOMAKE_run 0 --add-missing
+grep 'COPYING' stderr
+grep 'GNU General Public License' stderr
+grep 'Consider adding.*version control' stderr
+test -f COPYING


hooks/post-receive
--
GNU Automake