texinfo autogen.sh ChangeLog tp/.cvsignore tp/M...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/02/09 23:51:51

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

Log message:
                * autogen.sh, tp/.cvsignore, tp/Makefile.am, 
                maintain/regenerate_document_strings_make_rules.sh,
                maintain/regenerate_file_lists.pl: replace unconditional copy by
                generated make rules.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/autogen.sh?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1324&r2=1.1325
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/.cvsignore?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_file_lists.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_document_strings_make_rules.sh?cvsroot=texinfo&rev=1.1

Patches:
Index: autogen.sh
===================================================================
RCS file: /sources/texinfo/texinfo/autogen.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- autogen.sh  28 Oct 2011 23:39:10 -0000      1.9
+++ autogen.sh  9 Feb 2012 23:51:50 -0000       1.10
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: autogen.sh,v 1.9 2011/10/28 23:39:10 karl Exp $
+# $Id: autogen.sh,v 1.10 2012/02/09 23:51:50 pertusus Exp $
 # Created 2003-08-29, Karl Berry.  Public domain.
 
 if test "x$1" = x-n; then
@@ -16,6 +16,11 @@
 echo "  $cmd"
 $chicken eval $cmd || exit 1
 
+# Generates another include file for tp/Makefile.am.
+cmd="tp/maintain/regenerate_document_strings_make_rules.sh"
+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
 # date in CVS (see util/srclist.txt), because it's not trivial for every

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1324
retrieving revision 1.1325
diff -u -b -r1.1324 -r1.1325
--- ChangeLog   7 Feb 2012 19:41:38 -0000       1.1324
+++ ChangeLog   9 Feb 2012 23:51:50 -0000       1.1325
@@ -1,3 +1,10 @@
+2012-02-10  Patrice Dumas  <address@hidden>
+
+       * autogen.sh, tp/.cvsignore, tp/Makefile.am, 
+       maintain/regenerate_document_strings_make_rules.sh,
+       maintain/regenerate_file_lists.pl: replace unconditional copy by
+       generated make rules.
+
 2012-02-07  Patrice Dumas  <address@hidden>
 
        * doc/texinfo.txi, tp/Texinfo/Common.pm, tp/texi2any.pl,

Index: tp/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tp/.cvsignore       15 Jan 2012 23:38:22 -0000      1.7
+++ tp/.cvsignore       9 Feb 2012 23:51:50 -0000       1.8
@@ -2,6 +2,7 @@
 Makefile
 Makefile.in
 Makefile.tres
+Makefile.documents_strings_mo_files
 Texinfo-*.tar.gz
 blib
 pm_to_blib

Index: tp/MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- tp/MANIFEST 5 Feb 2012 10:54:54 -0000       1.30
+++ tp/MANIFEST 9 Feb 2012 23:51:50 -0000       1.31
@@ -16,6 +16,7 @@
 maintain/prepare_perl_module.sh
 maintain/regenerate_converters_documentation.sh
 maintain/regenerate_documentlanguages.pl
+maintain/regenerate_document_strings_make_rules.sh
 maintain/regenerate_file_lists.pl
 maintain/regenerate_perl_module_files.sh
 maintain/template.pod
@@ -62,6 +63,7 @@
 Texinfo/Convert/Line.pm
 Texinfo/Convert/NodeNameNormalization.pm
 Texinfo/Convert/Paragraph.pm
+Texinfo/Convert/PlainTexinfo.pm
 Texinfo/Convert/Plaintext.pm
 Texinfo/Convert/Texinfo.pm
 Texinfo/Convert/TextContent.pm
@@ -120,6 +122,11 @@
 t/input_files/char_latin1_utf8_in_refs.texi
 t/input_files/char_latin2_latin2_in_refs.texi
 t/input_files/chinese_mixed_with_en.texi
+t/input_files/contents_at_document_begin.texi
+t/input_files/contents_at_end_document_after_node.texi
+t/input_files/contents_at_end_document.texi
+t/input_files/contents_in_document.texi
+t/input_files/contents_no_section.texi
 t/input_files/delcomment.texi
 t/input_files/empty_lines_at_beginning_no_setfilename_no_element.texi
 t/input_files/empty_lines_at_beginning_no_setfilename.texi
@@ -968,7 +975,12 @@
 t/results/sectioning/complex.pl
 t/results/sectioning/complex_split_at_node.pl
 t/results/sectioning/contents_and_shortcontents.pl
