branch master updated: No -I flags for bundled libraries

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 87219f2045 No -I flags for bundled libraries
87219f2045 is described below

commit 87219f2045c92acbae9081b4be33d59d0712fd6a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Oct 20 11:56:54 2023 +0100

    No -I flags for bundled libraries
    
    * tp/tests/many_input_files/different_encodings.sh,
    * tp/tests/many_input_files/different_languages_gen_master_menu.sh,
    * tp/tests/many_input_files/input_dir_non_ascii.sh,
    * tp/tests/many_input_files/output_dir_file_non_ascii.sh,
    * tp/tests/many_input_files/output_dir_non_ascii.sh,
    * tp/tests/many_input_files/tex_l2h.sh,
    * tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh:
    Remove several -I arguments for Perl to get library dependencies
    of texi2any.  It is unnecessary as texi2any adds the directories
    for these libraries itself using Texinfo::ModulePath.  It leads
    to a much longer command line, which makes these tests harder
    to understand.  It is also fragile in case the dependencies of
    the program change.
---
 ChangeLog                                              | 18 ++++++++++++++++++
 tp/tests/many_input_files/different_encodings.sh       |  2 +-
 .../different_languages_gen_master_menu.sh             |  2 +-
 tp/tests/many_input_files/input_dir_non_ascii.sh       |  2 +-
 tp/tests/many_input_files/output_dir_file_non_ascii.sh |  2 +-
 tp/tests/many_input_files/output_dir_non_ascii.sh      |  2 +-
 tp/tests/many_input_files/tex_l2h.sh                   |  2 +-
 .../many_input_files/tex_l2h_output_dir_non_ascii.sh   |  2 +-
 8 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5bd6aa607..77d0d97f37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2023-10-20  Gavin Smith <gavinsmith0123@gmail.com>
+
+       No -I flags for bundled libraries
+
+       * tp/tests/many_input_files/different_encodings.sh,
+       * tp/tests/many_input_files/different_languages_gen_master_menu.sh,
+       * tp/tests/many_input_files/input_dir_non_ascii.sh,
+       * tp/tests/many_input_files/output_dir_file_non_ascii.sh,
+       * tp/tests/many_input_files/output_dir_non_ascii.sh,
+       * tp/tests/many_input_files/tex_l2h.sh,
+       * tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh:
+       Remove several -I arguments for Perl to get library dependencies
+       of texi2any.  It is unnecessary as texi2any adds the directories
+       for these libraries itself using Texinfo::ModulePath.  It leads
+       to a much longer command line, which makes these tests harder
+       to understand.  It is also fragile in case the dependencies of
+       the program change.
+
 2023-10-20  Patrice Dumas <pertusus@free.fr>
 
        * doc/refcard/Makefile.am (txirefcard.pdf, txirefcard-a4.pdf):
diff --git a/tp/tests/many_input_files/different_encodings.sh 
b/tp/tests/many_input_files/different_encodings.sh
index 52e9fbd72b..6eecb3b2b1 100755
--- a/tp/tests/many_input_files/different_encodings.sh
+++ b/tp/tests/many_input_files/different_encodings.sh
@@ -43,7 +43,7 @@ raw_outdir=$raw_output_dir/$basename
 mkdir $basename
 : > $basename/$stdout_file
 set -x
-cmd="$prepended_command $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 
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding -c 
OUTPUT_CHARACTERS=1 --conf-dir $srcdir/../../init --out $basename/ 
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi 
$srcdir/../../t/input_files/char_utf8_latin1_in_refs.texi [...]
+cmd="$prepended_command $PERL -I $srcdir/../.. -w $srcdir/../../texi2any.pl 
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding -c 
OUTPUT_CHARACTERS=1 --conf-dir $srcdir/../../init --out $basename/ 
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi 
$srcdir/../../t/input_files/char_utf8_latin1_in_refs.texi --force >> 
$basename/$stdout_file 2>$basename/${basename}.2"
 echo "$cmd" >> $logfile
 eval $cmd
 
diff --git a/tp/tests/many_input_files/different_languages_gen_master_menu.sh 
b/tp/tests/many_input_files/different_languages_gen_master_menu.sh
index a46e7377bd..216c2a4f25 100755
--- a/tp/tests/many_input_files/different_languages_gen_master_menu.sh
+++ b/tp/tests/many_input_files/different_languages_gen_master_menu.sh
@@ -37,7 +37,7 @@ raw_outdir=$raw_output_dir/$basename
 [ -d $raw_outdir ] && rm -rf $raw_outdir
 mkdir $basename
 : > $basename/$stdout_file
-cmd="$prepended_command $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 
--html --no-split -c FORMAT_MENU=menu -c 
TREE_TRANSFORMATIONS=regenerate_master_menu --set-customization-variable 'TEST 
1' --conf-dir $srcdir/../../init --out $basename/ 
$srcdir/input_files/no_master_menu_fr.texi 
$srcdir/input_files/no_master_menu_no_documentla [...]
+cmd="$prepended_command $PERL -I $srcdir/../.. -w $srcdir/../../texi2any.pl 
--html --no-split -c FORMAT_MENU=menu -c 
TREE_TRANSFORMATIONS=regenerate_master_menu --set-customization-variable 'TEST 
1' --conf-dir $srcdir/../../init --out $basename/ 
$srcdir/input_files/no_master_menu_fr.texi 
$srcdir/input_files/no_master_menu_no_documentlanguage.texi --force >> 
$basename/$stdout_file 2>$basename/${basename}.2"
 echo "$cmd" >> $logfile
 eval $cmd
 
