Move Math-BigRat from lib/ to ext/

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

diff --git a/make_ext.pl b/make_ext.pl
index d0dcfbf..3762d0a 100644 (file)
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -4,6 +4,17 @@ use warnings;
 use Config;
 use Cwd;
 
+# To clarify, this isn't the entire suite of modules considered "toolchain"
+# It's not even all modules needed to build ext/
+# It's just the source paths of the (minimum complete set of) modules in ext/
+# needed to build the nonxs modules
+# 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/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib
+                  ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib);
+
 # This script acts as a simple interface for building extensions.
 
 # It's actually a cut and shut of the Unix version ext/utils/makeext and the
@@ -16,7 +27,8 @@ use Cwd;
 #
 # On Windows or VMS,
 # If '--static' is specified, static extensions will be built.
-# If '--dynamic' is specified, dynamic (and nonxs) extensions will be built.
+# If '--dynamic' is specified, dynamic extensions will be built.
+# If '--nonxs' is specified, nonxs extensions 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
@@ -67,6 +79,7 @@ foreach (@ARGV) {
 
 my $static = $opts{static} || $opts{all};
 my $dynamic = $opts{dynamic} || $opts{all};
+my $nonxs = $opts{nonxs} || $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)
@@ -126,7 +139,7 @@ if ($target eq '') {
     die "$0: unknown make target '$target'\n";
 }
 
-if (!@extspec and !$static and !$dynamic)  {
+if (!@extspec and !$static and !$dynamic and !$nonxs)  {
     die "$0: no extension specified\n";
 }
 
@@ -157,7 +170,8 @@ if ($is_Win32) {
 
     my @ext;
     push @ext, FindExt::static_ext() if $static;
-    push @ext, FindExt::dynamic_ext(), FindExt::nonxs_ext() if $dynamic;
+    push @ext, FindExt::dynamic_ext() if $dynamic;
+    push @ext, FindExt::nonxs_ext() if $nonxs;
 
     foreach (sort @ext) {
        if (%incl and !exists $incl{$_}) {
@@ -179,6 +193,7 @@ elsif ($is_VMS) {
     $perl = $^X;
     push @extspec, (split ' ', $Config{static_ext}) if $static;
     push @extspec, (split ' ', $Config{dynamic_ext}) if $dynamic;
+    push @extspec, (split ' ', $Config{nonxs_ext}) if $nonxs;
 }
 
 foreach my $spec (@extspec)  {
@@ -188,18 +203,12 @@ foreach my $spec (@extspec)  {
     if (-d "ext/$spec") {
        # Old style ext/Data/Dumper/
        $ext_pathname = "ext/$spec";
-    } elsif ($is_VMS and -d "vms/ext/" . substr($spec, 4)) {
-       # We could get rid of this by moving everything from
-       # [.vms.ext...] to [.ext.VMS...]
-       $ext_pathname = "vms/ext/" . substr($spec, 4);
     } else {
        # New style ext/Data-Dumper/
        my $copy = $spec;
        $copy =~ tr!/!-!;
        $ext_pathname = "ext/$copy";
     }
-    my $up = $ext_pathname;
-    $up =~ s![^/]+!..!g;
 
     if ($Config{osname} eq 'catamount') {
        # Snowball's chance of building extensions.
@@ -208,14 +217,22 @@ foreach my $spec (@extspec)  {
 
     print "\tMaking $mname ($target)\n";
 
-    build_extension('ext', $ext_pathname, $up, $perl || "$up/miniperl",
-                   "$up/lib", $mname,
+    build_extension($ext_pathname, $perl, $mname,
                    [@pass_through, @{$extra_passthrough{$spec} || []}]);
 }
 
 sub build_extension {
-    my ($ext, $ext_dir, $return_dir, $perl, $lib_dir, $mname, $pass_through)
-       = @_;
+    my ($ext_dir, $perl, $mname, $pass_through) = @_;
+
+    my $up = $ext_dir;
+    $up =~ s![^/]+!..!g;
+
+    $perl ||= "$up/miniperl";
+    my $return_dir = $up;
+    my $lib_dir = "$up/lib";
+    $ENV{PERL5LIB}
+       = join $Config{path_sep}, $lib_dir, map {"$up/$_"} @toolchain;
+
     unless (chdir "$ext_dir") {
        warn "Cannot cd to $ext_dir: $!";
        return;
@@ -286,12 +303,13 @@ EOM
            @cross = '-MCross';
        }
            
-       my @args = ("-I$lib_dir", @cross, 'Makefile.PL');
+       my @args = (@cross, 'Makefile.PL');
        if ($is_VMS) {
            my $libd = VMS::Filespec::vmspath($lib_dir);
            push @args, "INST_LIB=$libd", "INST_ARCHLIB=$libd";
        } else {
-           push @args, 'INSTALLDIRS=perl', 'INSTALLMAN3DIR=none';
+           push @args, 'INSTALLDIRS=perl', 'INSTALLMAN1DIR=none',
+               'INSTALLMAN3DIR=none';
        }
        push @args, @$pass_through;
        _quote_args(\@args) if $is_VMS;