[6543] * tp/Texinfo/Convert/XSParagraph/XSParagraph.pm,

[Patrice Dumas]

Revision: 6543
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6543
Author:   pertusus
Date:     2015-08-18 06:50:34 +0000 (Tue, 18 Aug 2015)
Log Message:
-----------
        * tp/Texinfo/Convert/XSParagraph/XSParagraph.pm, 
        tp/Texinfo/Convert/XSParagraph/Makefile.PL: remove letters
        from $VERSION, as it breaks loading of module.  Fix undefined variables.
        * tp/MANIFEST, tp/Makefile.PL, tp/Makefile.am, 
        tp/maintain/clean_perl_module_files.sh, 
        tp/maintain/prepare_perl_module_files.sh: update.  Do XSParagraph
        recursively.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/MANIFEST
    trunk/tp/Makefile.PL
    trunk/tp/Makefile.am
    trunk/tp/Texinfo/Convert/XSParagraph/Makefile.PL
    trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.pm
    trunk/tp/maintain/clean_perl_module_files.sh
    trunk/tp/maintain/prepare_perl_module_files.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-17 18:52:04 UTC (rev 6542)
+++ trunk/ChangeLog     2015-08-18 06:50:34 UTC (rev 6543)
@@ -1,3 +1,13 @@
+2015-08-18  Patrice Dumas  <address@hidden>
+
+       * tp/Texinfo/Convert/XSParagraph/XSParagraph.pm, 
+       tp/Texinfo/Convert/XSParagraph/Makefile.PL: remove letters
+       from $VERSION, as it breaks loading of module.  Fix undefined variables.
+       * tp/MANIFEST, tp/Makefile.PL, tp/Makefile.am, 
+       tp/maintain/clean_perl_module_files.sh, 
+       tp/maintain/prepare_perl_module_files.sh: update.  Do XSParagraph
+       recursively.
+
 2015-08-17  Patrice Dumas  <address@hidden>
 
        * tp/Texinfo/Convert/XSParagraph/MANIFEST, 

Modified: trunk/tp/MANIFEST
===================================================================
--- trunk/tp/MANIFEST   2015-08-17 18:52:04 UTC (rev 6542)
+++ trunk/tp/MANIFEST   2015-08-18 06:50:34 UTC (rev 6543)
@@ -66,8 +66,20 @@
 Texinfo/Convert/TextContent.pm
 Texinfo/Convert/UnFilled.pm
 Texinfo/Convert/Unicode.pm
+Texinfo/Convert/XSParagraph/MANIFEST
+Texinfo/Convert/XSParagraph/Makefile.PL
+Texinfo/Convert/XSParagraph/README
+Texinfo/Convert/XSParagraph/XSParagraph.pm
+Texinfo/Convert/XSParagraph/XSParagraph.xs
+Texinfo/Convert/XSParagraph/ppport.h
+Texinfo/Convert/XSParagraph/t/XSParagraph.t
+Texinfo/Convert/XSParagraph/text.c
+Texinfo/Convert/XSParagraph/text.h
+Texinfo/Convert/XSParagraph/xspara.c
+Texinfo/Convert/XSParagraph/xspara.h
 Texinfo/Documentlanguages.pm
 Texinfo/Encoding.pm
+Texinfo/ModulePath.pm
 Texinfo/Parser.pm
 Texinfo/Report.pm
 Texinfo/Structuring.pm
@@ -896,6 +908,7 @@
 t/results/macro/implicit_quoting_recursion.pl
 t/results/macro/leading_spaces_ignore.pl
 t/results/macro/leading_spaces_no_ignore.pl
+t/results/macro/macro_expands_to_empty.pl
 t/results/macro/macro_expansion.pl
 t/results/macro/macro_for_end.pl
 t/results/macro/macro_for_ignored_line_command.pl

