Change 14516: Integrate perlio;

[Jarkko Hietaniemi]

Change 14516 by jhi@alpha on 2002/02/01 16:46:16

        Integrate perlio; 
        
        Minor Encode tweaks:
         - move Encode.pm back to top of Encode like normal XS extension
         - avoid .def as a file extension (Win32 builds)

Affected files ...

.... //depot/perl/MANIFEST#724 edit
.... //depot/perl/ext/Encode/EUC_JP/Makefile.PL#3 integrate
.... //depot/perl/ext/Encode/Encode.xs#41 integrate
.... //depot/perl/ext/Encode/Makefile.PL#16 integrate
.... //depot/perl/ext/Encode/compile#20 integrate

Differences ...

==== //depot/perl/MANIFEST#724 (text) ====
==== //depot/perl/ext/Encode/EUC_JP/Makefile.PL#3 (text) ====
Index: perl/ext/Encode/EUC_JP/Makefile.PL
--- perl/ext/Encode/EUC_JP/Makefile.PL.~1~      Fri Feb  1 10:00:05 2002
+++ perl/ext/Encode/EUC_JP/Makefile.PL  Fri Feb  1 10:00:05 2002
@@ -2,10 +2,13 @@
 use strict;
 use ExtUtils::MakeMaker;
 
-my %tables = (EUC_JP  => ['euc-jp.ucm',
-              # 'euc-kr.ucm', 'euc-cn.ucm'
-              ],
-             );
+my %tables = (EUC_JP  => [
+                'euc-jp.ucm',
+#               'jis0201.enc',
+#               'jis0212.enc',
+#               'jis0208.enc',
+#               'shiftjis.enc',
+              ]);
 
 
 WriteMakefile(
@@ -39,7 +42,7 @@
     my %xs;
     foreach my $table (keys %tables) {
        $xs{"$table.xs"} = "$table.c";
-       foreach my $ext (qw($(OBJ_EXT) .xs .c .h .def .fnm)) {
+       foreach my $ext (qw($(OBJ_EXT) .xs .c .h _def.h .fnm)) {
            push (@files,$table.$ext);
        }
     }
@@ -52,7 +55,7 @@
 {
     my $self = shift;
     my $dir  = $self->catdir($self->updir,'Encode');
-    my $str  = "# Encode\$(OBJ_EXT) depends on .h and .def files not .c files - but 
all written by compile\n";
+    my $str  = "# Encode\$(OBJ_EXT) depends on .h and _def.h files not .c files - but 
+all written by compile\n";
     $str  .= 'Encode$(OBJ_EXT) :';
     foreach my $table (keys %tables)
     {

==== //depot/perl/ext/Encode/Encode.xs#41 (text) ====
Index: perl/ext/Encode/Encode.xs
--- perl/ext/Encode/Encode.xs.~1~       Fri Feb  1 10:00:05 2002
+++ perl/ext/Encode/Encode.xs   Fri Feb  1 10:00:05 2002
@@ -662,7 +662,7 @@
 #if defined(USE_PERLIO) && !defined(USE_SFIO)
  PerlIO_define_layer(aTHX_ &PerlIO_encode);
 #endif
-#include "8859.def"
-#include "EBCDIC.def"
-#include "Symbols.def"
+#include "8859_def.h"
+#include "EBCDIC_def.h"
+#include "Symbols_def.h"
 }

==== //depot/perl/ext/Encode/Makefile.PL#16 (text) ====
Index: perl/ext/Encode/Makefile.PL
--- perl/ext/Encode/Makefile.PL.~1~     Fri Feb  1 10:00:05 2002
+++ perl/ext/Encode/Makefile.PL Fri Feb  1 10:00:05 2002
@@ -56,7 +56,7 @@
     my @files;
     foreach my $table (keys %tables)
     {
-       foreach my $ext (qw($(OBJ_EXT) .c .h .def .fnm))
+       foreach my $ext (qw($(OBJ_EXT) .c .h _def.h .fnm))
     {
        push (@files,$table.$ext);
     }
@@ -69,7 +69,7 @@
 {
     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";
+    my $str  = "# Encode\$(OBJ_EXT) depends on .h and _def.h files not .c files - but 
+all written by compile\n";
     $str  .= 'Encode$(OBJ_EXT) :';
     foreach my $table (keys %tables)
     {

==== //depot/perl/ext/Encode/compile#20 (xtext) ====
Index: perl/ext/Encode/compile
--- perl/ext/Encode/compile.~1~ Fri Feb  1 10:00:05 2002
+++ perl/ext/Encode/compile     Fri Feb  1 10:00:05 2002
@@ -52,7 +52,7 @@
 
 
 my $dname = $cname;
-$dname =~ s/(\.[^\.]*)?$/.def/;
+$dname =~ s/(\.[^\.]*)?$/_def.h/;
 
 my ($doC,$doEnc,$doUcm,$doPet);
 
@@ -72,7 +72,7 @@
 /*
  !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
  This file was autogenerated by:
- $^X $0 $cname @orig_ARGV
+ $^X $0 @orig_ARGV
 */
 END
   }
@@ -189,7 +189,7 @@
     my $mod = $1;
     print C <<'END';
 
-void
+static void
 Encode_XSEncoding(pTHX_ encode_t *enc)
 {
  dSP;
End of Patch.