texinfo-commits
[Top][All Lists]
Advanced

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

texinfo ChangeLog configure.ac tp/.cvsignore tp...


From: Patrice Dumas
Subject: texinfo ChangeLog configure.ac tp/.cvsignore tp...
Date: Fri, 16 Nov 2012 01:26:29 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/11/16 01:26:29

Modified files:
        .              : ChangeLog configure.ac 
        tp             : .cvsignore 
        tp/maintain    : all_tests.sh 
        tp/t           : 01use.t 
        tp/tests       : .cvsignore run_parser_all.sh 
        tp/tests/many_input_files: indices.sh tex_l2h.sh tex_t4ht.sh 
        tp/tests/nested_formats: Makefile.am generate_all_texi.pl 
Added files:
        tp             : defs.in 
Removed files:
        tp/tests       : path_separator.in 

Log message:
                * configure.ac, tp/defs.in, tp/maintain/all_tests.sh, 
                tp/tests/run_parser_all.sh, 
tp/tests/many_input_files/indices.sh,
                tp/tests/many_input_files/tex_l2h.sh, 
tp/tests/many_input_files/tex_t4ht.sh:
                Use PERL from configure, with the value put in tp/defs.in by 
configure
                instead of tp/tests/path_separator.in.
                * tp/tests/path_separator.in: remove.
                * tp/tests/nested_formats/Makefile.am: do not distribute 
                generate_all_texi.pl.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1442&r2=1.1443
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/.cvsignore?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/defs.in?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/all_tests.sh?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/01use.t?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/.cvsignore?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/run_parser_all.sh?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/path_separator.in?cvsroot=texinfo&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/indices.sh?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/tex_l2h.sh?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/tex_t4ht.sh?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/nested_formats/Makefile.am?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/nested_formats/generate_all_texi.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1442
retrieving revision 1.1443
diff -u -b -r1.1442 -r1.1443
--- ChangeLog   14 Nov 2012 00:20:39 -0000      1.1442
+++ ChangeLog   16 Nov 2012 01:26:27 -0000      1.1443
@@ -1,3 +1,14 @@
+2012-11-16  Patrice Dumas  <address@hidden>
+
+       * configure.ac, tp/defs.in, tp/maintain/all_tests.sh, 
+       tp/tests/run_parser_all.sh, tp/tests/many_input_files/indices.sh,
+       tp/tests/many_input_files/tex_l2h.sh, 
tp/tests/many_input_files/tex_t4ht.sh:
+       Use PERL from configure, with the value put in tp/defs.in by configure
+       instead of tp/tests/path_separator.in.
+       * tp/tests/path_separator.in: remove.
+       * tp/tests/nested_formats/Makefile.am: do not distribute 
+       generate_all_texi.pl.
+
 2012-11-13  Karl Berry  <address@hidden>
 
        * tp/maintain/regenerate_file_list.pl,

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- configure.ac        14 Nov 2012 00:32:57 -0000      1.120
+++ configure.ac        16 Nov 2012 01:26:27 -0000      1.121
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.120 2012/11/14 00:32:57 karl Exp $
+# $Id: configure.ac,v 1.121 2012/11/16 01:26:27 pertusus Exp $
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 # Free Software Foundation, Inc.
@@ -340,7 +340,7 @@
   tp/tests/nested_formats/Makefile
   tp/tests/layout/Makefile
   tp/tests/tex_html/Makefile
-  tp/tests/path_separator
+  tp/defs
   Pod-Simple-Texinfo/Makefile
 ])
 

Index: tp/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- tp/.cvsignore       11 Nov 2012 19:53:19 -0000      1.11
+++ tp/.cvsignore       16 Nov 2012 01:26:27 -0000      1.12
@@ -5,6 +5,7 @@
 Makefile.tres
 Texinfo-*.tar.gz
 blib
+defs
 pm_to_blib
 po
 po_document

Index: tp/maintain/all_tests.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/all_tests.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tp/maintain/all_tests.sh    14 Sep 2012 20:20:08 -0000      1.7
+++ tp/maintain/all_tests.sh    16 Nov 2012 01:26:27 -0000      1.8
@@ -13,16 +13,18 @@
   exit 1
 fi
 
