X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=make_ext.pl;h=d0dcfbfd998932003c67af6fe0b74beccd5d2f1a;hb=76467b2a651c6c83b127a7ee5b8170cd17171b66;hp=422d5806c84c8efbcdfc33f0dccef811199bc928;hpb=eb1f8df73c921226b177e96f1b82371e5ad0d13d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/make_ext.pl b/make_ext.pl index 422d580..d0dcfbf 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -2,13 +2,42 @@ use strict; use warnings; use Config; +use Cwd; # This script acts as a simple interface for building extensions. -# It primarily used by the perl Makefile: + +# It's actually a cut and shut of the Unix version ext/utils/makeext and the +# Windows version win32/build_ext.pl hence the two invocation styles. + +# On Unix, it primarily used by the perl Makefile one extention at a time: # # d_dummy $(dynamic_ext): miniperl preplibrary FORCE # @$(RUN) ./miniperl make_ext.pl --target=dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) # +# 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 '--all' is specified, all extensions will be built. +# +# make_ext.pl "MAKE=make [-make_opts]" --dir=directory [--target=target] [--static|--dynamic|--all] +ext2 !ext1 +# +# E.g. +# +# make_ext.pl "MAKE=nmake -nologo" --dir=..\ext +# +# make_ext.pl "MAKE=nmake -nologo" --dir=..\ext --target=clean +# +# make_ext.pl MAKE=dmake --dir=..\ext +# +# make_ext.pl MAKE=dmake --dir=..\ext --target=clean +# +# Will skip building extensions which are marked with an '!' char. +# Mostly because they still not ported to specified platform. +# +# If any extensions are listed with a '+' char then only those +# extensions will be built, but only if they arent countermanded +# by an '!ext' and are appropriate to the type of building being done. + # It may be deleted in a later release of perl so try to # avoid using it for other purposes. @@ -16,6 +45,8 @@ 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) { @@ -34,6 +65,9 @@ foreach (@ARGV) { } } +my $static = $opts{static} || $opts{all}; +my $dynamic = $opts{dynamic} || $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) # A user wishing to run make_ext might use @@ -42,18 +76,18 @@ foreach (@ARGV) { # canonise into X/Y form (pname) foreach (@extspec) { - if (/^lib/) { + if (s{^lib/auto/}{}) { # Remove lib/auto prefix and /*.* suffix - s{^lib/auto/}{}; - s{[^/]*\.[^/]*$}{}; - } elsif (/^ext/) { + s{/[^/]+\.[^/]+$}{}; + } elsif (s{^ext/}{}) { # Remove ext/ prefix and /pm_to_blib suffix - s{^ext/}{}; s{/pm_to_blib$}{}; - } elsif (/::/) { + # Targets are given as files on disk, but the extension spec is still + # written using /s for each :: + tr!-!/!; + } elsif (s{::}{\/}g) { # Convert :: to / - s{::}{\/}g; - } elsif (/\..*o$/) { + } else { s/\..*o//; } } @@ -61,6 +95,7 @@ foreach (@extspec) { my $makecmd = shift @pass_through; # Should be something like MAKE=make unshift @pass_through, 'PERL_CORE=1'; +my $dir = $opts{dir} || 'ext'; my $target = $opts{target}; $target = 'all' unless defined $target; @@ -83,9 +118,6 @@ my @make = split ' ', $1 || $Config{make} || $ENV{MAKE}; my @run = $Config{run}; @run = () if not defined $run[0] or $run[0] eq ''; -if (!@extspec) { - die "$0: no extension specified\n"; -} if ($target eq '') { die "make_ext: no make target specified (eg all or clean)\n"; @@ -94,14 +126,80 @@ if ($target eq '') { die "$0: unknown make target '$target'\n"; } -foreach my $pname (@extspec) { - my $mname = $pname; +if (!@extspec and !$static and !$dynamic) { + die "$0: no extension specified\n"; +} + +my $perl; +my %extra_passthrough; + +if ($is_Win32) { + (my $here = getcwd()) =~ s{/}{\\}g; + $perl = $^X; + if ($perl =~ m#^\.\.#) { + $perl = "$here\\$perl"; + } + (my $topdir = $perl) =~ s/\\[^\\]+$//; + # miniperl needs to find perlglob and pl2bat + $ENV{PATH} = "$topdir;$topdir\\win32\\bin;$ENV{PATH}"; + my $pl2bat = "$topdir\\win32\\bin\\pl2bat"; + unless (-f "$pl2bat.bat") { + my @args = ($perl, ("$pl2bat.pl") x 2); + print "@args\n"; + system(@args) unless defined $::Cross::platform; + } + + print "In ", getcwd(); + chdir($dir) || die "Cannot cd to $dir\n"; + (my $ext = getcwd()) =~ s{/}{\\}g; + FindExt::scan_ext($ext); + FindExt::set_static_extensions(split ' ', $Config{static_ext}); + + my @ext; + push @ext, FindExt::static_ext() if $static; + push @ext, FindExt::dynamic_ext(), FindExt::nonxs_ext() if $dynamic; + + foreach (sort @ext) { + if (%incl and !exists $incl{$_}) { + #warn "Skipping extension $ext\\$_, not in inclusion list\n"; + next; + } + if (exists $excl{$_}) { + warn "Skipping extension $ext\\$_, not ported to current platform"; + next; + } + push @extspec, $_; + if(FindExt::is_static($_)) { + push @{$extra_passthrough{$_}}, 'LINKTYPE=static'; + } + } + chdir '..'; # now in the Perl build directory +} +elsif ($is_VMS) { + $perl = $^X; + push @extspec, (split ' ', $Config{static_ext}) if $static; + push @extspec, (split ' ', $Config{dynamic_ext}) if $dynamic; +} + +foreach my $spec (@extspec) { + my $mname = $spec; $mname =~ s!/!::!g; - my $depth = $pname; - $depth =~ s![^/]+!..!g; - # Always need one more .. for ext/ - my $up = "../$depth"; - my $perl = "$up/miniperl"; + my $ext_pathname; + 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. @@ -110,18 +208,72 @@ foreach my $pname (@extspec) { print "\tMaking $mname ($target)\n"; - build_extension('ext', "ext/$pname", $up, $perl, "$up/lib", - \@pass_through); + build_extension('ext', $ext_pathname, $up, $perl || "$up/miniperl", + "$up/lib", $mname, + [@pass_through, @{$extra_passthrough{$spec} || []}]); } sub build_extension { - my ($ext, $ext_dir, $return_dir, $perl, $lib_dir, $pass_through) = @_; + my ($ext, $ext_dir, $return_dir, $perl, $lib_dir, $mname, $pass_through) + = @_; unless (chdir "$ext_dir") { warn "Cannot cd to $ext_dir: $!"; return; } + my $makefile; + if ($is_VMS) { + $makefile = 'descrip.mms'; + if ($target =~ /clean$/ + && !-f $makefile + && -f "${makefile}_old") { + $makefile = "${makefile}_old"; + } + } else { + $makefile = 'Makefile'; + } - if (!-f 'Makefile') { + if (!-f $makefile) { + if (!-f 'Makefile.PL') { + print "\nCreating Makefile.PL in $ext_dir for $mname\n"; + # We need to cope well with various possible layouts + my @dirs = split /::/, $mname; + my $leaf = pop @dirs; + my $leafname = "$leaf.pm"; + my $pathname = join '/', @dirs, $leafname; + my @locations = ($leafname, $pathname, "lib/$pathname"); + my $fromname; + foreach (@locations) { + if (-f $_) { + $fromname = $_; + last; + } + } + + unless ($fromname) { + die "For $mname tried @locations in in $ext_dir but can't find source"; + } + open my $fh, '>', 'Makefile.PL' + or die "Can't open Makefile.PL for writing: $!"; + print $fh <<"EOM"; +#-*- buffer-read-only: t -*- + +# This Makefile.PL was written by $0. +# It will be deleted automatically by make realclean + +use strict; +use ExtUtils::MakeMaker; + +WriteMakefile( + NAME => '$mname', + VERSION_FROM => '$fromname', + ABSTRACT_FROM => '$fromname', + realclean => {FILES => 'Makefile.PL'}, +); + +# ex: set ro: +EOM + close $fh or die "Can't close Makefile.PL: $!"; + } print "\nRunning Makefile.PL in $ext_dir\n"; # Presumably this can be simplified @@ -134,11 +286,17 @@ sub build_extension { @cross = '-MCross'; } - my @perl = (@run, $perl, "-I$lib_dir", @cross, 'Makefile.PL', - 'INSTALLDIRS=perl', 'INSTALLMAN3DIR=none', - @$pass_through); - print join(' ', @perl), "\n"; - my $code = system @perl; + my @args = ("-I$lib_dir", @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, @$pass_through; + _quote_args(\@args) if $is_VMS; + print join(' ', @run, $perl, @args), "\n"; + my $code = system @run, $perl, @args; warn "$code from $ext_dir\'s Makefile.PL" if $code; # Right. The reason for this little hack is that we're sitting inside @@ -178,20 +336,47 @@ EOS } } - if (not -f 'Makefile') { + if (not -f $makefile) { print "Warning: No Makefile!\n"; } + if ($is_VMS) { + _macroify_passthrough($pass_through); + unshift @$pass_through, "/DESCRIPTION=$makefile"; + } + if (!$target or $target !~ /clean$/) { # Give makefile an opportunity to rewrite itself. # reassure users that life goes on... - my @config = (@run, @make, 'config', @$pass_through); - system @config and print "@config failed, continuing anyway...\n"; + my @args = ('config', @$pass_through); + _quote_args(\@args) if $is_VMS; + system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n"; } - my @targ = (@run, @make, $target, @$pass_through); - print "Making $target in $ext_dir\n@targ\n"; - my $code = system @targ; + my @targ = ($target, @$pass_through); + _quote_args(\@targ) if $is_VMS; + print "Making $target in $ext_dir\n@run @make @targ\n"; + my $code = system(@run, @make, @targ); die "Unsuccessful make($ext_dir): code=$code" if $code != 0; chdir $return_dir || die "Cannot cd to $return_dir: $!"; } + +sub _quote_args { + my $args = shift; # must be array reference + + # Do not quote qualifiers that begin with '/'. + map { if (!/^\//) { + $_ =~ s/\"/""/g; # escape C<"> by doubling + $_ = q(").$_.q("); + } + } @{$args} + ; +} + +sub _macroify_passthrough { + my $passthrough = shift; + _quote_args($passthrough); + my $macro = '/MACRO=(' . join(',',@$passthrough) . ')'; + @$passthrough = (); + @$passthrough[0] = $macro; +}