recognize '%' as a shell metachar for win32
[p5sagit/p5-mst-13.2.git] / win32 / makedef.pl
index 91630d9..222ce06 100644 (file)
 # that does not present in the WIN32 port but there is no easy
 # way to find them so I just put a exception list here
 
-while (@ARGV && $ARGV[0] =~ /^-/)
+my $CCTYPE = "MSVC";   # default
+
+while (@ARGV)
  {
   my $flag = shift;
   $define{$1} = 1 if ($flag =~ /^-D(\w+)$/);
+  $CCTYPE = $1 if ($flag =~ /^CCTYPE=(\w+)$/);
  } 
 
 open(CFG,'config.h') || die "Cannot open config.h:$!";
 while (<CFG>)
  {
   $define{$1} = 1 if /^\s*#\s*define\s+(MYMALLOC)\b/;
+  $define{$1} = 1 if /^\s*#\s*define\s+(USE_THREADS)\b/;
  }
 close(CFG);
 
 warn join(' ',keys %define)."\n";
 
-my $CCTYPE = shift || "MSVC";
+if ($define{PERL_OBJECT}) {
+    print "LIBRARY PerlCore\n";
+    print "DESCRIPTION 'Perl interpreter'\n";
+    print "EXPORTS\n";
+    output_symbol("perl_alloc");
+    exit(0);
+}
 
 if ($CCTYPE ne 'GCC') 
  {
   print "LIBRARY Perl\n";
   print "DESCRIPTION 'Perl interpreter, export autogenerated'\n";
-  print "CODE LOADONCALL\n";
-  print "DATA LOADONCALL NONSHARED MULTIPLE\n";
  }
+else
+ {
+  $define{'PERL_GLOBAL_STRUCT'} = 1;
+  $define{'MULTIPLICITY'} = 1;
+ }
+
 print "EXPORTS\n";
 
-$skip_sym=<<'!END!OF!SKIP!';
+my %skip;
+my %export;
+
+sub skip_symbols
+{
+ my $list = shift;
+ foreach my $symbol (@$list)
+  {
+   $skip{$symbol} = 1;
+  }
+}
+
+sub emit_symbols
+{
+ my $list = shift;
+ foreach my $symbol (@$list)
+  {
+   emit_symbol($symbol) unless exists $skip{$symbol};
+  }
+}
+
+skip_symbols [qw(
+PL_statusvalue_vms
+PL_archpat_auto
+PL_cryptseen
+PL_DBcv
+PL_generation
+PL_lastgotoprobe
+PL_linestart
+PL_modcount
+PL_pending_ident
+PL_sortcxix
+PL_sublex_info
+PL_timesbuf
 Perl_block_type
 Perl_additem
 Perl_cast_ulong
@@ -48,14 +95,7 @@ Perl_check_uni
 Perl_checkcomma
 Perl_chsize
 Perl_ck_aelem
-Perl_cryptseen
 Perl_cx_dump
-Perl_deb
-Perl_deb_growlevel
-Perl_debop
-Perl_debprofdump
-Perl_debstack
-Perl_debstackptrs
 Perl_do_ipcctl
 Perl_do_ipcget
 Perl_do_msgrcv
@@ -103,15 +143,7 @@ Perl_pp_interp
 Perl_pp_map
 Perl_pp_nswitch
 Perl_q
-Perl_rcsid
 Perl_reall_srchlen
-Perl_regdump
-Perl_regfold
-Perl_regmyendp
-Perl_regmyp_size
-Perl_regmystartp
-Perl_regnarrate
-Perl_regprop
 Perl_same_dirent
 Perl_saw_return
 Perl_scan_const
@@ -127,15 +159,14 @@ Perl_scan_trans
 Perl_scan_word
 Perl_setenv_getix
 Perl_skipspace
+Perl_sort_mutex
 Perl_sublex_done
 Perl_sublex_start
 Perl_sv_ref
 Perl_sv_setptrobj
-Perl_timesbuf
 Perl_too_few_arguments
 Perl_too_many_arguments
 Perl_unlnk
-Perl_wait4pid
 Perl_watch
 Perl_yyname
 Perl_yyrule
@@ -147,114 +178,139 @@ mystack_mark
 perl_init_ext
 perl_requirepv
 stack
-statusvalue_vms
 Perl_safexcalloc
 Perl_safexmalloc
 Perl_safexfree
 Perl_safexrealloc
 Perl_my_memcmp
 Perl_my_memset
-Perl_cshlen
-Perl_cshname
-Perl_opsave
-!END!OF!SKIP!
+PL_cshlen
+PL_cshname
+PL_opsave
+)];
 
