texinfo tp/texi2any.pl Pod-Simple-Texinfo/pod2t...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/11/20 03:17:00

Modified files:
        tp             : texi2any.pl 
        Pod-Simple-Texinfo: pod2texi.pl 
        util           : txixml2texi.pl 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/pod2texi.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/txixml2texi.pl?cvsroot=texinfo&r1=1.5&r2=1.6

Patches:
Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- tp/texi2any.pl      20 Nov 2012 02:33:43 -0000      1.147
+++ tp/texi2any.pl      20 Nov 2012 03:17:00 -0000      1.148
@@ -50,77 +50,43 @@
   my $package = '@PACKAGE@';
   my $updir = File::Spec->updir();
 
-  my $srcdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : $command_directory;
-  my $libsrcdir = File::Spec->catdir($srcdir, 'maintain');
-
   my $texinfolibdir;
-  if ($datadir ne '@' .'datadir@' and $package ne '@' . 'PACKAGE@'
-      and $datadir ne '') {
-    $texinfolibdir = File::Spec->catdir($datadir, $package);
-    unshift @INC, ($texinfolibdir);
-  }
+  my $lib_dir;
+
   # in-source run
   if (($command_suffix eq '.pl' and !(defined($ENV{'TEXINFO_DEV_SOURCE'})
        and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) {
-    $texinfolibdir = $srcdir;
+    $texinfolibdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : 
$command_directory;
+    $lib_dir = File::Spec->catdir($texinfolibdir, 'maintain');
     unshift @INC, $texinfolibdir;
-  }
+  } elsif ($datadir ne '@' .'datadir@' and $package ne '@' . 'PACKAGE@'
+           and $datadir ne '') {
+    $texinfolibdir = File::Spec->catdir($datadir, $package);
   # try to make package relocatable, will only work if standard relative paths
   # are used
-  if ((defined($texinfolibdir)
-       and ! -f File::Spec->catfile($texinfolibdir, 'Texinfo', 'Parser.pm'))
-      and -f File::Spec->catfile($command_directory, $updir, 'share', 
'texinfo', 'Texinfo', 'Parser.pm')) {
-    unshift @INC, (File::Spec->catdir($command_directory, $updir, 'share', 
'texinfo'));
-  }
-
-# find module location either in source, in pkgdatadir or in the perl paths.
-sub add_module_path_to_INC($$$$$$$@)
-{
-  my $module_name = shift;
-  my $configure_string = shift;
-  my $command_suffix = shift;
-  my $dev_source_environment = shift;
-  my $libsrcdir = shift;
-  my $texinfolibdir = shift;
-  my $command_directory = shift;
-  my @directories = @_;
-
-  if (($command_suffix eq '.pl' and !(defined($dev_source_environment)
-     and $dev_source_environment eq 0)) or $dev_source_environment) {
-    unshift @INC, File::Spec->catdir($libsrcdir, @directories);
-  } elsif ($configure_string ne 'yes' and defined($texinfolibdir)
-         and -d File::Spec->catdir($texinfolibdir, @directories)) {
-    unshift @INC, File::Spec->catdir($texinfolibdir, @directories);
-  } elsif (defined($texinfolibdir)) {
-    eval "require $module_name; ";
-    if ($@ and -d File::Spec->catdir($texinfolibdir, @directories)) {
-      unshift @INC, File::Spec->catdir($texinfolibdir, @directories);
-    }
-  }
-  # try to make the script relocatable
-  if (defined($texinfolibdir) and $configure_string ne 'yes') {
-    eval "require $module_name; ";
-    if ($@ and -d File::Spec->catdir($command_directory, $updir, 
-                                    'share', 'texinfo', @directories)) {
-      unshift @INC, (File::Spec->catdir($command_directory, $updir, 'share', 
-                                        'texinfo', @directories));
+    if (! -f File::Spec->catfile($texinfolibdir, 'Texinfo', 'Parser.pm')
+        and -f File::Spec->catfile($command_directory, $updir, 'share', 
+                                   'texinfo', 'Texinfo', 'Parser.pm')) {
+      $texinfolibdir = File::Spec->catdir($command_directory, $updir, 
+                                          'share', 'texinfo');
     }
+    $lib_dir = $texinfolibdir;
+    unshift @INC, $texinfolibdir;
   }
-}
 
   # '@USE_EXTERNAL_LIBINTL @ and similar are substituted in the
   # makefile using values from configure
-  add_module_path_to_INC("Locale::Messages", '@USE_EXTERNAL_LIBINTL@', 
$command_suffix, 
-   $ENV{'TEXINFO_DEV_SOURCE'}, $libsrcdir, $texinfolibdir, $command_directory,
-   'lib', 'libintl-perl', 'lib');
-
-  add_module_path_to_INC("Unicode::EastAsianWidth", 
'@USE_EXTERNAL_EASTASIANWIDTH@',
-   $command_suffix, $ENV{'TEXINFO_DEV_SOURCE'}, $libsrcdir, $texinfolibdir, 
-   $command_directory, 'lib', 'Unicode-EastAsianWidth', 'lib');
-
-  add_module_path_to_INC("Text::Unidecode", '@USE_EXTERNAL_UNIDECODE@',
-   $command_suffix, $ENV{'TEXINFO_DEV_SOURCE'}, $libsrcdir, $texinfolibdir, 
-   $command_directory, 'lib', 'Text-Unidecode', 'lib');
+  if (defined($texinfolibdir)) {
+    if ('@USE_EXTERNAL_LIBINTL@' ne 'yes') {
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'));
+    }
+    if ('@USE_EXTERNAL_EASTASIANWIDTH@' ne 'yes') {
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'));
+    }
+    if ('@USE_EXTERNAL_UNIDECODE@' ne 'yes') {
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
+    }
+  }
 }
 
 use Texinfo::Convert::Texinfo;

Index: Pod-Simple-Texinfo/pod2texi.pl
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/pod2texi.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- Pod-Simple-Texinfo/pod2texi.pl      20 Nov 2012 02:34:40 -0000      1.20
+++ Pod-Simple-Texinfo/pod2texi.pl      20 Nov 2012 03:17:00 -0000      1.21
@@ -29,44 +29,50 @@
 
 BEGIN
 {
-  my $updir = File::Spec->updir();
   my ($real_command_name, $command_directory, $command_suffix)
      = fileparse($0, '.pl');
 
-  my $maintain_dir;
-  my $modules_dir;
-  if ('@datadir@' ne '@' . 'datadir@') {
+  my $datadir = '@datadir@';
     my $package = '@PACKAGE@';
-    my $datadir = eval '"@datadir@"';
-    if ($datadir ne '') {
-      # try to find modules in directories relative to the script
-      $modules_dir = File::Spec->catdir($datadir, $package);
-      if (! -f File::Spec->catfile($modules_dir, 'Texinfo', 'Parser.pm')
+  my $updir = File::Spec->updir();
+
+  my $texinfolibdir;
+  my $lib_dir;
+
+  # in-source run
+  if (($command_suffix eq '.pl' and !(defined($ENV{'TEXINFO_DEV_SOURCE'})
+       and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) {
+    my $srcdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : $command_directory;
+    $texinfolibdir = File::Spec->catdir($srcdir, $updir, 'tp');
+    $lib_dir = File::Spec->catdir($texinfolibdir, 'maintain');
+    unshift @INC, (File::Spec->catdir($srcdir, 'lib'), $texinfolibdir);
+  } elsif ($datadir ne '@' .'datadir@' and $package ne '@' . 'PACKAGE@'
+           and $datadir ne '') {
+    $texinfolibdir = File::Spec->catdir($datadir, $package);
+    # try to make package relocatable, will only work if standard relative 
paths
+    # are used
+    if (! -f File::Spec->catfile($texinfolibdir, 'Texinfo', 'Parser.pm')
           and -f File::Spec->catfile($command_directory, $updir, 'share', 
                                      'texinfo', 'Texinfo', 'Parser.pm')) {
-        $modules_dir = File::Spec->catdir($command_directory, 
-                                          $updir, 'share', 'texinfo');
+      $texinfolibdir = File::Spec->catdir($command_directory, $updir,
+                                          'share', 'texinfo');
       }
-      $maintain_dir = $modules_dir;
-      unshift @INC, (File::Spec->catdir($modules_dir, 'Pod-Simple-Texinfo'), 
$modules_dir);
+    $lib_dir = $texinfolibdir;
+    unshift @INC, (File::Spec->catdir($texinfolibdir, 'Pod-Simple-Texinfo'),
+                   $texinfolibdir);
     }
-  } elsif (($0 =~ /\.pl$/ and !(defined($ENV{'TEXINFO_DEV_SOURCE'})
-     and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) {
-    my $srcdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : $command_directory;
-    $modules_dir = File::Spec->catdir($srcdir, File::Spec->updir(), 'tp');
-    $maintain_dir = File::Spec->catdir($modules_dir, 'maintain');
-    unshift @INC, (File::Spec->catdir($srcdir, 'lib'), $modules_dir);
-  }
-  if (defined($maintain_dir)) {
+
+  # '@USE_EXTERNAL_LIBINTL @ and similar are substituted in the
+  # makefile using values from configure
+  if (defined($texinfolibdir)) {
     if ('@USE_EXTERNAL_LIBINTL@' ne 'yes') {
-      unshift @INC, File::Spec->catdir($maintain_dir, 'lib', 'libintl-perl', 
'lib');
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'));
     }
     if ('@USE_EXTERNAL_EASTASIANWIDTH@' ne 'yes') {
-      unshift @INC, File::Spec->catdir($maintain_dir, 'lib', 
-                                            'Unicode-EastAsianWidth', 'lib');
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'));
     }
     if ('@USE_EXTERNAL_UNIDECODE@' ne 'yes') {
-      unshift @INC, File::Spec->catdir($maintain_dir, 'lib', 'Text-Unidecode', 
'lib');
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
     }
   }
 }

Index: util/txixml2texi.pl
===================================================================
RCS file: /sources/texinfo/texinfo/util/txixml2texi.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- util/txixml2texi.pl 20 Nov 2012 02:34:40 -0000      1.5
+++ util/txixml2texi.pl 20 Nov 2012 03:17:00 -0000      1.6
@@ -29,44 +29,49 @@
 
 BEGIN
 {
-  my $updir = File::Spec->updir();
   my ($real_command_name, $command_directory, $command_suffix)
      = fileparse($0, '.pl');
 
-  my $maintain_dir;
-  my $modules_dir;
-  if ('@datadir@' ne '@' . 'datadir@') {
+  my $datadir = '@datadir@';
     my $package = '@PACKAGE@';
-    my $datadir = eval '"@datadir@"';
-    if ($datadir ne '') {
-      # try to find modules in directories relative to the script
-      $modules_dir = File::Spec->catdir($datadir, $package);
-      if (! -f File::Spec->catfile($modules_dir, 'Texinfo', 'Parser.pm')
+  my $updir = File::Spec->updir();
+
+  my $texinfolibdir;
+  my $lib_dir;
+
+  # in-source run
+  if (($command_suffix eq '.pl' and !(defined($ENV{'TEXINFO_DEV_SOURCE'})
+       and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) {
+    my $srcdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : $command_directory;
+    $texinfolibdir = File::Spec->catdir($srcdir, $updir, 'tp');
+    $lib_dir = File::Spec->catdir($texinfolibdir, 'maintain');
+    unshift @INC, $texinfolibdir;
+  } elsif ($datadir ne '@' .'datadir@' and $package ne '@' . 'PACKAGE@'
+           and $datadir ne '') {
+    $texinfolibdir = File::Spec->catdir($datadir, $package);
+    # try to make package relocatable, will only work if standard relative 
paths
+    # are used
+    if (! -f File::Spec->catfile($texinfolibdir, 'Texinfo', 'Parser.pm')
           and -f File::Spec->catfile($command_directory, $updir, 'share', 
                                      'texinfo', 'Texinfo', 'Parser.pm')) {
-        $modules_dir = File::Spec->catdir($command_directory, 
-                                          $updir, 'share', 'texinfo');
+      $texinfolibdir = File::Spec->catdir($command_directory, $updir, 
+                                          'share', 'texinfo');
       }
-      $maintain_dir = $modules_dir;
-      unshift @INC, $modules_dir;
+    $lib_dir = $texinfolibdir;
+    unshift @INC, $texinfolibdir;
     }
-  } elsif (($0 =~ /\.pl$/ and !(defined($ENV{'TEXINFO_DEV_SOURCE'})
-     and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) {
-    my $srcdir = defined $ENV{'srcdir'} ? $ENV{'srcdir'} : $command_directory;
-    $modules_dir = File::Spec->catdir($srcdir, File::Spec->updir(), 'tp');
-    $maintain_dir = File::Spec->catdir($modules_dir, 'maintain');
-    unshift @INC, $modules_dir;
-  }
-  if (defined($maintain_dir)) {
+
+  # '@USE_EXTERNAL_LIBINTL @ and similar are substituted in the
+  # makefile using values from configure
+  if (defined($texinfolibdir)) {
     if ('@USE_EXTERNAL_LIBINTL@' ne 'yes') {
-      unshift @INC, File::Spec->catdir($maintain_dir, 'lib', 'libintl-perl', 
'lib');
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'libintl-perl', 
'lib'));
     }
     if ('@USE_EXTERNAL_EASTASIANWIDTH@' ne 'yes') {
-      unshift @INC, File::Spec->catdir($maintain_dir, 'lib', 
-                                            'Unicode-EastAsianWidth', 'lib');
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 
'Unicode-EastAsianWidth', 'lib'));
     }
     if ('@USE_EXTERNAL_UNIDECODE@' ne 'yes') {
-      unshift @INC, File::Spec->catdir($maintain_dir, 'lib', 'Text-Unidecode', 
'lib');
+      unshift @INC, (File::Spec->catdir($lib_dir, 'lib', 'Text-Unidecode', 
'lib'));
     }
   }
 }