[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-228-g4c23b9a

[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=4c23b9a9810d05b5ac4369a55c840b20fb77649b

The branch, master has been updated
       via  4c23b9a9810d05b5ac4369a55c840b20fb77649b (commit)
      from  4feeccf9409951d0d7eea8e23a56afaed8b17175 (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 4c23b9a9810d05b5ac4369a55c840b20fb77649b
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                               |    5 +++--
 THANKS                             |    1 +
 automake.in                        |   14 +++++++++++++-
 doc/automake.texi                  |   11 +++++++++++
 tests/Makefile.am                  |    1 +
 tests/Makefile.in                  |    1 +
 tests/{man3.test => license2.test} |   33 +++++++++++++++------------------
 8 files changed, 61 insertions(+), 21 deletions(-)
 copy tests/{man3.test => license2.test} (68%)

diff --git a/ChangeLog b/ChangeLog
index 06ffd16..2548528 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 7ccc3e1..50a0a77 100644
--- a/NEWS
+++ b/NEWS
@@ -57,8 +57,9 @@ New in 1.10a:
 
   - Automake is licensed under GPLv3+.  `automake --add-missing' will
     by default install the GPLv3 file as COPYING if it is missing.
-    Note that Automake will never overwrite an existing COPYING file,
-    even when the `--force-missing' option is used.
+    It will also warn that the license file should be added to source
+    control.  Note that Automake will never overwrite an existing COPYING
+    file, even when the `--force-missing' option is used.
 
   - The manual is now distributed under the terms of the GNU FDL 1.3.
 
diff --git a/THANKS b/THANKS
index 526dd47..55ec6df 100644
--- a/THANKS
+++ b/THANKS
@@ -43,6 +43,7 @@ Bob Rossi             address@hidden
 Bobby Jack             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 66633df..ac1c8c2 100755
--- a/automake.in
+++ b/automake.in
@@ -7380,6 +7380,7 @@ sub require_file_internal ($$$@)
                }
 
              my $trailer = '';
+             my $trailer2 = '';
              my $suppress = 0;
 
              # Only install missing files according to our desired
@@ -7395,6 +7396,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;
@@ -7447,7 +7459,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 3d12c61..2fe3adb 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2438,6 +2438,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
@@ -9152,6 +9155,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 023e1f7..46fe0d5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -359,6 +359,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 4207f6c..57451a2 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -512,6 +512,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/man3.test b/tests/license2.test
similarity index 68%
copy from tests/man3.test
copy to tests/license2.test
index 436e2c2..f16ed00 100755
--- a/tests/man3.test
+++ b/tests/license2.test
@@ -14,31 +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/>.
 
-# PR 516: Prefer generated manpages to distributed ones.
+# Check that installing `COPYING' outputs a warning.
 
 . ./defs || Exit 1
 
 set -e
 
 cat > Makefile.am << 'END'
-dist_man_MANS = foo.1
-installcheck-local:
-       grep bar "$(mandir)/man1/foo.1"
+AUTOMAKE_OPTIONS = gnu
 END
 
-cat >>configure.in <<'END'
-: ${foo=foo}
-AC_SUBST([foo])
-AC_CONFIG_FILES([foo.1])
-AC_OUTPUT
-END
-
-cat > foo.1.in <<'END'
address@hidden@
-END
+: >AUTHORS
+: >NEWS
+: >README
+: >ChangeLog
+: >INSTALL
 
 $ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-DISTCHECK_CONFIGURE_FLAGS=foo=bar $MAKE -e 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