X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fbuildext.pl;h=ea5f57f3692a4894e3881a2899db71c3b5d3e091;hb=1e89acdfb3de39e92ce0b33062221d82e21cb1e2;hp=90518d1e4fbac9fc2378c2ccf6b3405324fc5fb5;hpb=3fd041e4c6b6a291992aea064f6ddbb6882443a0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/buildext.pl b/win32/buildext.pl
index 90518d1..ea5f57f 100644
--- a/win32/buildext.pl
+++ b/win32/buildext.pl
@@ -4,7 +4,7 @@ buildext.pl - build extensions
 
 =head1 SYNOPSIS
 
-    buildext.pl make [-make_opts] dep directory [target] [--static|--dynamic] !ext1 !ext2
+    buildext.pl make [-make_opts] dep directory [target] [--static|--dynamic] +ext2 !ext1
 
 E.g.
 
@@ -19,6 +19,10 @@ E.g.
 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.
+
 If '--static' specified, only static extensions will be built.
 If '--dynamic' specified, only dynamic extensions will be built.
 
@@ -36,6 +40,9 @@ use Config;
 # @ARGV with '!' at first position are exclusions
 my %excl = map {$_=>1} map {/^!(.*)$/} @ARGV;
 @ARGV = grep {!/^!/} @ARGV;
+# @ARGV with '+' at first position are inclusions
+my %incl = map {$_=>1} map {/^\+(.*)$/} @ARGV;
+@ARGV = grep {!/^\+/} @ARGV;
 
 # --static/--dynamic
 my %opts = map {$_=>1} map {/^--([\w\-]+)$/} @ARGV;
@@ -47,37 +54,35 @@ if ("$static,$dynamic" eq "0,0") {
 if ($opts{'list-static-libs'} || $opts{'create-perllibst-h'}) {
   my @statics = split /\s+/, $Config{static_ext};
   if ($opts{'create-perllibst-h'}) {
-    open my $fh, ">perllibst.h";
+    open my $fh, ">perllibst.h"
+        or die "Failed to write to perllibst.h:$!";
     my @statics1 = map {local $_=$_;s/\//__/g;$_} @statics;
     my @statics2 = map {local $_=$_;s/\//::/g;$_} @statics;
     print $fh "/*DO NOT EDIT\n  this file is included from perllib.c to init static extensions */\n";
     print $fh "#ifdef STATIC1\n",(map {"    \"$_\",\n"} @statics),"#undef STATIC1\n#endif\n";
     print $fh "#ifdef STATIC2\n",(map {"    EXTERN_C void boot_$_ (pTHX_ CV* cv);\n"} @statics1),"#undef STATIC2\n#endif\n";
     print $fh "#ifdef STATIC3\n",(map {"    newXS(\"$statics2[$_]::bootstrap\", boot_$statics1[$_], file);\n"} 0 .. $#statics),"#undef STATIC3\n#endif\n";
-  }
-  else {
+    close $fh;
+  } else {
     my %extralibs;
     for (@statics) {
       open my $fh, "<..\\lib\\auto\\$_\\extralibs.ld" or die "can't open <..\\lib\\auto\\$_\\extralibs.ld: $!";
       $extralibs{$_}++ for grep {/\S/} split /\s+/, join '', <$fh>;
     }
-    print map {/([^\/]+)$/;"..\\lib\\auto\\$_/$1$Config{_a} "} @statics;
+    print map {s|/|\\|g;m|([^\\]+)$|;"..\\lib\\auto\\$_\\$1$Config{_a} "} @statics;
     print map {"$_ "} sort keys %extralibs;
   }
-  exit;
+  exit(0);
 }
 
-my $here = getcwd();
+(my $here = getcwd()) =~ s{/}{\\}g;
 my $perl = $^X;
-$here =~ s,/,\\,g;
-if ($perl =~ m#^\.\.#)
- {
-  $perl = "$here\\$perl";
- }
+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}";
-#print "PATH=$ENV{PATH}\n";
 my $pl2bat = "$topdir\\win32\\bin\\pl2bat";
 unless (-f "$pl2bat.bat") {
     my @args = ($perl, ("$pl2bat.pl") x 2);
@@ -91,7 +96,7 @@ my $dmod = -M $dep;
 my $dir  = shift;
 chdir($dir) || die "Cannot cd to $dir\n";
 my $targ  = shift;
-(my $ext = getcwd()) =~ s,/,\\,g;
+(my $ext = getcwd()) =~ s{/}{\\}g;
 my $code;
 FindExt::scan_ext($ext);
 FindExt::set_static_extensions(split ' ', $Config{static_ext}) if $ext ne "ext";
@@ -100,8 +105,13 @@ my @ext;
 push @ext, FindExt::static_ext() if $static;
 push @ext, FindExt::dynamic_ext(), FindExt::nonxs_ext() if $dynamic;
 
+
 foreach $dir (sort @ext)
  {
+  if (%incl and !exists $incl{$dir}) {
+    #warn "Skipping extension $ext\\$dir, not in inclusion list\n";
+    next;
+  }
   if (exists $excl{$dir}) {
     warn "Skipping extension $ext\\$dir, not ported to current platform";
     next;