+t/results/sectioning/contents_at_document_begin.pl
+t/results/sectioning/contents_at_end_document_after_node.pl
+t/results/sectioning/contents_at_end_document.pl
+t/results/sectioning/contents_in_document.pl
 t/results/sectioning/contents_in_html_text.pl
+t/results/sectioning/contents_no_section.pl
 t/results/sectioning/contents.pl
 t/results/sectioning/contents_with_only_top_node.pl
 t/results/sectioning/double_node_anchor_float.pl
@@ -1131,6 +1143,7 @@
 t/results/xtable/title_and_itemx_before_item.pl
 t/test_count.t
 t/test_fill_gaps_in_sectioning.t
+t/test_protect_hashchar_at_line_beginning.t
 t/test_sort.t
 t/test_tree_copy.t
 t/test_utils.pl

Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- tp/Makefile.am      7 Feb 2012 00:40:47 -0000       1.38
+++ tp/Makefile.am      9 Feb 2012 23:51:50 -0000       1.39
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.38 2012/02/07 00:40:47 pertusus Exp $
+# $Id: Makefile.am,v 1.39 2012/02/09 23:51:50 pertusus Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011 Free Software Foundation, Inc.
@@ -11,12 +11,18 @@
 # 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.
+# A long list of files that we generate and some rules.
 include $(srcdir)/Makefile.tres
 
+# document string locales files and associated rules.
+include $(srcdir)/Makefile.documents_strings_mo_files
+
 $(srcdir)/Makefile.tres: maintain/regenerate_file_lists.pl
        cd $(srcdir)/ && $(PERL) ./maintain/regenerate_file_lists.pl
 
+$(srcdir)/Makefile.documents_strings_mo_files: 
maintain/regenerate_document_strings_make_rules.sh 
$(srcdir)/../po_document/LINGUAS
+       cd $(srcdir) && $(SHELL) 
./maintain/regenerate_document_strings_make_rules.sh
+
 SUBDIRS = . tests
 
 bin_SCRIPTS = texi2any
@@ -106,12 +112,6 @@
  t/include/verbatim_encoded.texi \
  t/include/verbatim_encoded_latin1.texi \
  t/include/words.txt \
- 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/init/only_toc_out.init \
  t/init/cvs.init \
  t/init/redefine_need.init \
@@ -144,20 +144,11 @@
  t/input_files/contents_no_section.texi \
  #
 
-relative_include_dir = t/include_dir
 document_domain = $(PACKAGE)_document
-all-local: maintain/catalog.xml
-       for file in $(srcdir)/../po_document/*.gmo; do \
-         cat=`basename "$$file"` ; \
-         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-         $(MKDIR_P) "LocaleData/$$lang/LC_MESSAGES/" ; \
-         $(INSTALL_DATA) $$file 
LocaleData/$$lang/LC_MESSAGES/$(document_domain).mo; \
-       done
-       $(MKDIR_P) $(relative_include_dir); \
-       for file in $(srcdir)/t/include_reference/*.*; do \
-         bfile=`basename "$$file"`; \
-         $(INSTALL_DATA) "$$file" "$(relative_include_dir)/$$bfile"; \
-       done
+
+# $(document_strings_mo_files) and $(test_copied_include_files) come from
+# generated makefiles, Makefile.tres and Makefile.documents_strings_mo_files
+all-local: maintain/catalog.xml $(document_strings_mo_files) 
$(test_copied_include_files)
 
 tp_tests = prove.sh
 
@@ -173,6 +164,7 @@
   maintain/MANIFEST_generated_files \
   maintain/prepare_perl_module.sh \
   maintain/regenerate_converters_documentation.sh \
+  maintain/regenerate_document_strings_make_rules.sh \
   maintain/regenerate_documentlanguages.pl \
   maintain/regenerate_file_lists.pl \
   maintain/regenerate_perl_module_files.sh \
@@ -186,7 +178,7 @@
 
 EXTRA_DIST = \
   texi2any.pl \
-  $(test_results) \
+  $(test_files_generated_list) \
   $(test_files) \
   $(tp_tests) \
   $(maintainance_files) \
@@ -195,7 +187,7 @@
 
 MANIFEST: maintain/MANIFEST_generated_files Makefile.am Makefile.tres
        echo "$(dist_modules_DATA) $(dist_converters_DATA) 
$(dist_debugmodules_DATA) " \
-       "$(dist_init_DATA) $(test_files) $(tp_tests) $(test_results) " \
+       "$(dist_init_DATA) $(test_files) $(tp_tests) 
$(test_files_generated_list) " \
        "texi2any-perl $(maintainance_files) README TODO COPYING " \
        "$(perl_specific_files)" \
         | sed 's/ \+/\n/g' | sort | cat - $< > $@
@@ -239,7 +231,7 @@
        rm -rf LocaleData
        rm -f t/results/*/*.pl.new
        rm -rf t/results/*/*/out_*/