Modified: trunk/tp/Makefile.PL
===================================================================
--- trunk/tp/Makefile.PL        2015-08-17 18:52:04 UTC (rev 6542)
+++ trunk/tp/Makefile.PL        2015-08-18 06:50:34 UTC (rev 6543)
@@ -26,6 +26,11 @@
                          },
     PMLIBDIRS         => [ 'Texinfo', 'LocaleData', 'DebugTexinfo' ],
     EXE_FILES         => [ 'texi2any' ],
+    # FIXME MakeMaker seems to support only subdirectory with one level.
+    # The blib directory is put in ../, so in Texinfo/Convert/ which 
+    # means that XSParagraph is not used in tests.  It should be 
+    # correctly installed, though.
+    DIR                => ['Texinfo/Convert/XSParagraph/'],
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
       (
        AUTHOR         => 'Patrice Dumas <address@hidden>') : ()),

Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am        2015-08-17 18:52:04 UTC (rev 6542)
+++ trunk/tp/Makefile.am        2015-08-18 06:50:34 UTC (rev 6543)
@@ -241,10 +241,10 @@
        echo "$(dist_modules_DATA) $(dist_converters_DATA)" \
        "$(dist_debugmodules_DATA) $(dist_init_DATA)" \
        "$(test_files) $(tp_tests) $(test_files_generated_list)" \
-       "texi2any README TODO COPYING" \
+       "texi2any README TODO COPYING $(modules_DATA)" \
        "$(maintenance_files) $(perl_specific_files)" \
         | sed 's/  */\n/g' \
-        | cat - $(srcdir)/maintain/MANIFEST_generated_files \
+        | cat - $(srcdir)/maintain/MANIFEST_generated_files 
$(srcdir)/maintain/MANIFEST_XSParagraph_files \
         | sort >$@
 
 # template.pod is the basis for the .pm documentation, and the script

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.PL
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.PL    2015-08-17 18:52:04 UTC 
(rev 6542)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.PL    2015-08-18 06:50:34 UTC 
(rev 6543)
@@ -2,9 +2,18 @@
 use ExtUtils::MakeMaker;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
