my $name = 'Byte';
my %tables = (
- byte_t =>
+ misc_t =>
[
- # 'ascii.ucm',
- 'koi8-r.ucm',
+ 'gsm0338.ucm',
+ 'nextstep.ucm',
+ 'hp-roman8.ucm',
'viscii.ucm',
],
+ koi8_t => [ 'koi8-f.ucm', 'koi8-r.ucm', 'koi8-u.ucm', ],
mac_t =>
[
- qw(macCentEuro.enc macCroatian.enc
- macCyrillic.enc macDingbats.enc
- macGreek.enc macIceland.enc
- macRoman.enc macRumanian.enc
- macSami.enc macThai.enc
- macTurkish.enc macUkraine.enc),
+ qw(
+ macCentEuro.ucm
+ macSami.ucm
+ macUkraine.ucm
+ macCroatian.ucm
+ macGreek.ucm
+ macRoman.ucm
+ macThai.ucm
+ macCyrillic.ucm
+ macIceland.ucm
+ macRumanian.ucm
+ macTurkish.ucm
+ ),
],
);
-opendir(ENC,'../Encode');
+opendir(ENC,'../ucm');
while (defined(my $file = readdir(ENC)))
{
if ($file =~ /(8859|ibm).*\.ucm/io)
closedir(ENC);
WriteMakefile(
- INC => "-I..",
+ INC => "-I../Encode",
NAME => 'Encode::'.$name,
VERSION_FROM => "$name.pm",
OBJECT => '$(O_FILES)',
$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];
{
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);
}
}
$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};
+ ? qq{\n\t\$(PERL) $enc2xs -"Q" -o \$\@ -f $table.fnm\n\n}
+ : qq{\n\t\$(PERL) $enc2xs -Q -o \$\@ -f $table.fnm\n\n};
open (FILELIST, ">$table.fnm")
|| die "Could not open $table.fnm: $!";
foreach my $file (@{$tables{$table}})