-       rm -rf $(relative_include_dir)
+       rm -rf t/include_dir
        rm -rf blib po po_document
 
 CLEANFILES = texi2any makeinfo texi2any-perl

Index: tp/maintain/regenerate_file_lists.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/regenerate_file_lists.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tp/maintain/regenerate_file_lists.pl        23 Jan 2012 23:28:32 -0000      
1.6
+++ tp/maintain/regenerate_file_lists.pl        9 Feb 2012 23:51:51 -0000       
1.7
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 #
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011, 2012 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
@@ -14,6 +14,7 @@
 
 use strict;
 use File::Find;
+use File::Basename;
 
 my %files;
 
@@ -31,17 +32,32 @@
   }
 }
 
-#my %new_files = %files;
-#open (FILE, "MANIFEST") or die "Open MANIFEST: $!";
-#while (<FILE>) {
-#  chomp;
-#  delete ($new_files{$_});
-#}
-#print join("Missing from MANIFEST:\n", sort(keys(%new_files))) ."\n";
+my %include_files;
+find (\&wanted_include_files, ('t'));
+sub wanted_include_files
+{
+  if (/\.[a-z]+$/ and $File::Find::dir =~ m:^t/include_reference:) {
+    $include_files{$File::Find::name} = 1;
+  }
+}
+#print STDERR join('|', keys(%include_files))."\n";
 
 open (INCLUDE, '>Makefile.tres') or die "Open >Makefile.tres: $!";
-print INCLUDE "test_results =";
-foreach my $file (sort(keys(%files))) {
+print INCLUDE "test_files_generated_list =";
+foreach my $file (sort(keys(%files)), sort(keys(%include_files))) {
   print INCLUDE " \\\n  $file";
 }
-print INCLUDE "\n";
+print INCLUDE "\n\n";
+
+print INCLUDE "t/include_dir:\n".
+   "\t".'$(MKDIR_P) $@'."\n\n";
+my $test_copied_include_files = 'test_copied_include_files =';
+foreach my $include_file (keys(%include_files)) {
+  my $bfile = basename($include_file);
+  $test_copied_include_files .= " t/include_dir/$bfile";
+
+  print INCLUDE "t/include_dir/$bfile: $include_file t/include_dir\n"
+     ."\t".'$(INSTALL_DATA) $< $@'."\n\n";
+}
+
+print INCLUDE $test_copied_include_files ."\n\n";

Index: tp/maintain/regenerate_document_strings_make_rules.sh
===================================================================
RCS file: tp/maintain/regenerate_document_strings_make_rules.sh
diff -N tp/maintain/regenerate_document_strings_make_rules.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tp/maintain/regenerate_document_strings_make_rules.sh       9 Feb 2012 
23:51:50 -0000       1.1
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+dir=`echo $0 | sed 's,/[^/]\+$,,'`
+outfile=Makefile.documents_strings_mo_files
+
+(
+cd $dir/..
+
+if [ -f ../po_document/LINGUAS ]; then :
+else
+  echo "no ../po_document/LINGUAS" 1>&2
+  exit 1
+fi
+
+: > $outfile
+for lingua in `cat ../po_document/LINGUAS`; do
+  echo '$(srcdir)/../po_document/'"$lingua.gmo"': 
$(srcdir)/../po_document/'"$lingua.po"'
+       cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) '"$lingua.gmo"'
+
+LocaleData/'"$lingua"'/LC_MESSAGES/$(document_domain).mo: 
$(srcdir)/../po_document/'"$lingua"'.gmo LocaleData/'"$lingua"'/LC_MESSAGES
+       $(INSTALL_DATA) $< $@
+
+LocaleData/'"$lingua"'/LC_MESSAGES: LocaleData/'"$lingua"'
+       $(MKDIR_P) $@
+
+LocaleData/'"$lingua"': LocaleData
+       $(MKDIR_P) $@
+' >> $outfile
+  dependencies="$dependencies 
"'LocaleData/'"$lingua"'/LC_MESSAGES/$(document_domain).mo'
+done
+
+echo 'LocaleData:
+       $(MKDIR_P) $@
+
+document_strings_mo_files = '"$dependencies" >> $outfile
+)
+