applied suggested patch, with win32 and PERL_OBJECT additions

	Message-ID: <609bdff748.tom@compton.compton.nu>
	Subject: ByteLoader patch

p4raw-id: //depot/perl@3356

2 files changed, 86 insertions, 4 deletions

diff --git a/utils/Makefile b/utils/Makefile
index 2df16d8060..b650bbdca1 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -5,9 +5,9 @@ REALPERL = ../perl
 # Files to be built with variable substitution after miniperl is
 # available.  Dependencies handled manually below (for now).
 
-pl = c2ph.PL h2ph.PL h2xs.PL perlbug.PL perldoc.PL pl2pm.PL splain.PL perlcc.PL
-plextract  = c2ph h2ph h2xs perlbug perldoc pl2pm splain perlcc
-plextractexe  = c2ph.exe h2ph.exe h2xs.exe perlbug.exe perldoc.exe pl2pm.exe splain.exe perlcc.exe
+pl = c2ph.PL h2ph.PL h2xs.PL perlbug.PL perldoc.PL pl2pm.PL splain.PL perlcc.PL perlbc.PL
+plextract  = c2ph h2ph h2xs perlbug perldoc pl2pm splain perlcc perlbc
+plextractexe  = c2ph.exe h2ph.exe h2xs.exe perlbug.exe perldoc.exe pl2pm.exe splain.exe perlcc.exe perlbc.exe
 
 all: $(plextract) 
 
@@ -31,7 +31,9 @@ pl2pm:		pl2pm.PL ../config.sh
 
 splain:		splain.PL ../config.sh ../lib/diagnostics.pm
 
-perlcc:     perlcc.PL ../config.sh
+perlcc:		perlcc.PL ../config.sh
+
+perlbc:		perlbc.PL ../config.sh
 
 clean:
 
diff --git a/utils/perlbc.PL b/utils/perlbc.PL
new file mode 100644
index 0000000000..51d074be66
--- /dev/null
+++ b/utils/perlbc.PL
@@ -0,0 +1,80 @@
+#!/usr/local/bin/perl
+
+use Config;
+use File::Basename qw(&basename &dirname);
+use Cwd;
+
+# List explicitly here the variables you want Configure to
+# generate.  Metaconfig only looks for shell variables, so you
+# have to mention them as if they were shell variables, not
+# %Config entries.  Thus you write
+#  $startperl
+# to ensure Configure will look for $Config{startperl}.
+# Wanted:  $archlibexp
+
+# This forces PL files to create target in same directory as PL file.
+# This is so that make depend always knows where to find PL derivatives.
+$origdir = cwd;
+chdir dirname($0);
+$file = basename($0, '.PL');
+$file .= '.com' if $^O eq 'VMS';
+
+open OUT,">$file" or die "Can't create $file: $!";
+
+print "Extracting $file (with variable substitutions)\n";
+
+# In this section, perl variables will be expanded during extraction.
+# You can use $Config{...} to use Configure variables.
+
+print OUT <<"!GROK!THIS!";
+$Config{startperl}
+    eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
+    if \$running_under_some_shell;
+!GROK!THIS!
+
+# In the following, perl variables are not expanded during extraction.
+
+print OUT <<'!NO!SUBS!';
+
+use strict;
+use warning;
+no warning qw(once);
+
+use Config;
+
+require ByteLoader;
+
+foreach my $infile (@ARGV)
+{
+    if ($infile =~ /\.p[ml]$/)
+    {
+	my $outfile = $infile . "c";
+
+	open(OUT,"> $outfile") || die "Can't open $outfile: $!";
+
+	if ($infile =~ /\.pl$/)
+	{
+	    print OUT "$Config{startperl}\n";
+	    print OUT "    eval 'exec $Config{perlpath} -S \$0 \${1+\"\$@\"}'\n";
+	    print OUT "    if \$running_under_some_shell;\n\n";
+	}
+
+	print OUT "use ByteLoader $ByteLoader::VERSION;\n";
+
+	close(OUT);
+
+	print "$^X -MO=Bytecode $infile >> $outfile\n";
+
+	system("$^X -MO=Bytecode $infile >> $outfile");
+    }
+    else
+    {
+	warn "Don't know how to byte compile $infile";
+    }
+}
+!NO!SUBS!
+
+close OUT or die "Can't close $file: $!";
+chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
+exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
+chdir $origdir;