X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=make_ext.pl;h=d0dcfbfd998932003c67af6fe0b74beccd5d2f1a;hb=76467b2a651c6c83b127a7ee5b8170cd17171b66;hp=5224f412839e61238e3db9fd1e546777da066aab;hpb=238a6851e196b122761952f8b2127d8fe9e01658;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/make_ext.pl b/make_ext.pl
index 5224f41..d0dcfbf 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -14,7 +14,7 @@ use Cwd;
 # d_dummy $(dynamic_ext): miniperl preplibrary FORCE
 # 	@$(RUN) ./miniperl make_ext.pl --target=dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
 #
-# On Windows,
+# 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.
@@ -82,6 +82,9 @@ foreach (@extspec) {
     } elsif (s{^ext/}{}) {
 	# Remove ext/ prefix and /pm_to_blib suffix
 	s{/pm_to_blib$}{};
+	# Targets are given as files on disk, but the extension spec is still
+	# written using /s for each ::
+	tr!-!/!;
     } elsif (s{::}{\/}g) {
 	# Convert :: to /
     } else {
@@ -172,6 +175,11 @@ if ($is_Win32) {
     }
     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;
@@ -180,6 +188,10 @@ 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;
@@ -197,18 +209,71 @@ foreach my $spec (@extspec)  {
     print "\tMaking $mname ($target)\n";
 
     build_extension('ext', $ext_pathname, $up, $perl || "$up/miniperl",
-		    "$up/lib",
+		    "$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
@@ -221,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
@@ -265,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;  
+}