Integrate Jarkko's Encode.pm tweak.
[p5sagit/p5-mst-13.2.git] / makedef.pl
index 4385f1a..da0b36c 100644 (file)
@@ -1,8 +1,9 @@
 #
 # Create the export list for perl.
 #
-# Needed by WIN32 and OS/2 for creating perl.dll
-# and by AIX for creating libperl.a when -Dusershrplib is in effect.
+# Needed by WIN32 and OS/2 for creating perl.dll,
+# and by AIX for creating libperl.a when -Dusershrplib is in effect,
+# and by MacOS Classic.
 #
 # reads global.sym, pp.sym, perlvars.h, intrpvar.h, thrdvar.h, config.h
 # On OS/2 reads miniperl.map as well
@@ -51,7 +52,7 @@ while (@ARGV) {
     $PLATFORM = $1 if ($flag =~ /^PLATFORM=(\w+)$/);
 }
 
-my @PLATFORM = qw(aix win32 os2);
+my @PLATFORM = qw(aix win32 os2 MacOS);
 my %PLATFORM;
 @PLATFORM{@PLATFORM} = ();
 
@@ -78,8 +79,14 @@ elsif ($PLATFORM eq 'win32') {
        s!^!..\\!;
     }
 }
+elsif ($PLATFORM eq 'MacOS') {
+    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
+               $pp_sym, $globvar_sym, $perlio_sym) {
+       s!^!::!;
+    }
+}
 