-if ($CCTYPE eq 'GCC')
- {
-  $skip_sym .= "Perl_na\n";
- }
 
 if ($define{'MYMALLOC'})
  {
-  $skip_sym .= <<'!END!OF!SKIP!';
-Perl_safefree
-Perl_safemalloc
-Perl_saferealloc
-Perl_safecalloc
-!END!OF!SKIP!
-  emit_symbol('Perl_malloc');
-  emit_symbol('Perl_free');
-  emit_symbol('Perl_realloc');
-  emit_symbol('Perl_calloc');
+  skip_symbols [qw(
+    Perl_safefree
+    Perl_safemalloc
+    Perl_saferealloc
+    Perl_safecalloc)];
+  emit_symbols [qw(
+    Perl_malloc
+    Perl_free
+    Perl_realloc
+    Perl_calloc)];
+ }
+else
+ {
+  skip_symbols [qw(
+    Perl_malloced_size)];
  }
 
 unless ($define{'USE_THREADS'})
  {
-  $skip_sym .= <<'!END!OF!SKIP!';
+  skip_symbols [qw(
+PL_thr_key
+PL_sv_mutex
+PL_strtab_mutex
+PL_svref_mutex
+PL_malloc_mutex
+PL_cred_mutex
+PL_eval_mutex
+PL_eval_cond
+PL_eval_owner
+PL_threads_mutex
+PL_nthreads
+PL_nthreads_cond
+PL_threadnum
+PL_threadsv_names
+PL_thrsv
+Perl_vtbl_mutex
+Perl_getTHR
+Perl_setTHR
 Perl_condpair_magic
-Perl_thr_key
-Perl_sv_mutex
-Perl_malloc_mutex
-Perl_eval_mutex
-Perl_eval_cond
-Perl_eval_owner
-Perl_threads_mutex
 Perl_new_struct_thread
-Perl_nthreads
-Perl_nthreads_cond
 Perl_per_thread_magicals
 Perl_thread_create
 Perl_find_threadsv
-Perl_threadsv_names
-Perl_thrsv
 Perl_unlock_condpair
-Perl_vtbl_mutex
 Perl_magic_mutexfree
-Perl_sv_iv
-Perl_sv_nv
-Perl_sv_true
-Perl_sv_uv
-Perl_sv_pvn
-Perl_newRV_noinc
-!END!OF!SKIP!
+)];
+ }
 
+unless ($define{'FAKE_THREADS'})
+ {
+  skip_symbols [qw(PL_curthr)];
  }
 
