use strict;
use ExtUtils::MakeMaker;
-my %tables = (EUC_CN => ['euc-cn.enc'],
- GBK => ['gbk.enc'],
- GB2312 => ['gb2312.enc'],
- GB12345 => ['gb12345.enc'],
- CP936 => ['cp936.enc'],
- 'ISO_IR_165' => ['iso-ir-165.enc'],
+my %tables = (euc_cn_t => ['euc-cn.ucm',
+ 'cp936.ucm',
+ 'macChinsimp.ucm',
+ ],
+ '2312_t' => ['gb2312.ucm'],
+ '12345_t' => ['gb12345.ucm'],
+ ir_165_t => ['ir-165.ucm'],
);
my $name = 'CN';
WriteMakefile(
- INC => "-I..",
+ INC => "-I../Encode",
NAME => 'Encode::'.$name,
VERSION_FROM => "$name.pm",
OBJECT => '$(O_FILES)',
MAN3PODS => {},
# OS 390 winges about line numbers > 64K ???
XSOPT => '-nolinenumbers',
+ XSPROTOARG => '-noprototypes',
);
package MY;
$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);
}
}
#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];
}
MODULE = Encode::$name PACKAGE = Encode::$name
+PROTOTYPES: DISABLE
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);
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)
{
$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);
$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"';
+ $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}})