+. ./defs || exit 1
+
 if [ "$command" = 'clean' ]; then
   rm -f t/results/*/*.pl.new
   rm -rf t/results/*/*/out_*/
 elif [ "$command" = 'generate' ]; then
   for file in t/*.t; do
-    perl -w $file -g
+    $PERL -w $file -g
   done
 elif [ "$command" = 'output' ]; then
   for file in t/*.t; do
-    perl -w $file -o
+    $PERL -w $file -o
   done
 elif [ "$command" = 'diff' ]; then
   if [ z"$test_name" = 'z' ]; then
@@ -44,7 +46,7 @@
   fi 
 elif [ "$command" = 'texis' ]; then
   for file in t/*.t; do
-    perl -w $file -c
+    $PERL -w $file -c
   done
 else
   echo "Unknown command (clean|generate|output|diff|texis)"

Index: tp/t/01use.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/01use.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tp/t/01use.t        8 Nov 2010 23:50:47 -0000       1.3
+++ tp/t/01use.t        16 Nov 2012 01:26:28 -0000      1.4
@@ -3,11 +3,8 @@
 
 #########################
 
-# change 'tests => 1' to 'tests => last_test_to_print';
-
 use strict;
 
-#use Test;
 use Test::More;
 BEGIN { plan tests => 2 };
 use Texinfo::Convert::Texinfo;

Index: tp/tests/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/tests/.cvsignore 10 Nov 2012 16:59:03 -0000      1.2
+++ tp/tests/.cvsignore 16 Nov 2012 01:26:28 -0000      1.3
@@ -2,4 +2,3 @@
 *.trs
 Makefile
 Makefile.in
-path_separator

Index: tp/tests/run_parser_all.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/run_parser_all.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/tests/run_parser_all.sh  11 Nov 2012 19:53:20 -0000      1.9
+++ tp/tests/run_parser_all.sh  16 Nov 2012 01:26:28 -0000      1.10
@@ -154,7 +154,7 @@
   exit 0
 fi
 
-. ../path_separator || exit 1
+. ../../defs || exit 1
 
 [ -d $diffs_dir ] || mkdir $diffs_dir
 staging_dir_res=$diffs_dir/staging_res/
@@ -235,8 +235,8 @@
       # @setfilename
       echo "$command $dir" >> $logfile
       #echo "$dir($format)"
-      echo "$prepended_command perl -w -I $testdir/$srcdir_test/../../ -I 
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run 
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/ 
--conf-dir $testdir/$srcdir_test/../../init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
--output ${outdir}$dir/ -I $testdir/$srcdir_test/ -I $testdir/$srcdir_test/../ 
--set-customization-variable=DUMP_TEXI=1 
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file 
2>${outdir}$dir/$basename.2" >> $logfile
-      eval "$prepended_command perl -w -I $testdir/$srcdir_test/../../ -I 
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run 
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/ 
--conf-dir $testdir/$srcdir_test/../../init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
--output ${outdir}$dir/ -I $testdir/$srcdir_test/ -I $testdir/$srcdir_test/../ 
--set-customization-variable=DUMP_TEXI=1 
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file 
2>${outdir}$dir/$basename.2"
+      echo "$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I 
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run 
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/ 
--conf-dir $testdir/$srcdir_test/../../init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
--output ${outdir}$dir/ -I $testdir/$srcdir_test/ -I $testdir/$srcdir_test/../ 
--set-customization-variable=DUMP_TEXI=1 
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file 
2>${outdir}$dir/$basename.2" >> $logfile
+      eval "$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I 
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run 
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/ 
--conf-dir $testdir/$srcdir_test/../../init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
--output ${outdir}$dir/ -I $testdir/$srcdir_test/ -I $testdir/$srcdir_test/../ 
--set-customization-variable=DUMP_TEXI=1 
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file 
2>${outdir}$dir/$basename.2"
       ret=$?
     else
       one_test_done=yes
@@ -278,8 +278,8 @@
       remaining_out_dir=`echo $remaining | sed 
's,@OUT_DIR@,'"${outdir}$dir/"',g'`
       echo "$command $dir" >> $logfile
       #echo "$dir($format)"
-      echo "$prepended_command perl -w -I $testdir/$srcdir_test/../../ -I 
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run 
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/ 
--conf-dir $testdir/$srcdir_test/../../init -I $testdir/$srcdir_test/ -I 
$testdir/$srcdir_test/../ --set-customization-variable 
L2H_FILE=$testdir/$srcdir_test/../../t/init/l2h.init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
$l2h_tmp_dir --output ${outdir}$dir/ $remaining_out_dir $src_file > 
${outdir}$dir/$basename.1 2>${outdir}$dir/$basename.2" >> $logfile
-      eval "$prepended_command perl -w -I $testdir/$srcdir_test/../../ -I 
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run 
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/ 
--conf-dir $testdir/$srcdir_test/../../init -I $testdir/$srcdir_test/ -I 
$testdir/$srcdir_test/../ --set-customization-variable 
L2H_FILE=$testdir/$srcdir_test/../../t/init/l2h.init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
$l2h_tmp_dir --output ${outdir}$dir/ $remaining_out_dir $src_file > 
${outdir}$dir/$basename.1 2>${outdir}$dir/$basename.2"
+      echo "$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I 
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run 
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/ 
--conf-dir $testdir/$srcdir_test/../../init -I $testdir/$srcdir_test/ -I 
$testdir/$srcdir_test/../ --set-customization-variable 
L2H_FILE=$testdir/$srcdir_test/../../t/init/l2h.init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
$l2h_tmp_dir --output ${outdir}$dir/ $remaining_out_dir $src_file > 
${outdir}$dir/$basename.1 2>${outdir}$dir/$basename.2" >> $logfile
+      eval "$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I 
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I 
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run 
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/ 
--conf-dir $testdir/$srcdir_test/../../init -I $testdir/$srcdir_test/ -I 
$testdir/$srcdir_test/../ --set-customization-variable 
L2H_FILE=$testdir/$srcdir_test/../../t/init/l2h.init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
$l2h_tmp_dir --output ${outdir}$dir/ $remaining_out_dir $src_file > 
${outdir}$dir/$basename.1 2>${outdir}$dir/$basename.2"
       ret=$?
       #rm -f ${outdir}$dir/*_l2h_images.log ${outdir}$dir/*_tex4ht_*.log \
       #  ${outdir}$dir/*_tex4ht_*.idv ${outdir}$dir/*_tex4ht_*.dvi \

Index: tp/tests/many_input_files/indices.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/indices.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tp/tests/many_input_files/indices.sh        11 Nov 2012 19:53:20 -0000      
1.6
+++ tp/tests/many_input_files/indices.sh        16 Nov 2012 01:26:28 -0000      
1.7
@@ -12,6 +12,8 @@
 
 [ "z$srcdir" = 'z' ] && srcdir=.
 
+. ../../defs || exit 1
+
 [ -d $diffs_dir ] || mkdir $diffs_dir
 staging_dir=$diffs_dir/staging
 [ -d $staging_dir ] || mkdir $staging_dir
@@ -22,8 +24,8 @@
 [ -d index_split ] && rm -rf index_split
 [ -d $basename ] && rm -rf $basename
 mkdir $basename
-echo "perl -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --conf-dir $srcdir/../indices/ 
--set-customization-variable 'TEST 1' --split chapter --out $basename/ 
$srcdir/../indices/index_table.texi $srcdir/../indices/index_split.texi --force 
>> $stdout_file 2>$basename/${basename}.2" >> $logfile
-perl -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --conf-dir $srcdir/../indices/ 
--set-customization-variable 'TEST 1' --split chapter --out $basename/ 
$srcdir/../indices/index_table.texi $srcdir/../indices/index_split.texi --force 
>> $stdout_file 2>$basename/${basename}.2
+echo "$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --conf-dir $srcdir/../indices/ 
--set-customization-variable 'TEST 1' --split chapter --out $basename/ 
$srcdir/../indices/index_table.texi $srcdir/../indices/index_split.texi --force 
>> $stdout_file 2>$basename/${basename}.2" >> $logfile
+$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --conf-dir $srcdir/../indices/ 
--set-customization-variable 'TEST 1' --split chapter --out $basename/ 
$srcdir/../indices/index_table.texi $srcdir/../indices/index_split.texi --force 
>> $stdout_file 2>$basename/${basename}.2
 
 ret=$?
 if [ $ret != 0 ]; then

Index: tp/tests/many_input_files/tex_l2h.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tp/tests/many_input_files/tex_l2h.sh        11 Nov 2012 19:53:20 -0000      
1.10
+++ tp/tests/many_input_files/tex_l2h.sh        16 Nov 2012 01:26:28 -0000      
1.11
@@ -13,6 +13,8 @@
 
 [ "z$srcdir" = 'z' ] && srcdir=.
 
+. ../../defs || exit 1
+
 if which latex2html > /dev/null 2>&1; then
   :
 else
@@ -37,8 +39,8 @@
 raw_outdir=$raw_output_dir/$basename
 [ -d $raw_outdir ] && rm -rf $raw_outdir
 mkdir $basename
-echo "perl -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--set-customization-variable 'L2H 1' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init --set-customization-variable 
'L2H_CLEAN=0' --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi 
$srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2" 
>> $logfile
-perl -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--set-customization-variable 'L2H 1' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init  --set-customization-variable 
'L2H_CLEAN=0' --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi 
$srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2
+echo "$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--set-customization-variable 'L2H 1' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init --set-customization-variable 
'L2H_CLEAN=0' --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi 
$srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2" 
>> $logfile
+$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--set-customization-variable 'L2H 1' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init  --set-customization-variable 
'L2H_CLEAN=0' --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi 
$srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2
 
 return_code=0
 ret=$?

Index: tp/tests/many_input_files/tex_t4ht.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/tests/many_input_files/tex_t4ht.sh       11 Nov 2012 19:53:20 -0000      
1.9
+++ tp/tests/many_input_files/tex_t4ht.sh       16 Nov 2012 01:26:28 -0000      
1.10
@@ -13,6 +13,8 @@
 
 [ "z$srcdir" = 'z' ] && srcdir=.
 
+. ../../defs || exit 1
+
 if which httexi > /dev/null 2>&1; then
   :
 else
@@ -37,8 +39,8 @@
 raw_outdir=$raw_output_dir/$basename
 [ -d $raw_outdir ] && rm -rf $raw_outdir
 mkdir $basename
-echo "perl -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--init-file tex4ht.pm --iftex --out $basename/ 
$srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> 
$stdout_file 2>$basename/${basename}.2" >> $logfile
-perl -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--init-file tex4ht.pm --iftex --out $basename/  
$srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> 
$stdout_file 2>$basename/${basename}.2
+echo "$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--init-file tex4ht.pm --iftex --out $basename/ 
$srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> 
$stdout_file 2>$basename/${basename}.2" >> $logfile
+$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--init-file tex4ht.pm --iftex --out $basename/  
$srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> 
$stdout_file 2>$basename/${basename}.2
 
 return_code=0
 ret=$?

Index: tp/tests/nested_formats/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/nested_formats/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/nested_formats/Makefile.am 14 Jan 2012 19:04:40 -0000      1.1
+++ tp/tests/nested_formats/Makefile.am 16 Nov 2012 01:26:28 -0000      1.2
@@ -1,5 +1,4 @@
 EXTRA_DIST = nested_formats.texi \
- generate_all_texi.pl \
  tests-parser.txt res_parser res_parser_info
 
 DISTCLEANFILES = tests.log tests.out

Index: tp/tests/nested_formats/generate_all_texi.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/nested_formats/generate_all_texi.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/tests/nested_formats/generate_all_texi.pl        14 Jan 2012 19:04:40 
-0000      1.1
+++ tp/tests/nested_formats/generate_all_texi.pl        16 Nov 2012 01:26:29 
-0000      1.2
@@ -1,8 +1,11 @@
 #! /usr/bin/perl -w
-
 # expand the manuals with nested formats using texi2any and test
 # with makeinfo on these expanded manuals (it is likely that makeinfo 
 # cannot expand those manuals in some cases).
+#
+# This script allowed to check the differences between texi2any and
+# makeinfo in C.  It is certainly obsolete now.
+
 use strict;
 
 open (TXT, 'tests-parser.txt') or die "Cannot open tests-parser.txt: $!\n";
@@ -24,7 +27,6 @@
       }
       system("../../texi2any.pl --force nested_formats.texi -D $def 
--macro-expand=all_texi/$format-nested_formats.texi -o /dev/null");
       system ("cp all_texi/$format-nested_formats.texi 
all_texi/$dir/nested_formats.texi");
-      #system ("perl -w -x ../../texi2html.pl -D $def 
--expand-macro=all_texi/$dir/$format-nested_formats.texi");
       system ("cd all_texi/$dir/ && makeinfo --force nested_formats.texi 
2>nested_formats.2");
    }
    else

Index: tp/defs.in
===================================================================
RCS file: tp/defs.in
diff -N tp/defs.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tp/defs.in  16 Nov 2012 01:26:27 -0000      1.1
@@ -0,0 +1,2 @@
+PATH_SEPARATOR="@PATH_SEPARATOR@"
+PERL="@PERL@"

Index: tp/tests/path_separator.in
===================================================================
RCS file: tp/tests/path_separator.in
diff -N tp/tests/path_separator.in
--- tp/tests/path_separator.in  14 Jan 2012 18:57:29 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
address@hidden@



reply via email to

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