In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/91c30809fea0e290c41255ef07f74c9a8d95783f?hp=2be4b1501bbd2d5f0976d80ba74e03d991a04375>
- Log ----------------------------------------------------------------- commit 91c30809fea0e290c41255ef07f74c9a8d95783f Author: Nicholas Clark <[email protected]> Date: Wed Sep 30 11:05:33 2009 +0100 Tidy make_ext.pl, particularly the OS-specific code. M make_ext.pl commit a28b98e831aad331d9e9e472000d572ae0f10e99 Author: Nicholas Clark <[email protected]> Date: Wed Sep 30 10:46:05 2009 +0100 Refactor the code for determining where an extension is on disk. M make_ext.pl ----------------------------------------------------------------------- Summary of changes: make_ext.pl | 69 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 31 deletions(-) diff --git a/make_ext.pl b/make_ext.pl index 7734bf5..95d81f2 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -6,6 +6,7 @@ BEGIN { if ($^O eq 'MSWin32') { unshift @INC, ('../cpan/Cwd', '../cpan/Cwd/lib'); require File::Spec::Functions; + require FindExt; } else { unshift @INC, 'cpan/Cwd'; @@ -13,6 +14,10 @@ BEGIN { } use Cwd; +my $is_Win32 = $^O eq 'MSWin32'; +my $is_VMS = $^O eq 'VMS'; +my $is_Unix = !$is_Win32 && !$is_VMS; + # 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/ @@ -20,11 +25,20 @@ 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 cpan/Cwd cpan/Cwd/lib +# This list cannot get any longer without overflowing the length limit for +# environment variables on VMS +my @toolchain = qw(cpan/AutoLoader/lib + ext/constant/lib + cpan/Cwd cpan/Cwd/lib ext/ExtUtils-Command/lib - dist/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib - ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib - cpan/File-Path/lib cpan/AutoLoader/lib); + dist/ExtUtils-Install/lib + ext/ExtUtils-MakeMaker/lib + ext/ExtUtils-Manifest/lib + cpan/File-Path/lib + ); + +# Used only in ExtUtils::Liblist::Kid::_win32_ext() +push @toolchain, 'ext/Text-ParseWords/lib' if $is_Win32; my @ext_dirs = qw(cpan dist ext); my $ext_dirs_re = '(?:' . join('|', @ext_dirs) . ')'; @@ -68,12 +82,6 @@ my $ext_dirs_re = '(?:' . join('|', @ext_dirs) . ')'; # It may be deleted in a later release of perl so try to # avoid using it for other purposes. -my $is_Win32 = $^O eq 'MSWin32'; -my $is_VMS = $^O eq 'VMS'; -my $is_Unix = !$is_Win32 && !$is_VMS; - -require FindExt if $is_Win32; - my (%excl, %incl, %opts, @extspec, @pass_through); foreach (@ARGV) { @@ -238,37 +246,36 @@ elsif ($is_VMS) { @extspec = (@first, @other); } +if ($Config{osname} eq 'catamount' and @extspec) { + # Snowball's chance of building extensions. + die "This is $Config{osname}, not building $extspec[0], sorry.\n"; +} + foreach my $spec (@extspec) { my $mname = $spec; $mname =~ s!/!::!g; my $ext_pathname; - if (-d "ext/$spec" - # Temporary hack to cope with smokers that are not clearing directories: - && $spec =~ m!/! - ) { - # Old style ext/Data/Dumper/ - $ext_pathname = "ext/$spec"; - } else { - # New style ext/Data-Dumper/ - my $copy = $spec; - $copy =~ tr!/!-!; - foreach my $dir (@ext_dirs) { - if (-d "$dir/$copy") { - $ext_pathname = "$dir/$copy"; - last; - } + + # Try new style ext/Data-Dumper/ first + my $copy = $spec; + $copy =~ tr!/!-!; + foreach my $dir (@ext_dirs) { + if (-d "$dir/$copy") { + $ext_pathname = "$dir/$copy"; + last; } - if (!defined $ext_pathname) { + } + + if (!defined $ext_pathname) { + if (-d "ext/$spec") { + # Old style ext/Data/Dumper/ + $ext_pathname = "ext/$spec"; + } else { warn "Can't find extension $spec in any of @ext_dirs"; next; } } - if ($Config{osname} eq 'catamount') { - # Snowball's chance of building extensions. - die "This is $Config{osname}, not building $mname, sorry.\n"; - } - print "\tMaking $mname ($target)\n"; build_extension($ext_pathname, $perl, $mname, -- Perl5 Master Repository
