texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Makefile.PL texi2any.pl


From: Patrice Dumas
Subject: texinfo/tp Makefile.PL texi2any.pl
Date: Sun, 25 Dec 2011 12:29:33 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/12/25 12:29:33

Modified files:
        tp             : Makefile.PL texi2any.pl 

Log message:
        texi2any.pl: use Parser Version only after requiring the module.
        Makefile.PL: also install DebugTexinfo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.PL?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.95&r2=1.96

Patches:
Index: Makefile.PL
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.PL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Makefile.PL 25 Dec 2011 10:57:42 -0000      1.9
+++ Makefile.PL 25 Dec 2011 12:29:33 -0000      1.10
@@ -23,7 +23,7 @@
                           "Test::More" => "0.88",
                           "Clone" => 0,
                          },
-    PMLIBDIRS         => [ 'Texinfo', 'LocaleData' ],
+    PMLIBDIRS         => [ 'Texinfo', 'LocaleData', 'DebugTexinfo' ],
     EXE_FILES         => [ 'texi2any-perl' ],
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
       (

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- texi2any.pl 25 Dec 2011 10:57:42 -0000      1.95
+++ texi2any.pl 25 Dec 2011 12:29:33 -0000      1.96
@@ -44,38 +44,10 @@
 
 use Texinfo::Convert::Texinfo;
 
-# Version: set in configure.in
-my $configured_version = '@PACKAGE_VERSION@';
-$configured_version = $Texinfo::Parser::VERSION 
-  if ($configured_version eq '@' . 'PACKAGE_VERSION@');
-my $configured_package = '@PACKAGE@';
-$configured_package = 'Texinfo' if ($configured_package eq '@' . 'PACKAGE@');
-my $configured_name = '@PACKAGE_NAME@';
-$configured_name = $configured_package 
-  if ($configured_name eq '@' .'PACKAGE_NAME@');
-my $configured_name_version = "$configured_name $configured_version"; 
-my $configured_url = '@PACKAGE_URL@';
-# FIXME url of the CPAN module if/when it exists?
-
 my $real_command_name = $0;
 $real_command_name =~ s/.*\///;
 $real_command_name =~ s/\.pl$//;
 
-# defaults for options relevant in the main program, not undef, and also
-# defaults for all the converters.
-# Other relevant options (undef) are NO_WARN FORCE OUTFILE
-# Others are set in the converters.
-my $converter_default_options = { 
-    'ERROR_LIMIT' => 100,
-    'TEXI2DVI' => 'texi2dvi',
-    'PACKAGE_VERSION' => $configured_version,
-    'PACKAGE' => $configured_package,
-    'PACKAGE_NAME' => $configured_name,
-    'PACKAGE_AND_VERSION' => $configured_name_version,
-    'PACKAGE_URL' => $configured_url,
-    'PROGRAM' => $real_command_name, 
-};
-
 # this associates the command line options to the arrays set during
 # command line parsing.
 my @css_files = ();
@@ -210,6 +182,34 @@
 require DebugTexinfo::DebugCount;
 require DebugTexinfo::DebugTree;
 
+# Version: set in configure.in
+my $configured_version = '@PACKAGE_VERSION@';
+$configured_version = $Texinfo::Parser::VERSION 
+  if ($configured_version eq '@' . 'PACKAGE_VERSION@');
+my $configured_package = '@PACKAGE@';
+$configured_package = 'Texinfo' if ($configured_package eq '@' . 'PACKAGE@');
+my $configured_name = '@PACKAGE_NAME@';
+$configured_name = $configured_package 
+  if ($configured_name eq '@' .'PACKAGE_NAME@');
+my $configured_name_version = "$configured_name $configured_version"; 
+my $configured_url = '@PACKAGE_URL@';
+# FIXME url of the CPAN module if/when it exists?
+
+# defaults for options relevant in the main program, not undef, and also
+# defaults for all the converters.
+# Other relevant options (undef) are NO_WARN FORCE OUTFILE
+# Others are set in the converters.
+my $converter_default_options = { 
+    'ERROR_LIMIT' => 100,
+    'TEXI2DVI' => 'texi2dvi',
+    'PACKAGE_VERSION' => $configured_version,
+    'PACKAGE' => $configured_package,
+    'PACKAGE_NAME' => $configured_name,
+    'PACKAGE_AND_VERSION' => $configured_name_version,
+    'PACKAGE_URL' => $configured_url,
+    'PROGRAM' => $real_command_name, 
+};
+
 # determine configuration directories.
 
 my $conf_file_name = 'Config' ;



reply via email to

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