texinfo ChangeLog autogen.sh tp/Makefile.am tp/...

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/10/17 17:49:07

Modified files:
        .              : ChangeLog autogen.sh 
        tp             : Makefile.am .cvsignore 
        tp/maintain    : regenerate_file_lists.pl 

Log message:
        regenerate_file_lists in bootstrap

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1268&r2=1.1269
http://cvs.savannah.gnu.org/viewcvs/texinfo/autogen.sh?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/.cvsignore?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_file_lists.pl?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1268
retrieving revision 1.1269
diff -u -b -r1.1268 -r1.1269
--- ChangeLog   17 Oct 2011 00:06:51 -0000      1.1268
+++ ChangeLog   17 Oct 2011 17:49:07 -0000      1.1269
@@ -1,5 +1,16 @@
+2011-10-17  Karl Berry  <address@hidden>
+
+       * tp/Makefile.am: rename include to Makefile.tres.
+       (Makefile.tres): regenerate.
+       * tp/maintain/regenerate_file_lists.pl: add copyright,
+       chdir to working directory.
+       * autogen.sh: invoke it.
+
 2011-10-16  Karl Berry  <address@hidden>
 
+       * Makefile.am (po-check): update to find tp/ Perl files,
+       not makeinfo/ C files.
+
        * AUTHORS, INSTALL, INTRODUCTION, NEWS, README, README-alpha,
        README.dev, TODO, */README: small text updates.
 

Index: autogen.sh
===================================================================
RCS file: /sources/texinfo/texinfo/autogen.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- autogen.sh  1 Feb 2009 01:11:47 -0000       1.6
+++ autogen.sh  17 Oct 2011 17:49:07 -0000      1.7
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: autogen.sh,v 1.6 2009/02/01 01:11:47 karl Exp $
+# $Id: autogen.sh,v 1.7 2011/10/17 17:49:07 karl Exp $
 # Created 2003-08-29, Karl Berry.  Public domain.
 
 if test "x$1" = x-n; then
@@ -9,7 +9,12 @@
   chicken=
 fi
 
-echo "Preparing CVS Texinfo infrastructure:"
+echo "Preparing Texinfo development infrastructure:"
+
+# Generates an include file for tp/Makefile.am.
+cmd="tp/maintain/regenerate_file_lists.pl"
+echo "  $cmd"
+$chicken eval $cmd || exit 1
 
 # This overwrites lots of files with older versions.
 # I keep the newest versions of files common between distributions up to
@@ -17,12 +22,11 @@
 # developer to do this.
 #cmd="autoreconf --verbose --force --install --include=m4"
 
+# So instead:
 : ${ACLOCAL=aclocal}
 : ${AUTOHEADER=autoheader}
 : ${AUTOMAKE=automake}
 : ${AUTOCONF=autoconf}
-
-# So instead:
 cmd="$ACLOCAL -I gnulib/m4 && $AUTOCONF && $AUTOHEADER && $AUTOMAKE"
 echo "  $cmd"
 $chicken eval $cmd || exit 1

Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tp/Makefile.am      12 Oct 2011 23:50:48 -0000      1.10
+++ tp/Makefile.am      17 Oct 2011 17:49:07 -0000      1.11
@@ -1,13 +1,20 @@
-# $(POD2MAN) \
-#      --center="Texinfo Parser"       \
-#      --release=$(VERSION)                            \
-#      $(srcdir)/truc.pod > truc.3
-
-
-include Makefile.incl
-
-$(srcdir)/Makefile.incl:
-       (cd $(srcdir)/ && $(PERL) ./maintain/regenerate_file_lists.pl)
+# $Id: Makefile.am,v 1.11 2011/10/17 17:49:07 karl Exp $
+# Makefile.am for texinfo/tp.
+#
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# A long list of files that we generate.
+include $(srcdir)/Makefile.tres
+$(srcdir)/Makefile.tres: maintain/regenerate_file_lists.pl
+       cd $(srcdir)/ && $(PERL) ./maintain/regenerate_file_lists.pl
 
 bin_SCRIPTS = texi2any
 
@@ -24,10 +31,11 @@
   -e 's,address@hidden@],$(USE_EXTERNAL_UNIDECODE),g'
 
 texi2any: texi2any.pl
-       $(do_subst) $(srcdir)/$< > $@
+       $(do_subst) $(srcdir)/$< >$@
        chmod a+x $@
 
 makeinfo: texi2any
+       rm -f $@
        -$(LN_S) texi2any $@
 
 modulesdir = $(pkgdatadir)/Texinfo
@@ -68,70 +76,71 @@
  init/tex4ht.pm
 
 test_files = \
- t/27float.t \
- t/test_count.t \
+ t/01use.t \
+ t/02coverage.t \
  t/03coverage_braces.t \
- t/70value_and_macro.t \
- t/10menu.t \
+ t/04verb.t \
  t/05paragraph.t \
- t/22xtable.t \
- t/test_sort.t \
- t/02coverage.t \
- t/19def.t \
- t/01use.t \
- t/18itemize.t \
  t/06columnfractions.t \
- t/04verb.t \
- t/plaintext_tests.t \
+ t/08misc_commands.t \
+ t/09indices.t \
+ t/10menu.t \
+ t/16raw.t \
  t/181quotation.t \
- t/57invalid_nestings.t \
- t/58alias.t \
+ t/18itemize.t \
+ t/19def.t \
  t/21multitable.t \
