[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp MANIFEST Texinfo/Convert/DocBook.pm ...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp MANIFEST Texinfo/Convert/DocBook.pm ... |
|
Date: |
Sun, 11 Nov 2012 16:25:09 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/11/11 16:25:08
Modified files:
tp : MANIFEST
tp/Texinfo/Convert: DocBook.pm HTML.pm Info.pm Plaintext.pm
XML.pm
tp/maintain : MANIFEST_generated_files
change_perl_modules_version.sh
prepare_perl_module.sh
regenerate_converters_documentation.sh
regenerate_latin1_tests.sh
tp/tests : README run_parser_all.sh
tp/tests/many_input_files: .cvsignore indices.sh tex_l2h.sh
tex_t4ht.sh
tp/tests/tex_html: .cvsignore
Log message:
Regenerate file lists and pod in Converter modules.
Do not use sed -i, report from Stefano Lattarini.
Keep also untouched output for tests involving tex4ht or latex2html.
Use a staging directory for comparisons to avoid using the unportable
--exclude diff command line option (reported by Stefano Lattarini too)
to remove the CVS directory.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.264&r2=1.265
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.227&r2=1.228
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/MANIFEST_generated_files?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/change_perl_modules_version.sh?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/prepare_perl_module.sh?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_converters_documentation.sh?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_latin1_tests.sh?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/README?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/run_parser_all.sh?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/.cvsignore?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/indices.sh?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/tex_l2h.sh?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/tex_t4ht.sh?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html/.cvsignore?cvsroot=texinfo&r1=1.1&r2=1.2
Patches:
Index: MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- MANIFEST 9 Nov 2012 17:07:54 -0000 1.48
+++ MANIFEST 11 Nov 2012 16:25:00 -0000 1.49
@@ -31,6 +31,7 @@
LocaleData/ro/LC_MESSAGES/texinfo.mo
LocaleData/ru/LC_MESSAGES/texinfo.mo
LocaleData/rw/LC_MESSAGES/texinfo.mo
+LocaleData/sl/LC_MESSAGES/texinfo.mo
LocaleData/sv/LC_MESSAGES/texinfo.mo
LocaleData/tr/LC_MESSAGES/texinfo.mo
LocaleData/uk/LC_MESSAGES/texinfo.mo
@@ -102,6 +103,7 @@
po/ro.po
po/ru.po
po/rw.po
+po/sl.po
po/sv.po
po/texinfo.pot
po/tr.po
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- Texinfo/Convert/DocBook.pm 25 Sep 2012 17:46:36 -0000 1.53
+++ Texinfo/Convert/DocBook.pm 11 Nov 2012 16:25:01 -0000 1.54
@@ -1386,7 +1386,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright 2011, 2012 Free Software Foundation, Inc.
+Copyright 2012 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -b -r1.264 -r1.265
--- Texinfo/Convert/HTML.pm 9 Nov 2012 22:30:16 -0000 1.264
+++ Texinfo/Convert/HTML.pm 11 Nov 2012 16:25:01 -0000 1.265
@@ -7714,7 +7714,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright 2012 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- Texinfo/Convert/Info.pm 25 Sep 2012 17:46:36 -0000 1.88
+++ Texinfo/Convert/Info.pm 11 Nov 2012 16:25:01 -0000 1.89
@@ -541,7 +541,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright 2010, 2011, 2012 Free Software Foundation, Inc.
+Copyright 2012 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- Texinfo/Convert/Plaintext.pm 8 Nov 2012 01:30:42 -0000 1.227
+++ Texinfo/Convert/Plaintext.pm 11 Nov 2012 16:25:01 -0000 1.228
@@ -2992,7 +2992,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright 2010, 2011, 2012 Free Software Foundation, Inc.
+Copyright 2012 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- Texinfo/Convert/XML.pm 25 Sep 2012 17:46:37 -0000 1.86
+++ Texinfo/Convert/XML.pm 11 Nov 2012 16:25:01 -0000 1.87
@@ -1428,7 +1428,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright 2011, 2012 Free Software Foundation, Inc.
+Copyright 2012 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Index: maintain/MANIFEST_generated_files
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/MANIFEST_generated_files,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- maintain/MANIFEST_generated_files 25 Dec 2011 01:37:52 -0000 1.1
+++ maintain/MANIFEST_generated_files 11 Nov 2012 16:25:02 -0000 1.2
@@ -27,6 +27,7 @@
LocaleData/ro/LC_MESSAGES/texinfo.mo
LocaleData/ru/LC_MESSAGES/texinfo.mo
LocaleData/rw/LC_MESSAGES/texinfo.mo
+LocaleData/sl/LC_MESSAGES/texinfo.mo
LocaleData/sv/LC_MESSAGES/texinfo.mo
LocaleData/tr/LC_MESSAGES/texinfo.mo
LocaleData/uk/LC_MESSAGES/texinfo.mo
@@ -69,6 +70,7 @@
po/ro.po
po/ru.po
po/rw.po
+po/sl.po
po/sv.po
po/texinfo.pot
po/tr.po
Index: maintain/change_perl_modules_version.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/change_perl_modules_version.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- maintain/change_perl_modules_version.sh 6 Jan 2012 00:13:13 -0000
1.1
+++ maintain/change_perl_modules_version.sh 11 Nov 2012 16:25:02 -0000
1.2
@@ -3,4 +3,5 @@
VERS=$1
[ z"$VERS" = "z" ] && exit 1;
-find Texinfo/ -name '*.pm' | xargs sed -i -e 's/\$VERSION =
'"'"'\([0-9.]\+\)'"'"'/$VERSION = '"'$VERS'"'/'
+#find Texinfo/ -name '*.pm' | xargs sed -i -e 's/\$VERSION =
'"'"'\([0-9.]\+\)'"'"'/$VERSION = '"'$VERS'"'/'
+find Texinfo/ -name '*.pm' | xargs perl -pi -e 's/\$VERSION =
'"'"'([0-9.]+)'"'"'/\$VERSION = '"'$VERS'"'/'
Index: maintain/prepare_perl_module.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/prepare_perl_module.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- maintain/prepare_perl_module.sh 17 Feb 2012 22:53:47 -0000 1.4
+++ maintain/prepare_perl_module.sh 11 Nov 2012 16:25:03 -0000 1.5
@@ -14,7 +14,7 @@
rm -f Texinfo-$VERSION.tar.gz
cp -p ../COPYING .
make && make dist
-rm COPYING
+rm COPYING MYMETA.yml
tar xzvf Texinfo-$VERSION.tar.gz
(cd Texinfo-$VERSION/ && perl Makefile.PL && make && make test && \
./maintain/all_tests.sh clean && make distcheck) || exit 1
Index: maintain/regenerate_converters_documentation.sh
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/maintain/regenerate_converters_documentation.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- maintain/regenerate_converters_documentation.sh 1 Oct 2011 22:58:12
-0000 1.2
+++ maintain/regenerate_converters_documentation.sh 11 Nov 2012 16:25:04
-0000 1.3
@@ -1,8 +1,12 @@
#! /bin/sh
+# This file pastes the content of maintain/template.pod at the end of
+# converter modules, with the output format name suitably setup.
+# This file should be run when maintain/template.pod is modified.
+
for format in HTML XML DocBook Info Plaintext; do
- sed -i '/^__END__/q' Texinfo/Convert/$format.pm
+ sed -e '/^__END__/q' Texinfo/Convert/$format.pm >
Texinfo/Convert/$format.pm.$$.tmp
sed "s/OUTFORMAT/$format/g" maintain/template.pod > maintain/$format.pod
- sed -i "/^__END__/r maintain/$format.pod" Texinfo/Convert/$format.pm
- rm -f maintain/$format.pod
+ sed -e "/^__END__/r maintain/$format.pod" Texinfo/Convert/$format.pm.$$.tmp
> Texinfo/Convert/$format.pm
+ rm -f maintain/$format.pod Texinfo/Convert/$format.pm.$$.tmp
done
Index: maintain/regenerate_latin1_tests.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/regenerate_latin1_tests.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- maintain/regenerate_latin1_tests.sh 25 Jan 2012 08:31:26 -0000 1.1
+++ maintain/regenerate_latin1_tests.sh 11 Nov 2012 16:25:05 -0000 1.2
@@ -1,4 +1,8 @@
#! /bin/sh
+# This script should be run when t/input_files/char_latin1_utf8_in_refs.texi
+# is modified
+
iconv -f utf8 -t latin1 < t/input_files/char_latin1_utf8_in_refs.texi >
t/input_files/char_latin1_latin1_in_refs.texi
-sed -i -e 's/@documentencoding utf-8/@documentencoding iso-8859-1/'
t/input_files/char_latin1_latin1_in_refs.texi
+sed -e 's/@documentencoding utf-8/@documentencoding iso-8859-1/'
t/input_files/char_latin1_latin1_in_refs.texi >
t/input_files/char_latin1_latin1_in_refs.texi.$$.tmp
+mv t/input_files/char_latin1_latin1_in_refs.texi.$$.tmp
t/input_files/char_latin1_latin1_in_refs.texi
Index: tests/README
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/README 9 Nov 2012 23:52:59 -0000 1.5
+++ tests/README 11 Nov 2012 16:25:07 -0000 1.6
@@ -1,4 +1,4 @@
-$Id: README,v 1.5 2012/11/09 23:52:59 pertusus Exp $
+$Id: README,v 1.6 2012/11/11 16:25:07 pertusus Exp $
texinfo/tp/tests/README
Copyright (C) 2010, 2012 Free Software Foundation, Inc.
@@ -13,7 +13,7 @@
Prerequisites
=============
-To run this testsuite, sed (with -i), awk, diff, mktemp are used.
+To run this testsuite, sed, awk, diff (with -u), mktemp are used.
Some tests may also require a case insensitive filesystem.
Index: tests/run_parser_all.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/run_parser_all.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/run_parser_all.sh 9 Nov 2012 23:52:59 -0000 1.7
+++ tests/run_parser_all.sh 11 Nov 2012 16:25:08 -0000 1.8
@@ -16,6 +16,8 @@
res_dir=res_parser
out_dir=out_parser
+# used for tex4ht and latex2html results to keep their raw output
+raw_out_dir=raw_out_parser
#res_dir_ref=res
#command=texi2html.pl
diffs_dir=diffs
@@ -126,7 +128,9 @@
for command_dir in $commands; do
dir_suffix=`echo $command_dir | cut -d':' -f2`
outdir="${out_dir}${dir_suffix}/"
+ raw_outdir="${raw_out_dir}${dir_suffix}/"
[ -d "${outdir}$dir" ] && rm -rf "${outdir}$dir"
+ [ -d "${raw_outdir}$dir" ] && rm -rf "${raw_outdir}$dir"
done
else
for command_dir in $commands; do
@@ -141,7 +145,6 @@
mkdir "${resdir}$dir/"
fi
cp -r "${outdir}$dir/"* "${resdir}$dir/"
- rm -f "${resdir}$dir/"*.png "${resdir}$dir/"*_l2h.css
"${resdir}$dir/"*_2 "${resdir}$dir/"*_1
else
echo "No dir ${outdir}$dir" 1>&2
fi
@@ -153,7 +156,15 @@
. ../path_separator || exit 1
-[ -d "$diffs_dir" ] || mkdir "$diffs_dir"
+[ -d $diffs_dir ] || mkdir $diffs_dir
+staging_dir_res=$diffs_dir/staging_res/
+#rm -rf $staging_dir $staging_dir_res
+if [ z"$clean" = 'zyes' ]; then
+ rm -rf $staging_dir_res
+else
+ [ -d $staging_dir_res ] || mkdir $staging_dir_res
+fi
+
for command_dir in $commands; do
dir_suffix=`echo $command_dir | cut -d':' -f2`
outdir="${out_dir}${dir_suffix}/"
@@ -271,55 +282,73 @@
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 \
- ${outdir}$dir/*_l2h.html.* \
- ${outdir}$dir/*_tex4ht_tex.html*
+ #rm -f ${outdir}$dir/*_l2h_images.log ${outdir}$dir/*_tex4ht_*.log \
+ # ${outdir}$dir/*_tex4ht_*.idv ${outdir}$dir/*_tex4ht_*.dvi \
+ # ${outdir}$dir/*_l2h.html.* \
+ # ${outdir}$dir/*_tex4ht_tex.html*
fi
if [ $ret = 0 ]; then
diff_base="${dir}${dir_suffix}"
- sed -i -e 's/^texexpand.*/texexpand /' "${outdir}$dir/$basename.2"
- sed -i '/is no longer supported at.*line/d' "${outdir}$dir/$basename.2"
- if [ "$use_latex2html" = 'yes' ]; then
- # in case the output format is not html there won't be "*"_l2h.html
files
- for file in "${outdir}$dir/"*"_l2h.html"; do
- if [ -f "$file" ]; then
- sed -i -e 's/CONTENT="LaTeX2HTML.*/CONTENT="LaTeX2HTML">/' -e \
- 's/with LaTeX2HTML.*/with LaTeX2HTML/' "$file"
- fi
- done
- # "*"_images.pl" files are not guaranteed to be present
- for file in "${outdir}$dir/"*"_images.pl"
"${outdir}$dir/"*"_labels.pl"; do
- if [ -f "$file" ]; then
- sed -i -e 's/^# LaTeX2HTML.*/# LaTeX2HTML/' "$file"
- fi
- done
- for file in "${outdir}$dir/"*.htm* "${outdir}$dir/"*-l2h_cache.pm
"${outdir}$dir/"*_l2h_images.pl; do
- if [ -f "$file" ]; then
- # different rounding on different computers !
- sed -i -e 's/WIDTH="\([0-9]*\)\([0-9]\)"/WIDTH="100"/' -e
's/HEIGHT="\([0-9]*\)\([0-9]\)"/HEIGHT="\10"/' "$file"
- fi
- done
- rm -f "${outdir}$dir/"*".aux" "${outdir}$dir/"*"_images.out"
+ if [ -d "$results_dir/$dir" ]; then
+ res_dir_used="$results_dir/$dir"
fi
+ if [ "z$res_dir_used" != 'z' ]; then
+ # use a staging dir to be able to remove CVS directory
+ rm -rf $staging_dir_res/$dir
+ cp -pr "$res_dir_used" $staging_dir_res
+ rm -rf $staging_dir_res$dir/CVS
+
+ # with latex2html or tex4ht output is stored in raw_outdir, and files
+ # are removed or modified from the output directory used for
comparisons
if [ "$use_latex2html" = 'yes' -o "$use_tex4ht" = 'yes' ]; then
- # to keep the files but avoid them being copyied or diffed
- mv "${outdir}$dir/$basename.1" "${outdir}$dir/${basename}_1"
+
+ # store raw output
+ raw_outdir="${raw_out_dir}${dir_suffix}/"
+ [ -d "${raw_outdir}" ] || mkdir "${raw_outdir}"
+ rm -rf "${raw_outdir}$dir"
+ cp -pr ${outdir}$dir/ "${raw_outdir}"
+
+ # remove files that are not reproducible
+ rm -f "${outdir}$dir/$basename.1" ${outdir}$dir/*.png \
+ ${outdir}$dir/*_l2h_images.log ${outdir}$dir/*_tex4ht_*.log \
+ ${outdir}$dir/*_tex4ht_*.idv ${outdir}$dir/*_tex4ht_*.dvi \
+ ${outdir}$dir/*_l2h.html.* \
+ ${outdir}$dir/*_tex4ht_tex.html*
fi
if [ "$use_tex4ht" = 'yes' ]; then
# tex4ht may be customized to use dvipng or dvips, both being
# verbose, so there can not be reproducible tests on stderr either
# with tex4ht.
- mv "${outdir}$dir/$basename.2" "${outdir}$dir/${basename}_2"
+ rm "${outdir}$dir/$basename.2"
+ elif [ "$use_latex2html" = 'yes' ]; then
+ sed -e 's/^texexpand.*/texexpand /' \
+ -e '/is no longer supported at.*line/d' \
+ $raw_outdir$dir/$basename.2 > $outdir$dir/$basename.2
+ # "*"_images.pl" files are not guaranteed to be present
+ for file in "${raw_outdir}$dir/"*"_labels.pl"; do
+ if [ -f "$file" ]; then
+ filename=`basename "$file"`
+ sed -e 's/^# LaTeX2HTML.*/# LaTeX2HTML/' "$file" >
"$outdir$dir/$filename"
fi
- res_dir_used=
- if [ -d "$results_dir/$dir" ]; then
- res_dir_used="$results_dir/$dir"
- #elif [ -d "$results_dir_ref/$dir" ]; then
- # res_dir_used="$results_dir_ref/$dir"
+ done
+ for file in "${raw_outdir}$dir/"*.htm*
"${raw_outdir}$dir/"*-l2h_cache.pm "${raw_outdir}$dir/"*_l2h_images.pl; do
+ if [ -f "$file" ]; then
+ # width and height changed because of different rounding on
+ # different computers. Also remove version information.
+ filename=`basename "$file"`
+ sed -e 's/WIDTH="\([0-9]*\)\([0-9]\)"/WIDTH="100"/' \
+ -e 's/HEIGHT="\([0-9]*\)\([0-9]\)"/HEIGHT="\10"/' \
+ -e 's/CONTENT="LaTeX2HTML.*/CONTENT="LaTeX2HTML">/' \
+ -e 's/^# LaTeX2HTML.*/# LaTeX2HTML/' \
+ -e 's/with LaTeX2HTML.*/with LaTeX2HTML/' "$file" >
"$outdir$dir/$filename"
fi
- if [ "z$res_dir_used" != 'z' ]; then
- diff -a -u --exclude=CVS --exclude='*.png' --exclude='*_l2h.css'
--exclude='*_1' --exclude='*_2' -r "$res_dir_used" "${outdir}$dir" 2>>$logfile
> "$diffs_dir/$diff_base.diff"
+ done
+ rm -f ${outdir}$dir/*.aux ${outdir}$dir/*_images.out \
+ ${outdir}$dir/*_l2h.css
+ fi
+
+ #diff -a -u --exclude=CVS --exclude='*.png' --exclude='*_l2h.css'
--exclude='*_1' --exclude='*_2' -r "$res_dir_used" "${outdir}$dir" 2>>$logfile
> "$diffs_dir/$diff_base.diff"
+ diff -a -u -r "${staging_dir_res}$dir" "${outdir}$dir" 2>>$logfile >
"$diffs_dir/$diff_base.diff"
dif_ret=$?
if [ $dif_ret != 0 ]; then
echo "D: ${mydir}$diffs_dir/$diff_base.diff"
Index: tests/many_input_files/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/many_input_files/.cvsignore 10 Nov 2012 16:59:03 -0000 1.2
+++ tests/many_input_files/.cvsignore 11 Nov 2012 16:25:08 -0000 1.3
@@ -8,3 +8,4 @@
index_split
tex_l2h
tex_t4ht
+raw_out
Index: tests/many_input_files/indices.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/indices.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/many_input_files/indices.sh 28 Jul 2012 23:47:38 -0000 1.4
+++ tests/many_input_files/indices.sh 11 Nov 2012 16:25:08 -0000 1.5
@@ -13,6 +13,8 @@
[ "z$srcdir" = 'z' ] && srcdir=.
[ -d $diffs_dir ] || mkdir $diffs_dir
+staging_dir=$diffs_dir/staging
+[ -d $staging_dir ] || mkdir $staging_dir
echo "$basename" > $logfile
: > $stdout_file
@@ -31,14 +33,18 @@
return_code=0
for dir in ${basename} index_split; do
- if [ -d $srcdir/${dir}_res ]; then
- diff -u --exclude=CVS --exclude='*.png' -r "$srcdir/${dir}_res" "${dir}"
2>>$logfile > "$diffs_dir/$dir.diff"
+ if [ -d "$srcdir/${dir}_res" ]; then
+ # use a staging directory to rm files/directory giving spurious differences
+ rm -rf $staging_dir/${dir}_res
+ cp -pr "$srcdir/${dir}_res" $staging_dir
+ rm -rf $staging_dir/${dir}_res/CVS
+ diff -u -r $staging_dir/${dir}_res ${dir} 2>>$logfile >
$diffs_dir/$dir.diff
dif_ret=$?
if [ $dif_ret != 0 ]; then
echo "D: $diffs_dir/$dir.diff"
return_code=1
else
- rm "$diffs_dir/$dir.diff"
+ rm $diffs_dir/$dir.diff
fi
else
echo "no res: ${dir}_res"
Index: tests/many_input_files/tex_l2h.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tests/many_input_files/tex_l2h.sh 9 Nov 2012 23:53:00 -0000 1.8
+++ tests/many_input_files/tex_l2h.sh 11 Nov 2012 16:25:08 -0000 1.9
@@ -7,6 +7,7 @@
basename=tex_l2h
diffs_dir=diffs
+raw_output_dir=raw_out
logfile=$basename.log
stdout_file=$basename.out
@@ -19,6 +20,9 @@
fi
[ -d $diffs_dir ] || mkdir $diffs_dir
+staging_dir=$diffs_dir/staging
+[ -d $staging_dir ] || mkdir $staging_dir
+[ -d $raw_output_dir ] || mkdir $raw_output_dir
echo "$basename" > $logfile
: > $stdout_file
@@ -30,6 +34,8 @@
fi
[ -d $basename ] && rm -rf $basename
+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
@@ -40,17 +46,34 @@
echo "F: $basename/$basename.2"
return_code=1
else
- rm -f $basename/*_l2h_images.log $basename/*.aux $basename/*_l2h.css
#$basename/*.png
- sed -i -e 's/^texexpand.*/texexpand /' "$basename/$basename.2"
- sed -i '/is no longer supported at.*line/d' "$basename/$basename.2"
- sed -i -e 's/CONTENT="LaTeX2HTML.*/CONTENT="LaTeX2HTML">/' -e \
- 's/with LaTeX2HTML.*/with LaTeX2HTML/' "$basename/"*"_l2h.html"
- sed -i -e 's/^# LaTeX2HTML.*/# LaTeX2HTML/' "$basename/"*"_l2h_images.pl"
"$basename/"*"_l2h_labels.pl"
- sed -i -e 's/WIDTH="\([0-9]*\)\([0-9]\)"/WIDTH="100"/'
"$basename/"*"_l2h_images.pl" "$basename/"*.html "$basename/"*-l2h_cache.pm
- rm -f "$basename/"*".aux" "$basename/"*"_l2h_images.out"
- for dir in ${basename}; do
- if [ -d $srcdir/${dir}_res ]; then
- diff -u --exclude=CVS --exclude='*.png' -r "$srcdir/${dir}_res" "${dir}"
2>>$logfile > "$diffs_dir/$dir.diff"
+ outdir=$basename
+ cp -pr $outdir $raw_output_dir
+ rm -f $outdir/*_l2h_images.log $outdir/*.aux $outdir/*_l2h.css \
+ $outdir/*_l2h_images.out $outdir/*.png
+ sed -e 's/^texexpand.*/texexpand /' \
+ -e '/is no longer supported at.*line/d' "$raw_outdir/$basename.2" >
"$outdir/$basename.2"
+
+ for file in "$raw_outdir/"*.html "$raw_outdir/"*_l2h_images.pl
"$raw_outdir/"*-l2h_cache.pm; do
+ filename=`basename "$file"`
+ sed -e 's/WIDTH="\([0-9]*\)\([0-9]\)"/WIDTH="100"/' \
+ -e 's/CONTENT="LaTeX2HTML.*/CONTENT="LaTeX2HTML">/' \
+ -e 's/with LaTeX2HTML.*/with LaTeX2HTML/' \
+ -e 's/^# LaTeX2HTML.*/# LaTeX2HTML/' \
+ "$file" > "$outdir/$filename"
+ done
+
+ for file in "$raw_outdir/"*_l2h_labels.pl; do
+ filename=`basename "$file"`
+ sed -e 's/^# LaTeX2HTML.*/# LaTeX2HTML/' "$file" > "$outdir/$filename"
+ done
+
+ dir=$basename
+ if [ -d "$srcdir/${dir}_res" ]; then
+ rm -rf $staging_dir/${dir}_res
+ cp -pr "$srcdir/${dir}_res" $staging_dir
+ rm -rf $staging_dir/${dir}_res/CVS
+ #diff -u --exclude=CVS --exclude='*.png' -r "$srcdir/${dir}_res" "${dir}"
2>>$logfile > "$diffs_dir/$dir.diff"
+ diff -u -r "$staging_dir/${dir}_res" "$outdir" 2>>$logfile >
"$diffs_dir/$dir.diff"
dif_ret=$?
if [ $dif_ret != 0 ]; then
echo "D: $diffs_dir/$dir.diff"
@@ -61,7 +84,6 @@
else
echo "no res: ${dir}_res"
fi
- done
fi
rm -rf $tmp_dir
Index: tests/many_input_files/tex_t4ht.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/many_input_files/tex_t4ht.sh 9 Nov 2012 23:53:00 -0000 1.7
+++ tests/many_input_files/tex_t4ht.sh 11 Nov 2012 16:25:08 -0000 1.8
@@ -7,6 +7,7 @@
basename=tex_t4ht
diffs_dir=diffs
+raw_output_dir=raw_out
logfile=$basename.log
stdout_file=$basename.out
@@ -19,6 +20,9 @@
fi
[ -d $diffs_dir ] || mkdir $diffs_dir
+staging_dir=$diffs_dir/staging
+[ -d $staging_dir ] || mkdir $staging_dir
+[ -d $raw_output_dir ] || mkdir $raw_output_dir
echo "$basename" > $logfile
: > $stdout_file
@@ -30,6 +34,8 @@
fi
[ -d $basename ] && rm -rf $basename
+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
@@ -40,13 +46,19 @@
echo "F: $basename/$basename.2"
return_code=1
else
- rm -f $basename/*_tex4ht_*.log \
- $basename/*_tex4ht_*.idv $basename/*_tex4ht_*.dvi \
- $basename/*_tex4ht_tex.html #$basename/*.png
+ outdir="$basename"
+ cp -pr $outdir $raw_output_dir
+ rm -f $outdir/*_tex4ht_*.log \
+ $outdir/*_tex4ht_*.idv $outdir/*_tex4ht_*.dvi \
+ $outdir/*_tex4ht_tex.html $outdir/*.png
- for dir in ${basename}; do
+ dir=${basename}
if [ -d $srcdir/${dir}_res ]; then
- diff -u --exclude=CVS --exclude='*.png' -r "$srcdir/${dir}_res" "${dir}"
2>>$logfile > "$diffs_dir/$dir.diff"
+ rm -rf $staging_dir/${dir}_res
+ cp -pr "$srcdir/${dir}_res" $staging_dir
+ rm -rf $staging_dir/${dir}_res/CVS
+ #diff -u --exclude=CVS --exclude='*.png' -r "$srcdir/${dir}_res" "${dir}"
2>>$logfile > "$diffs_dir/$dir.diff"
+ diff -u -r "$staging_dir/${dir}_res" "${outdir}" 2>>$logfile >
"$diffs_dir/$dir.diff"
dif_ret=$?
if [ $dif_ret != 0 ]; then
echo "D: $diffs_dir/$dir.diff"
@@ -57,7 +69,6 @@
else
echo "no res: ${dir}_res"
fi
- done
fi
rm -rf $tmp_dir
Index: tests/tex_html/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/tex_html/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/tex_html/.cvsignore 19 Apr 2012 21:15:10 -0000 1.1
+++ tests/tex_html/.cvsignore 11 Nov 2012 16:25:08 -0000 1.2
@@ -4,3 +4,4 @@
tests.out
diffs
out_parser
+raw_out_parser
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp MANIFEST Texinfo/Convert/DocBook.pm ...,
Patrice Dumas <=