+
+# Non numeric characters are not accepted by XS.
+# FIXME instead pass -noversioncheck to xsubpp?
+# REMARK MM->parse_version is part of an internal API, so could change in
+# the future.
+my $version = MM->parse_version('XSParagraph.pm');
+$version =~ s/[[:alpha:]]+//i;
+
 WriteMakefile(
     NAME              => 'Texinfo::Convert::XSParagraph::XSParagraph',
-    VERSION_FROM      => 'XSParagraph.pm', # finds $VERSION
+#    VERSION_FROM      => 'XSParagraph.pm', # finds $VERSION
+    VERSION           => $version, 
     PREREQ_PM         => {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
       (AUTHOR         => 'Gavin Smith  <address@hidden>') : ()),

Modified: trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.pm
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.pm 2015-08-17 18:52:04 UTC 
(rev 6542)
+++ trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.pm 2015-08-18 06:50:34 UTC 
(rev 6543)
@@ -49,17 +49,20 @@
 BEGIN {
 
 my $module = "Texinfo::Convert::XSParagraph::XSParagraph";
-our $VERSION = '6.0';
+our $VERSION = '6.0dev';
+# match what is used as version in xsub, with non numeric characters
+# removed, as they trigger an error on module version check.
+$VERSION =~ s/[[:alpha:]]+//i;
 
 # Possible values for TEXINFO_XS environmental variable:
 #
-# TEXINFO_XS=omit          # don't try loading xs at all
-# TEXINFO_XS=default       # try xs, libtool and then perl paths, silent 
fallback
-# TEXINFO_XS=libtool       # try xs, libtool only, silent fallback
-# TEXINFO_XS=stand-alone   # try xs, perl paths only, silent fallback
-# TEXINFO_XS=warn          # try xs, libtool and then perl paths, warn on 
failure
-# TEXINFO_XS=required      # abort if not loadable, no fallback
-# TEXINFO_XS=debug         # voluminuous debugging
+# TEXINFO_XS=omit         # don't try loading xs at all
+# TEXINFO_XS=default      # try xs, libtool and then perl paths, silent 
fallback
+# TEXINFO_XS=libtool      # try xs, libtool only, silent fallback
+# TEXINFO_XS=standalone   # try xs, perl paths only, silent fallback
+# TEXINFO_XS=warn         # try xs, libtool and then perl paths, warn on 
failure
+# TEXINFO_XS=required     # abort if not loadable, no fallback
+# TEXINFO_XS=debug        # voluminuous debugging
 #
 # Other values are treated at the moment as 'default'.
 
@@ -113,7 +116,7 @@
 
 my ($libtool_dir, $libtool_archive);
 if ($TEXINFO_XS ne 'stand-alone') {
-  my ($libtool_dir, $libtool_archive) = _find_file("XSParagraph.la");
+  ($libtool_dir, $libtool_archive) = _find_file("XSParagraph.la");
   if (!$libtool_archive) {
     if ($TEXINFO_XS eq 'libtool') {
       _fatal "XSParagraph: couldn't find Libtool archive file";
@@ -129,12 +132,12 @@
 # Try perl paths
 if (!$libtool_archive) {
   my @modparts = split(/::/,$module);
-  my $modfname = $modparts[-1];
+  my $dlname = $modparts[-1];
   my $modpname = join('/',@modparts);
-  # the directories with -L prepended setup direcctory to
-  # be in the search path. Then $modfname is prepended as it is
+  # the directories with -L prepended setup directories to
+  # be in the search path. Then $dlname is prepended as it is
   # the name really searched for.
-  $dlpath = DynaLoader::dl_findfile(map("-L$_/auto/$modpname", @INC), 
$modfname);
+  $dlpath = DynaLoader::dl_findfile(map("-L$_/auto/$modpname", @INC), $dlname);
   if (!$dlpath) {
     _fatal "XSParagraph: couldn't find $module";
     goto FALLBACK;

Modified: trunk/tp/maintain/clean_perl_module_files.sh
===================================================================
--- trunk/tp/maintain/clean_perl_module_files.sh        2015-08-17 18:52:04 UTC 
(rev 6542)
+++ trunk/tp/maintain/clean_perl_module_files.sh        2015-08-18 06:50:34 UTC 
(rev 6543)
@@ -6,4 +6,5 @@
 rm -rf blib
 rm -rf po po_document
 (cd ../ && ./config.status)
+(cd Texinfo/Convert/XSParagraph && ./config.status)
 make texi2any

Modified: trunk/tp/maintain/prepare_perl_module_files.sh
===================================================================
--- trunk/tp/maintain/prepare_perl_module_files.sh      2015-08-17 18:52:04 UTC 
(rev 6542)
+++ trunk/tp/maintain/prepare_perl_module_files.sh      2015-08-18 06:50:34 UTC 
(rev 6543)
@@ -17,12 +17,18 @@
 
 set -e
 
+# to get a reproducible locales independent sort.
+LC_ALL=C; export LC_ALL
+
 # Regenerate files required for perl
 
 ./maintain/change_perl_modules_version.sh auto
 
 # This regenerate files in t/include_dir/
 make
+# regenerate the list of XSParagraph files
+sed 's;^;Texinfo/Convert/XSParagraph/;' < Texinfo/Convert/XSParagraph/MANIFEST 
> maintain/MANIFEST_XSParagraph_files
+
 PACKAGE=`grep '^PACKAGE = ' Makefile | sed 's/^PACKAGE = //'`
 if test z"$PACKAGE" = 'z' ; then 
   exit 1
@@ -56,3 +62,6 @@
 sed 's/\(my \$hardcoded_version = \).*/\1 undef;/' texi2any.pl > texi2any
 chmod a+x texi2any
 touch -r texi2any.pl texi2any
+# We could imagine using an even more stripped down version, as
+# the default paths should be ok in a standalone module.
+cp -p Texinfo/ModulePath.pm.in Texinfo/ModulePath.pm