[Octave-bug-tracker] [bug #62648] build problem with texinfo>6.8

[Arun Giridhar]

Follow-up Comment #11, bug #62648 (project octave):

I worked around the strict subs error by adding a $ sign everywhere needed.

New diff:

diff -r 870036573716 doc/interpreter/mk-qthelp.pl
--- a/doc/interpreter/mk-qthelp.pl      Mon Nov 07 16:50:39 2022 -0500
+++ b/doc/interpreter/mk-qthelp.pl      Fri Nov 11 09:00:20 2022 -0500
@@ -25,9 +25,20 @@ if ($#ARGV != 1)
 $htmlfname = File::Spec->catfile ($basedir, $htmldir, "index.html");
 open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
 
+
+$TEXINFO_VERSION=6;  ## TODO FIXME Pull this information from Texinfo itself
+
+$pattern1 = /^<div class="contents">/;
+
+if ($TEXINFO_VERSION < 7) {$pattern2 = /^<ul class="no-bullet">/; }
+else                      {$pattern2 = /^<ul class="toc-numbered-mark">/; }
+
+if ($TEXINFO_VERSION < 7) {$pattern3 = /^<table class="index-fn/; }
+else                      {$pattern3 = /^<table class="fn-entries/; }
+
 # Skip through preamble of file to find start of list
-while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
-while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
+while (<$HTML>) {next if $_ !~ $pattern1; last;}
+while (<$HTML>) {next if $_ !~ $pattern2; last;}
 
 $level = 0;
 while (<$HTML>)
@@ -68,7 +79,7 @@ die "Failed to parse index.html" if ($le
 open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
 
 # Skip through preamble of file to find start of list
-while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
+while(<$HTML>) {next if $_ !~ $pattern3; last;}
 
 while (<$HTML>)
 {


Fewer errors now:

  GEN      doc/interpreter/octave_interpreter.qhc
Use of uninitialized value $_ in pattern match (m//) at
../doc/interpreter/mk-qthelp.pl line 31.
Use of uninitialized value $_ in pattern match (m//) at
../doc/interpreter/mk-qthelp.pl line 33.
Use of uninitialized value $_ in pattern match (m//) at
../doc/interpreter/mk-qthelp.pl line 36.
error:unrecognized input: .....doc/interpreter/octave.html/index.html:3:<!--
Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
make[2]: *** [Makefile:31307: doc/interpreter/octave_interpreter.qhc] Error
25




    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/bugs/?62648>

_______________________________________________
Message sent via Savannah
https://savannah.gnu.org/