Integrate mainline

[p5sagit/p5-mst-13.2.git] / ext / Encode / Byte / Makefile.PL

diff --git a/ext/Encode/Byte/Makefile.PL b/ext/Encode/Byte/Makefile.PL
index 4f1bd28..5f67d8b 100644 (file)
--- a/ext/Encode/Byte/Makefile.PL
+++ b/ext/Encode/Byte/Makefile.PL
@@ -4,44 +4,56 @@ use ExtUtils::MakeMaker;
 
 my $name = 'Byte';
 my %tables = (
-             misc_t => 
+             byte_t => 
              [
+              # misc. vendors
               'gsm0338.ucm',
               'nextstep.ucm',
-              'roman8.ucm',
+              'hp-roman8.ucm',
               'viscii.ucm',
-              ],
-             koi8_t => [ 'koi8-f.ucm', 'koi8-r.ucm', 'koi8-u.ucm', ],
-             mac_t => 
-             [
+              'adobeStdenc.ucm',
+              # koi8
+              'koi8-f.ucm', 'koi8-r.ucm', 'koi8-u.ucm', 
+              # Mac
               qw(
-                 macCentEuro.ucm 
-                 macSami.ucm
-                 macUkraine.ucm
+                 macArabic.ucm
+                 macCentEuro.ucm
                  macCroatian.ucm
+                 macCyrillic.ucm
+                 macFarsi.ucm
                  macGreek.ucm
+                 macHebrew.ucm
+                 macIceland.ucm
                  macRoman.ucm
+                 macROMnn.ucm
+                 macRUMnn.ucm
+                 macSami.ucm
                  macThai.ucm
-                 macCyrillic.ucm
-                 macIceland.ucm
-                 macRumanian.ucm 
                  macTurkish.ucm
+                 macUkraine.ucm
                  ),
              ],
              );
 
-opendir(ENC,'../Encode');
+my %not_here = 
+    map {$_ => 1} 
+(
+ '8859-1.ucm', # default
+ qw(cp037.ucm cp1026.ucm cp1047.ucm cp500.ucm cp875.ucm), # EBCDIC
+ qw(cp932.ucm cp936.ucm cp949.ucm cp950.ucm),  # CJK
+ );
+
+opendir(ENC,'../ucm');
 while (defined(my $file = readdir(ENC)))
 {
-    if ($file =~ /(8859|ibm).*\.ucm/io)
-    {
-       push(@{$tables{$1."_t"}},$file) unless $file eq '8859-1.ucm';
-    }
+    $file =~ /^(8859|cp).*\.ucm$/io or next;
+    $not_here{$file} and next;
+    push(@{$tables{byte_t}},$file);
 }
 closedir(ENC);
 
 WriteMakefile(
-              INC              => "-I..",
+              INC              => "-I../Encode",
              NAME              => 'Encode::'.$name,
              VERSION_FROM      => "$name.pm",
              OBJECT            => '$(O_FILES)',
@@ -71,13 +83,13 @@ sub post_initialize
     $self->{'O_FILES'} = [sort keys %o];
     my @files = ("$name.xs");
     $self->{'C'} = ["$name.c"];
-    $self->{'H'} = [$self->catfile($self->updir,'encode.h')];
+    $self->{'H'} = [$self->catfile($self->updir,'Encode', 'encode.h')];
     my %xs;
     foreach my $table (keys %tables) {
        push (@{$self->{'C'}},"$table.c");
        # Do NOT add $table.h etc. to H_FILES unless we own up as to how they
        # get built.
-       foreach my $ext (qw($(OBJ_EXT) .c .h _def.h .fnm)) {
+       foreach my $ext (qw($(OBJ_EXT) .c .h .exh .fnm)) {
            push (@files,$table.$ext);
        }
     }
@@ -89,7 +101,7 @@ sub post_initialize
 #include <perl.h>
 #include <XSUB.h>
 #define U8 U8
-#include "../encode.h"
+#include "encode.h"
 END
     foreach my $table (keys %tables) {
        print XS qq[#include "${table}.h"\n];
@@ -121,7 +133,7 @@ BOOT:
 {
 END
     foreach my $table (keys %tables) {
-       print XS qq[#include "${table}_def.h"\n];
+       print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
     close(XS);
@@ -131,8 +143,8 @@ END
 sub postamble
 {
     my $self = shift;
-    my $dir  = $self->catdir($self->updir,'Encode');
-    my $str  = "# $name\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by compile\n";
+    my $dir  = $self->catdir($self->updir,'ucm');
+    my $str  = "# $name\$(OBJ_EXT) depends on .h and .exh files not .c files - but all written by enc2xs\n";
     $str    .= "$name.c : $name.xs ";
     foreach my $table (keys %tables)
     {
@@ -141,13 +153,13 @@ sub postamble
     $str .= "\n\n";
     $str .= "$name\$(OBJ_EXT) : $name.c\n\n";
 
-    my $compile = $self->catfile($self->updir,'compile');
+    my $enc2xs = $self->catfile($self->updir,'bin', 'enc2xs');
     foreach my $table (keys %tables)
     {
        my $numlines = 1;
        my $lengthsofar = length($str);
        my $continuator = '';
-       $str .= "$table.c : $compile Makefile.PL";
+       $str .= "$table.c : $enc2xs Makefile.PL";
        foreach my $file (@{$tables{$table}})
        {
            $str .= $continuator.' '.$self->catfile($dir,$file);
@@ -159,9 +171,10 @@ sub postamble
                $continuator = '';
            }
        }
-        $str .= $^O eq 'VMS' # In VMS quote to preserve case
-            ? qq{\n\t\$(PERL) $compile -"Q" -o \$\@ -f $table.fnm\n\n}
-            : qq{\n\t\$(PERL) $compile -Q -o \$\@ -f $table.fnm\n\n};
+       my $plib   = $self->{PERL_CORE} ? '"-I$(PERL_LIB)"' : '';
+       my $ucopts = '-"Q" -"O"';
+       $str .=  
+           qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n};
        open (FILELIST, ">$table.fnm")
            || die "Could not open $table.fnm: $!";
        foreach my $file (@{$tables{$table}})