Reuinte File::Spec with the rest of the PathTools distribution in ext.

[p5sagit/p5-mst-13.2.git] / make_ext.pl

diff --git a/make_ext.pl b/make_ext.pl
index 8f73a42..373f739 100644 (file)
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -2,6 +2,9 @@
 use strict;
 use warnings;
 use Config;
+BEGIN {
+    unshift @INC, $^O eq 'MSWin32' ? '../ext/Cwd' : 'ext/Cwd';
+}
 use Cwd;
 
 # To clarify, this isn't the entire suite of modules considered "toolchain"
@@ -11,8 +14,10 @@ use Cwd;
 # After which, all nonxs modules are in lib, which was always sufficient to
 # allow miniperl to build everything else.
 
-my @toolchain = qw(ext/constant/lib ext/ExtUtils-Command/lib
-                  ext/Text-ParseWords/lib);
+my @toolchain = qw(ext/constant/lib ext/Cwd ext/Cwd/lib ext/ExtUtils-Command/lib
+                  ext/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib
+                  ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib
+       ext/File-Path/lib ext/AutoLoader/lib);
 
 # This script acts as a simple interface for building extensions.
 
@@ -28,6 +33,7 @@ my @toolchain = qw(ext/constant/lib ext/ExtUtils-Command/lib
 # If '--static' is specified, static extensions will be built.
 # If '--dynamic' is specified, dynamic extensions will be built.
 # If '--nonxs' is specified, nonxs extensions will be built.
+# If '--dynaloader' is specificied, DynaLoader will be built.
 # If '--all' is specified, all extensions will be built.
 #
 #    make_ext.pl "MAKE=make [-make_opts]" --dir=directory [--target=target] [--static|--dynamic|--all] +ext2 !ext1
@@ -79,6 +85,7 @@ foreach (@ARGV) {
 my $static = $opts{static} || $opts{all};
 my $dynamic = $opts{dynamic} || $opts{all};
 my $nonxs = $opts{nonxs} || $opts{all};
+my $dynaloader = $opts{dynaloader} || $opts{all};
 
 # The Perl Makefile.SH will expand all extensions to
 #      lib/auto/X/X.a  (or lib/auto/X/Y/Y.a if nested)
@@ -138,7 +145,7 @@ if ($target eq '') {
     die "$0: unknown make target '$target'\n";
 }
 
-if (!@extspec and !$static and !$dynamic and !$nonxs)  {
+if (!@extspec and !$static and !$dynamic and !$nonxs and !$dynaloader)  {
     die "$0: no extension specified\n";
 }
 
@@ -171,6 +178,7 @@ if ($is_Win32) {
     push @ext, FindExt::static_ext() if $static;
     push @ext, FindExt::dynamic_ext() if $dynamic;
     push @ext, FindExt::nonxs_ext() if $nonxs;
+    push @ext, 'DynaLoader' if $dynaloader;
 
     foreach (sort @ext) {
        if (%incl and !exists $incl{$_}) {
@@ -182,7 +190,10 @@ if ($is_Win32) {
            next;
        }
        push @extspec, $_;
-       if(FindExt::is_static($_)) {
+       if($_ eq 'DynaLoader') {
+           # No, we don't know why nmake can't work out the dependency chain
+           push @{$extra_passthrough{$_}}, 'DynaLoader.c';
+       } elsif(FindExt::is_static($_)) {
            push @{$extra_passthrough{$_}}, 'LINKTYPE=static';
        }
     }
@@ -193,6 +204,21 @@ elsif ($is_VMS) {
     push @extspec, (split ' ', $Config{static_ext}) if $static;
     push @extspec, (split ' ', $Config{dynamic_ext}) if $dynamic;
     push @extspec, (split ' ', $Config{nonxs_ext}) if $nonxs;
+    push @extspec, 'DynaLoader' if $dynaloader;
+}
+
+{
+    # Cwd needs to be built before Encode recurses into subdirectories.
+    # This seems to be the simplest way to ensure this ordering:
+    my (@first, @other);
+    foreach (@extspec) {
+       if ($_ eq 'Cwd') {
+           push @first, $_;
+       } else {
+           push @other, $_;
+       }
+    }
+    @extspec = (@first, @other);
 }
 
 foreach my $spec (@extspec)  {
@@ -229,8 +255,12 @@ sub build_extension {
     $perl ||= "$up/miniperl";
     my $return_dir = $up;
     my $lib_dir = "$up/lib";
+    # $lib_dir must be last, as we're copying files into it, and in a parallel
+    # make there's a race condition if one process tries to open a module that
+    # another process has half-written.
     $ENV{PERL5LIB}
-       = join $Config{path_sep}, $lib_dir, map {"$up/$_"} @toolchain;
+       = join $Config{path_sep}, (map {"$up/$_"} @toolchain), $lib_dir;
+    $ENV{PERL_CORE} = 1;
 
     unless (chdir "$ext_dir") {
        warn "Cannot cd to $ext_dir: $!";