-unless ($PLATFORM eq 'win32') {
+unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS') {
     open(CFG,$config_sh) || die "Cannot open $config_sh: $!\n";
     while (<CFG>) {
        if (/^(?:ccflags|optimize)='(.+)'$/) {
@@ -143,16 +150,7 @@ if ($PLATFORM eq 'win32') {
 elsif ($PLATFORM eq 'os2') {
     ($v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
     $v .= '-thread' if $ARCHNAME =~ /-thread/;
-    #$sum = 0;
-    #for (split //, $v) {
-    #  $sum = ($sum * 33) + ord;
-    #  $sum &= 0xffffff;
-    #}
-    #$sum += $sum >> 5;
-    #$sum &= 0xffff;
-    #$sum = printf '%X', $sum;
     ($dll = $define{PERL_DLL}) =~ s/\.dll$//i;
-    # print STDERR "'$dll' <= '$define{PERL_DLL}'\n";
     print <<"---EOP---";
 LIBRARY '$dll' INITINSTANCE TERMINSTANCE
 DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter'
@@ -279,6 +277,8 @@ elsif ($PLATFORM eq 'os2') {
                    my_tmpfile
                    my_tmpnam
                    my_flock
+                   my_rmdir
+                   my_mkdir
                    malloc_mutex
                    threads_mutex
                    nthreads
@@ -309,6 +309,35 @@ elsif ($PLATFORM eq 'os2') {
                    Perl_hab_GET
                    )]);
 }
+elsif ($PLATFORM eq 'MacOS') {
+    skip_symbols [qw(
+                   Perl_GetVars
+                   PL_cryptseen
+                   PL_cshlen
+                   PL_cshname
+                   PL_statusvalue_vms
+                   PL_sys_intern
+                   PL_opsave
+                   PL_timesbuf
+                   Perl_dump_fds
+                   Perl_my_bcopy
+                   Perl_my_bzero
+                   Perl_my_chsize
+                   Perl_my_htonl
+                   Perl_my_memcmp
+                   Perl_my_memset
+                   Perl_my_ntohl
+                   Perl_my_swap
+                   Perl_safexcalloc
+                   Perl_safexfree
+                   Perl_safexmalloc
+                   Perl_safexrealloc
+                   Perl_unlnk
+                   Perl_sys_intern_clear
+                   Perl_sys_intern_init
+                   )];
+}
+
 
 unless ($define{'DEBUGGING'}) {
     skip_symbols [qw(
@@ -362,6 +391,8 @@ if ($define{'MYMALLOC'}) {
                    Perl_mfree
                    Perl_realloc
                    Perl_calloc
+                   Perl_strdup
+                   Perl_putenv
                    )];
     if ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
        emit_symbols [qw(
@@ -438,8 +469,12 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_re_dup
                    Perl_sv_dup
                    Perl_sys_intern_dup
+                   Perl_ptr_table_clear
                    Perl_ptr_table_fetch
+                   Perl_ptr_table_free
                    Perl_ptr_table_new
+                   Perl_ptr_table_clear
+                   Perl_ptr_table_free
                    Perl_ptr_table_split
                    Perl_ptr_table_store
                    perl_clone
@@ -507,7 +542,83 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
 my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API
 
 if ($define{'USE_PERLIO'}) {
-     push @syms, $perlio_sym;
+    push @syms, $perlio_sym;
+    if ($define{'USE_SFIO'}) {
+       # SFIO defines most of the PerlIO routines as macros
+       skip_symbols [qw(
+                        PerlIO_canset_cnt
+                        PerlIO_clearerr
+                        PerlIO_close
+                        PerlIO_eof
+                        PerlIO_error
+                        PerlIO_exportFILE
+                        PerlIO_fast_gets
+                        PerlIO_fdopen
+                        PerlIO_fileno
+                        PerlIO_findFILE
+                        PerlIO_flush
+                        PerlIO_get_base
+                        PerlIO_get_bufsiz
+                        PerlIO_get_cnt
+                        PerlIO_get_ptr
+                        PerlIO_getc
+                        PerlIO_getname
+                        PerlIO_has_base
+                        PerlIO_has_cntptr
+                        PerlIO_importFILE
+                        PerlIO_open
+                        PerlIO_printf
+                        PerlIO_putc
+                        PerlIO_puts
+                        PerlIO_read
+                        PerlIO_releaseFILE
+                        PerlIO_reopen
+                        PerlIO_rewind
+                        PerlIO_seek
+                        PerlIO_set_cnt
+                        PerlIO_set_ptrcnt
+                        PerlIO_setlinebuf
+                        PerlIO_sprintf
+                        PerlIO_stderr
+                        PerlIO_stdin
+                        PerlIO_stdout
+                        PerlIO_stdoutf
+                        PerlIO_tell
+                        PerlIO_ungetc
+                        PerlIO_vprintf
+                        PerlIO_write
+                        )];
+    }
+    else {
+       # Skip the PerlIO New Generation symbols.
+       skip_symbols [qw(
+                        PerlIOBase_clearerr
+                        PerlIOBase_close
+                        PerlIOBase_eof
+                        PerlIOBase_error
+                        PerlIOBase_fileno
+                        PerlIOBuf_bufsiz
+                        PerlIOBuf_fdopen
+                        PerlIOBuf_fill
+                        PerlIOBuf_flush
+                        PerlIOBuf_get_cnt
+                        PerlIOBuf_get_ptr
+                        PerlIOBuf_open
+                        PerlIOBuf_pushed
+                        PerlIOBuf_read
+                        PerlIOBuf_reopen
+                        PerlIOBuf_seek
+                        PerlIOBuf_set_ptrcnt
+                        PerlIOBuf_setlinebuf
+                        PerlIOBuf_tell
+                        PerlIOBuf_unread
+                        PerlIOBuf_write
+                        PerlIO_define_layer
+                        PerlIO_pending
+                        PerlIO_push
+                        PerlIO_unread
+                       )];
+    }
 }
 
 for my $syms (@syms) {
@@ -734,6 +845,15 @@ elsif ($PLATFORM eq 'os2') {
                    keys %export;
     delete $export{$_} foreach @missing;
 }
+elsif ($PLATFORM eq 'MacOS') {
+    open MACSYMS, 'macperl.sym' or die 'Cannot read macperl.sym';
+
+    while (<MACSYMS>) {
+       try_symbol($_);
+    }
+
+    close MACSYMS;
+}
 
 # Now all symbols should be defined because
 # next we are going to output them.
@@ -780,7 +900,7 @@ sub output_symbol {
     elsif ($PLATFORM eq 'os2') {
        print qq(    "$symbol"\n);
     }
-    elsif ($PLATFORM eq 'aix') {
+    elsif ($PLATFORM eq 'aix' || $PLATFORM eq 'MacOS') {
        print "$symbol\n";
     }
 }
@@ -822,4 +942,13 @@ PerlIOBase_close
 PerlIO_define_layer
 PerlIO_pending
 PerlIO_unread
-PerlIO_push
\ No newline at end of file
+PerlIO_push
+PerlIO_apply_layers
+perlsio_binmode
+PerlIO_binmode
+PerlIO_init
+PerlIO_tmpfile
+PerlIO_setpos
+PerlIO_getpos
+PerlIO_vsprintf
+PerlIO_sprintf