texinfo/tp MANIFEST Makefile.PL Makefile.am tex...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/02/17 22:53:47

Modified files:
        tp             : MANIFEST Makefile.PL Makefile.am texi2any.pl 
        tp/maintain    : prepare_perl_module.sh 

Log message:
        Hardcode the same number as in configure.ac to be used with unconfigured
        texi2any.pl.
        
        Improve the perl module generation by shipping texi2any directly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.PL?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/prepare_perl_module.sh?cvsroot=texinfo&r1=1.3&r2=1.4

Patches:
Index: MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- MANIFEST    16 Feb 2012 00:33:49 -0000      1.33
+++ MANIFEST    17 Feb 2012 22:53:46 -0000      1.34
@@ -54,7 +54,7 @@
 t/accents.t
 t/converters_tests.t
 t/docbook_tests.t
-texi2any-perl
+texi2any
 Texinfo/Common.pm
 Texinfo/Convert/Converter.pm
 Texinfo/Convert/DocBook.pm

Index: Makefile.PL
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.PL,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Makefile.PL 25 Dec 2011 12:29:33 -0000      1.10
+++ Makefile.PL 17 Feb 2012 22:53:47 -0000      1.11
@@ -24,7 +24,7 @@
                           "Clone" => 0,
                          },
     PMLIBDIRS         => [ 'Texinfo', 'LocaleData', 'DebugTexinfo' ],
-    EXE_FILES         => [ 'texi2any-perl' ],
+    EXE_FILES         => [ 'texi2any' ],
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
       (
        AUTHOR         => 'Patrice Dumas <address@hidden>') : ()),

Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- Makefile.am 11 Feb 2012 22:35:52 -0000      1.40
+++ Makefile.am 17 Feb 2012 22:53:47 -0000      1.41
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.40 2012/02/11 22:35:52 pertusus Exp $
+# $Id: Makefile.am,v 1.41 2012/02/17 22:53:47 pertusus Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011 Free Software Foundation, Inc.
@@ -190,7 +190,7 @@
 MANIFEST: maintain/MANIFEST_generated_files Makefile.am Makefile.tres
        echo "$(dist_modules_DATA) $(dist_converters_DATA) 
$(dist_debugmodules_DATA) " \
        "$(dist_init_DATA) $(test_files) $(tp_tests) 
$(test_files_generated_list) " \
-       "texi2any-perl $(maintainance_files) README TODO COPYING " \
+       "texi2any $(maintainance_files) README TODO COPYING " \
        "$(perl_specific_files)" \
         | sed 's/ \+/\n/g' | sort | cat - $< > $@
 

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- texi2any.pl 17 Feb 2012 18:52:24 -0000      1.114
+++ texi2any.pl 17 Feb 2012 22:53:47 -0000      1.115
@@ -192,10 +192,20 @@
 require DebugTexinfo::DebugCount;
 require DebugTexinfo::DebugTree;
 
+# When shipped as a perl modules, $hardcoded_version is set to undef here
+# by a sed one liner.
+# $hardcoded_version has to be manually adjusted.  I know that it is wrong, 
+# but that are the boss orders ;-)
+my $hardcoded_version = "4.13.90";
 # Version: set in configure.in
 my $configured_version = '@PACKAGE_VERSION@';
-$configured_version = $Texinfo::Parser::VERSION 
-  if ($configured_version eq '@' . 'PACKAGE_VERSION@');
+if ($configured_version eq '@' . 'PACKAGE_VERSION@') {
+  if (defined($hardcoded_version)) {
+    $configured_version = $hardcoded_version;
+  } else {
+    $configured_version = $Texinfo::Parser::VERSION;
+  }
+}
 my $configured_package = '@PACKAGE@';
 $configured_package = 'Texinfo' if ($configured_package eq '@' . 'PACKAGE@');
 my $configured_name = '@PACKAGE_NAME@';

Index: maintain/prepare_perl_module.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/prepare_perl_module.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- maintain/prepare_perl_module.sh     6 Jan 2012 00:13:13 -0000       1.3
+++ maintain/prepare_perl_module.sh     17 Feb 2012 22:53:47 -0000      1.4
@@ -4,7 +4,9 @@
 (cd ../ && ./config.status)
 ./maintain/regenerate_perl_module_files.sh
 make MANIFEST
-cp -p texi2any.pl texi2any-perl
+sed 's/\(my \$hardcoded_version = \).*/\1 undef;/' texi2any.pl > texi2any
+chmod a+x texi2any
+touch -r texi2any.pl texi2any 
 perl Makefile.PL
 VERSION=`grep '^VERSION = ' Makefile | sed 's/^VERSION = *//'`
 [ z"$VERSION" = 'z' ] && exit 1
@@ -18,3 +20,5 @@
                  ./maintain/all_tests.sh clean && make distcheck) || exit 1
 rm -rf Texinfo-$VERSION/
 (cd ../ && ./config.status)
+mv texi2any texi2any-perl
+make texi2any