diff --git a/tp/tests/many_input_files/input_dir_non_ascii.sh 
b/tp/tests/many_input_files/input_dir_non_ascii.sh
index 42e3dec3ef..5ffa77818a 100755
--- a/tp/tests/many_input_files/input_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/input_dir_non_ascii.sh
@@ -44,7 +44,7 @@ raw_outdir=$raw_output_dir/$basename
 mkdir $basename
 : > $basename/$stdout_file
 
-cmd="$prepended_command $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 
--html --no-split --set-customization-variable 'TEST 1' -I 
$srcdir/input_files/dir_înclùde --conf-dir $srcdir/../../init --out $basename/ 
$srcdir/input_files/simple_including_file.texi --force >> 
$basename/$stdout_file 2>$basename/${basename}.2"
+cmd="$prepended_command $PERL -I $srcdir/../.. -w $srcdir/../../texi2any.pl 
--html --no-split --set-customization-variable 'TEST 1' -I 
$srcdir/input_files/dir_înclùde --conf-dir $srcdir/../../init --out $basename/ 
$srcdir/input_files/simple_including_file.texi --force >> 
$basename/$stdout_file 2>$basename/${basename}.2"
 echo "$cmd" >> $logfile
 eval $cmd
 
diff --git a/tp/tests/many_input_files/output_dir_file_non_ascii.sh 
b/tp/tests/many_input_files/output_dir_file_non_ascii.sh
index 0c7d45d85f..bdb039f56f 100755
--- a/tp/tests/many_input_files/output_dir_file_non_ascii.sh
+++ b/tp/tests/many_input_files/output_dir_file_non_ascii.sh
@@ -46,7 +46,7 @@ mkdir $basename
 
 # note that it is important to have -c 'COMMAND_LINE_ENCODING UTF-8' before 
--out
 # such that --out is correctly decoded
-cmd="$prepended_command $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 'TEST 1' --conf-dir $srcdir/../../init -c 
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info 
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force 
>> $basename/$stdout_file 2>$basename/${ba [...]
+cmd="$prepended_command $PERL -I $srcdir/../.. -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c 
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info 
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force 
>> $basename/$stdout_file 2>$basename/${basename}.2"
 echo "$cmd" >> $logfile
 eval $cmd
 
diff --git a/tp/tests/many_input_files/output_dir_non_ascii.sh 
b/tp/tests/many_input_files/output_dir_non_ascii.sh
index 3ce85ee480..a736d74b03 100755
--- a/tp/tests/many_input_files/output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/output_dir_non_ascii.sh
@@ -46,7 +46,7 @@ mkdir $basename
 
 # note that it is important to have -c 'COMMAND_LINE_ENCODING UTF-8' before 
--out
 # such that --out is correctly decoded
-cmd="$prepended_command $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 'TEST 1' --conf-dir $srcdir/../../init -c 
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/ 
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force 
>> $basename/$stdout_file 2>$basename/${basename}.2"
+cmd="$prepended_command $PERL -I $srcdir/../.. -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c 
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/ 
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force 
>> $basename/$stdout_file 2>$basename/${basename}.2"
 echo "$cmd" >> $logfile
 eval $cmd
 
diff --git a/tp/tests/many_input_files/tex_l2h.sh 
b/tp/tests/many_input_files/tex_l2h.sh
index cff9b25ad1..22931f401e 100755
--- a/tp/tests/many_input_files/tex_l2h.sh
+++ b/tp/tests/many_input_files/tex_l2h.sh
@@ -54,7 +54,7 @@ raw_outdir=$raw_output_dir/$basename
 [ -d $raw_outdir ] && rm -rf $raw_outdir
 mkdir $basename
 : > $basename/$stdout_file
-cmd="$prepended_command $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 'HTML_MATH l2h' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/ [...]
+cmd="$prepended_command $PERL -I $srcdir/../.. -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 'HTML_MATH l2h' --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 >> $ [...]
 echo "$cmd" >> $logfile
 eval $cmd
 
diff --git a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh 
b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
index 45b91ddb91..cee0e43cb6 100755
--- a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
@@ -63,7 +63,7 @@ mkdir $basename
 
 # note that it is important to have -c 'COMMAND_LINE_ENCODING UTF-8' before 
--out
 # such that --out is correctly decoded
-cmd="$prepended_command $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 'HTML_MATH l2h' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/ [...]
+cmd="$prepended_command $PERL -I $srcdir/../.. -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 'HTML_MATH l2h' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init  --set-customization-variable 
'L2H_CLEAN=0' --iftex -c 'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/ 
$srcdir/../tex_html/tex_encodé_utf8.t [...]
 echo "$cmd" >> $logfile
 eval $cmd