+sub readvar
+{
+ my $file = shift;
+ open(VARS,$file) || die "Cannot open $file:$!";
+ my @syms;
+ while (<VARS>)
+  {
+   # All symbols have a Perl_ prefix because that's what embed.h
+   # sticks in front of them.
+   push(@syms,"PL_".$1) if (/\bPERLVARI?C?\([IGT](\w+)/);
+  } 
+ close(VARS); 
+ return \@syms;
+}
+
 if ($define{'USE_THREADS'} || $define{'MULTIPLICITY'})
  {
-  open(THREAD,"<../thrdvar.h") || die "Cannot open ../thrdvar.h:$!";
-  while (<THREAD>)
-   {
-    if (/\bPERLVARI?\(T(\w+)/)
-     {
-      $skip_sym .= "Perl_".$1."\n";
-     } 
-   } 
-  close(THREAD); 
+  my $thrd = readvar("../thrdvar.h");
+  skip_symbols $thrd;
  } 
 
 if ($define{'MULTIPLICITY'})
  {
-  open(THREAD,"<../intrpvar.h") || die "Cannot open ../intrpvar.h:$!";
-  while (<THREAD>)
-   {
-    if (/\bPERLVARI?\(I(\w+)/)
-     {
-      $skip_sym .= "Perl_".$1."\n";
-     } 
-   } 
-  close(THREAD); 
+  my $interp = readvar("../intrpvar.h");
+  skip_symbols $interp;
+ } 
+
+if ($define{'PERL_GLOBAL_STRUCT'})
+ {
+  my $global = readvar("../perlvars.h");
+  skip_symbols $global;
+  emit_symbols [qw(Perl_GetVars)];
+  emit_symbols [qw(PL_Vars PL_VarsPtr)] unless $CCTYPE eq 'GCC';
  } 
 
 unless ($define{'DEBUGGING'})
  {
-  $skip_sym .= "Perl_runops_debug\n";
-  $skip_sym .= "Perl_sv_peek\n";
+  skip_symbols [qw(
+    Perl_deb
+    Perl_deb_growlevel
+    Perl_debop
+    Perl_debprofdump
+    Perl_debstack
+    Perl_debstackptrs
+    Perl_runops_debug
+    Perl_sv_peek
+    Perl_watchaddr
+    Perl_watchok)];
  }
 
-# All symbols have a Perl_ prefix because that's what embed.h
-# sticks in front of them.
-
+if ($define{'HAVE_DES_FCRYPT'})
+ {
+  emit_symbols [qw(win32_crypt)];
+ }
 
 open (GLOBAL, "<../global.sym") || die "failed to open global.sym" . $!;
-while (<GLOBAL>) {
-       my $symbol;
-       next if (!/^[A-Za-z]/);
-       next if (/_amg[ \t]*$/);
-       $symbol = "Perl_$_";
-       next if ($skip_sym =~ m/$symbol/m);
-       emit_symbol($symbol);
-}
+while (<GLOBAL>) 
+ {
+  next if (!/^[A-Za-z]/);
+  next if (/_amg[ \t]*$/);
+  # All symbols have a Perl_ prefix because that's what embed.h
+  # sticks in front of them.
+  chomp($_);
+  my $symbol = "Perl_$_";
+  emit_symbol($symbol) unless exists $skip{$symbol};
+ }
 close(GLOBAL);
 
 # also add symbols from interp.sym
@@ -262,48 +318,67 @@ close(GLOBAL);
 # doesn't hurt to include them anyway.
 # these don't have Perl prefix
 
-open (INTERP, "<../interp.sym") || die "failed to open interp.sym" . $!;
-while (<INTERP>) {
-       my $symbol;
-       next if (!/^[A-Za-z]/);
-       next if (/_amg[ \t]*$/);
-       $symbol = $_;
-       next if ($skip_sym =~ m/$symbol/m);
-       #print "\t$symbol";
-       emit_symbol("Perl_" . $symbol);
-}
+unless ($define{'PERL_GLOBAL_STRUCT'})
+ {
+  my $glob = readvar("../perlvars.h");
+  emit_symbols $glob;
+ } 
+
+unless ($define{'MULTIPLICITY'})
+ {
+  my $glob = readvar("../intrpvar.h");
+  emit_symbols $glob;
+ } 
 
-#close(INTERP);
+unless ($define{'MULTIPLICITY'} || $define{'USE_THREADS'})
+ {
+  my $glob = readvar("../thrdvar.h");
+  emit_symbols $glob;
+ } 
 
 while (<DATA>) {
        my $symbol;
        next if (!/^[A-Za-z]/);
        next if (/^#/);
         s/\r//g;
+        chomp($_);
        $symbol = $_;
-       next if ($skip_sym =~ m/^$symbol/m);
-        $symbol = "Perl_".$symbol if ($define{'USE_THISPTR'} 
-                                      && $symbol =~ /^perl/);
+       next if exists $skip{$symbol};
        emit_symbol($symbol);
 }
 
+foreach my $symbol (sort keys %export)
+ {
+   output_symbol($symbol);
+ }
+
 sub emit_symbol {
        my $symbol = shift;
-       chomp $symbol;
-       if ($CCTYPE eq "BORLAND") {
-               # workaround Borland quirk by exporting both the straight
-               # name and a name with leading underscore.  Note the
-               # alias *must* come after the symbol itself, if both
-               # are to be exported. (Linker bug?)
-               print "\t_$symbol\n";
-               print "\t$symbol = _$symbol\n";
-       }
-       else {
-               # for binary coexistence, export both the symbol and
-               # alias with leading underscore
-               print "\t$symbol\n";
-               print "\t_$symbol = $symbol\n";
-       }
+        chomp($symbol); 
+       $export{$symbol} = 1;
+}
+
+sub output_symbol {
+    my $symbol = shift;
+    if ($CCTYPE eq "BORLAND") {
+           # workaround Borland quirk by exporting both the straight
+           # name and a name with leading underscore.  Note the
+           # alias *must* come after the symbol itself, if both
+           # are to be exported. (Linker bug?)
+           print "\t_$symbol\n";
+           print "\t$symbol = _$symbol\n";
+    }
+    elsif ($CCTYPE eq 'GCC') {
+           # Symbols have leading _ whole process is $%£"% slow
+           # so skip aliases for now
+           print "\t$symbol\n";
+    }
+    else {
+           # for binary coexistence, export both the symbol and
+           # alias with leading underscore
+           print "\t$symbol\n";
+           print "\t_$symbol = $symbol\n";
+    }
 }
 
 1;
@@ -312,6 +387,7 @@ __DATA__
 perl_init_i18nl10n
 perl_init_ext
 perl_alloc
+perl_atexit
 perl_construct
 perl_destruct
 perl_free
@@ -328,6 +404,11 @@ perl_call_sv
 perl_require_pv
 perl_eval_pv
 perl_eval_sv
+perl_new_ctype
+perl_new_collate
+perl_new_numeric
+perl_set_numeric_standard
+perl_set_numeric_local
 boot_DynaLoader
 Perl_thread_create
 win32_errno
@@ -367,6 +448,7 @@ win32_stat
 win32_pipe
 win32_popen
 win32_pclose
+win32_rename
 win32_setmode
 win32_lseek
 win32_tell
@@ -382,6 +464,7 @@ win32_mkdir
 win32_rmdir
 win32_chdir
 win32_flock
+win32_execv
 win32_execvp
 win32_htons
 win32_ntohs
@@ -448,8 +531,21 @@ win32_times
 win32_alarm
 win32_open_osfhandle
 win32_get_osfhandle
+win32_ioctl
+win32_utime
+win32_wait
+win32_waitpid
+win32_kill
+win32_str_os_error
+win32_opendir
+win32_readdir
+win32_telldir
+win32_seekdir
+win32_rewinddir
+win32_closedir
 Perl_win32_init
 Perl_init_os_extras
 Perl_getTHR
 Perl_setTHR
 RunPerl
+