Integrate mainline

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

diff --git a/ext/Encode/Makefile.PL b/ext/Encode/Makefile.PL
index 4b1ec95..a01ff71 100644 (file)
--- a/ext/Encode/Makefile.PL
+++ b/ext/Encode/Makefile.PL
@@ -1,110 +1,111 @@
+use 5.7.2;
+use strict;
 use ExtUtils::MakeMaker;
 
-my %tables = (iso8859 => ['ascii.enc', 'cp1250.enc'],
-              EBCDIC  => ['cp1047.enc','cp37.enc','posix-bc.enc'],
-              Symbols => ['symbol.enc','dingbats.enc'],
-             );
+my %tables = 
+    (
+     def_t => ['ascii.ucm',
+              '8859-1.ucm',
+              ]
+     );
 
-opendir(ENC,'Encode');
-while (defined(my $file = readdir(ENC)))
- {
-  if ($file =~ /iso8859.*\.enc/)
-   {
-    push(@{$tables{iso8859}},$file);
-   }
- }
-closedir(ENC);
+my @exe_files = ();
+my @more_exe_files = qw(bin/enc2xs bin/piconv);
 
+for my $arg (@ARGV){
+    if ($arg eq "USE_SCRIPTS"){
+       push @exe_files, @more_exe_files;
+    }
+}
 
 WriteMakefile(
-       NAME            => "Encode",
-       VERSION_FROM    => 'Encode.pm',
-       OBJECT          => '$(O_FILES)',
-       'dist'          => {
-                            COMPRESS   => 'gzip -9f',
-                            SUFFIX     => 'gz',
-                            DIST_DEFAULT => 'all tardist',
-                          },
-       MAN3PODS        => {},
-);
+             NAME              => "Encode",
+             EXE_FILES         => \@exe_files,
+             VERSION_FROM      => 'Encode.pm',
+             OBJECT            => '$(O_FILES)',
+             'dist'            => {
+                 COMPRESS      => 'gzip -9f',
+                 SUFFIX        => 'gz',
+                 DIST_DEFAULT => 'all tardist',
+             },
+             MAN3PODS  => {},
+             INC       => "-I./Encode"
+             );
 
 package MY;
 
 
 sub post_initialize
 {
- my ($self) = @_;
- my %o;
- # Find existing O_FILES
- foreach my $f (@{$self->{'O_FILES'}})
-  {
-   $o{$f} = 1;
-  } 
- my $x = $self->{'OBJ_EXT'};
- # Add the table O_FILES
- foreach my $e (keys %tables)
-  {
-   $o{$e.$x} = 1;
-  }  
- # Reset the variable 
- $self->{'O_FILES'} = [sort keys %o];
- my @files;
- foreach my $table (keys %tables)
-  {
-   foreach my $ext (qw($(OBJ_EXT) .c .h .def))
+    my ($self) = @_;
+    my %o;
+    # Find existing O_FILES
+    foreach my $f (@{$self->{'O_FILES'}})
+    {
+       $o{$f} = 1;
+    }
+    my $x = $self->{'OBJ_EXT'};
+    # Add the table O_FILES
+    foreach my $e (keys %tables)
     {
-     push (@files,$table.$ext);
+       $o{$e.$x} = 1;
     }
-  }
- $self->{'clean'}{'FILES'} .= join(' ',@files);
- return '';
+    # Trick case-blind filesystems.
+    delete $o{'encode'.$x};
+    $o{'Encode'.$x} = 1;
+    # Reset the variable
+    $self->{'O_FILES'} = [sort keys %o];
+    my @files;
+    foreach my $table (keys %tables)
+    {
+       foreach my $ext (qw($(OBJ_EXT) .c .h _def.h .fnm))
+    {
+       push (@files,$table.$ext);
+    }
+}
+$self->{'clean'}{'FILES'} .= join(' ',@files);
+return '';
 }
 
 sub postamble
 {
- my $self = shift;
- my $dir  = $self->catdir($self->curdir,'Encode');
- my $str  = "# Encode$(OBJ_EXT) depends on .h and .def files not .c files - but all written by compile\n";
- $str  .= 'Encode$(OBJ_EXT) :';
- my @rules;
- foreach my $table (keys %tables)
-  {
-   $str .= " $table.c";
-  }
- $str .= "\n\n";
- foreach my $table (keys %tables)
-  {
-   my $numlines = 1;
-   my $lengthsofar = length($str);
-   my $continuator = '';
-   $str .= "$table.c : compile Makefile.PL";
-   foreach my $file (@{$tables{$table}})
+    my $self = shift;
+    my $dir  = $self->catdir($self->curdir,'Encode');
+    my $str  = "# Encode\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by enc2xs\n";
+    $str  .= 'Encode$(OBJ_EXT) :';
+    foreach my $table (keys %tables)
     {
-     $str .= $continuator.' '.$self->catfile($dir,$file);
-     if ( length($str)-$lengthsofar > 128*$numlines )
-      {
-       $continuator .= " \\\n\t";
-       $numlines++;
-      } else {
-       $continuator = '';
-      }
+       $str .= " $table.c";
     }
-   $numlines = 1;
-   $lengthsofar = length($str);
-   $continuator = '';
-   $str .= "\n\t\$(PERL) compile \$\@";
-   foreach my $file (@{$tables{$table}})
+    $str .= "\n\n";
+    foreach my $table (keys %tables)
     {
-     $str .= $continuator.' '.$self->catfile($dir,$file);
-     if ( length($str)-$lengthsofar > 128*$numlines )
-      {
-       $continuator .= "\n\t\$(PERL) compile \$\@";
-       $numlines++;
-      } else {
-       $continuator = '';
-      }
+       my $numlines = 1;
+       my $lengthsofar = length($str);
+       my $continuator = '';
+       my $enc2xs = $self->catfile('bin', 'enc2xs');
+       $str .= "$table.c : $enc2xs Makefile.PL";
+       foreach my $file (@{$tables{$table}})
+       {
+           $str .= $continuator.' '.$self->catfile($dir,$file);
+           if ( length($str)-$lengthsofar > 128*$numlines )
+           {
+               $continuator .= " \\\n\t";
+               $numlines++;
+           } else {
+               $continuator = '';
+           }
+       }
+        $str .= $^O eq 'VMS' # In VMS quote to preserve case
+            ? qq{\n\t\$(PERL) $enc2xs -"Q" -"O" -o \$\@ -f $table.fnm\n\n}
+            : qq{\n\t\$(PERL) $enc2xs -Q -O -o \$\@ -f $table.fnm\n\n};
+       open (FILELIST, ">$table.fnm")
+           || die "Could not open $table.fnm: $!";
+       foreach my $file (@{$tables{$table}})
+       {
+           print FILELIST $self->catfile($dir,$file) . "\n";
+       }
+       close(FILELIST);
     }
-   $str .= "\n\n";
-  }
- return $str;
+    return $str;
 }