- t/08misc_commands.t \
- t/paragraph.t \
+ t/22xtable.t \
+ t/27float.t \
+ t/28heading.t \
  t/30sectioning.t \
- t/test_utils.pl \
- t/info_tests.t \
- t/55conditionals.t \
- t/html_tests.t \
  t/50value.t \
+ t/55conditionals.t \
+ t/57invalid_nestings.t \
+ t/58alias.t \
  t/60macro.t \
- t/include_reference/section_file.texi \
- t/include_reference/f--ile.txt \
- t/include_reference/f--ile.png \
- t/include_reference/inc_file.texi \
- t/include_reference/incl-incl.txi \
- t/include_reference/macro_included.texi \
- t/include/file_with_xml_chars.texi \
+ t/70value_and_macro.t \
+ t/README \
+ t/accents.t \
+ t/html_tests.t \
  t/include/a.txt \
+ t/include/aa.txt \
+ t/include/count_image.png \
  t/include/count_image.txt \
- t/include/fdotext.png \
- t/include/fdotext.ext \
  t/include/count_image_text.txt \
- t/include/aa.txt \
- t/include/image.txt \
  t/include/f.txt \
- t/include/this_is_a_long_unknown_file.png \
- t/include/count_image.png \
+ t/include/fdotext.ext \
+ t/include/fdotext.png \
+ t/include/fdotext.txt \
+ t/include/fext.ext \
  t/include/fext.png \
- t/include/fextext \
- t/include/included_file_with_setfilename.texi \
  t/include/fext.txt \
+ t/include/fextext \
+ t/include/file_with_xml_chars.texi \
+ t/include/image.txt \
  t/include/address@hidden \
+ t/include/included_file_with_setfilename.texi \
+ t/include/this_is_a_long_unknown_file.png \
  t/include/words.txt \
- t/include/fdotext.txt \
- t/include/fext.ext \
- t/languages.t \
- t/16raw.t \
- t/09indices.t \
- t/accents.t \
- t/28heading.t \
- t/nodenormalization.t \
- t/README \
- t/init/test_renamed_nodes.init \
+ t/include_reference/f--ile.png \
+ t/include_reference/f--ile.txt \
+ t/include_reference/inc_file.texi \
+ t/include_reference/incl-incl.txi \
+ t/include_reference/macro_included.texi \
+ t/include_reference/section_file.texi \
+ t/info_tests.t \
  t/init/redefine_need.init \
  t/init/test_directions.init \
- t/manual_tree.pl
+ t/init/test_renamed_nodes.init \
+ t/languages.t \
+ t/manual_tree.pl \
+ t/nodenormalization.t \
+ t/paragraph.t \
+ t/plaintext_tests.t \
+ t/test_count.t \
+ t/test_sort.t \
+ t/test_utils.pl \
+ #
 
 relative_include_dir = t/include_dir
 document_domain = $(PACKAGE)_document

Index: tp/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tp/.cvsignore       6 Oct 2011 00:01:54 -0000       1.3
+++ tp/.cvsignore       17 Oct 2011 17:49:07 -0000      1.4
@@ -1,6 +1,6 @@
 Makefile
 Makefile.in
-Makefile.incl
+Makefile.tres
 Texinfo-Parser-*.tar.gz
 blib
 pm_to_blib

Index: tp/maintain/regenerate_file_lists.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/regenerate_file_lists.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/maintain/regenerate_file_lists.pl        1 Oct 2011 23:06:11 -0000       
1.2
+++ tp/maintain/regenerate_file_lists.pl        17 Oct 2011 17:49:07 -0000      
1.3
@@ -1,12 +1,27 @@
 #! /usr/bin/perl -w
+#
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Originally written by Patrice Dumas.
 
 use strict;
-
 use File::Find;
 
 my %files;
-find (\&wanted, ('t'));
 
+(my $mydir = $0) =~ s,/[^/]+$,,;
+chdir("$mydir/..") || die "chdir $mydir/..: $!";
+-d "t" || (die "goodbye, no t directory in " . `pwd`);
+
+find (\&wanted, ('t'));
 sub wanted 
 {
   if (/\.pl$/ and $File::Find::dir =~ /^t\/results\//) {
@@ -15,25 +30,16 @@
 }
 
 my %new_files = %files;
-
-open (FILE, "MANIFEST") or die "Open MANIFEST: $!\n";
-
+open (FILE, "MANIFEST") or die "Open MANIFEST: $!";
 while (<FILE>) {
   chomp;
   delete ($new_files{$_});
 }
+#print join("\n", sort(keys(%new_files))) ."\n";
 
-print join("\n", sort(keys(%new_files))) ."\n";
-
-#if (! -d "tmp") {
-#  mkdir "tmp" or die "mkdir tmp: $!\n";
-#}
-#open (OUT, '>maintain/MANIFEST_test_results') or die "Open 
maintain/MANIFEST_test_results: $!\n";
-open (INCLUDE, '>Makefile.incl') or die "Open Makefile.incl: $!\n";
+open (INCLUDE, '>Makefile.tres') or die "Open >Makefile.treas: $!";
 print INCLUDE "test_results =";
-
 foreach my $file (sort(keys(%files))) {
-#  print OUT "$file\n";
-  print INCLUDE " \\\n\t$file";
+  print INCLUDE " \\\n  $file";
 }
-print INCLUDE "\n\n";
+print INCLUDE "\n";