X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fconfig_sh.PL;h=db4eb56a687441e1918c5233102a30a1881d8bbb;hb=16816334e212c70aca1836b4031924af481891ad;hp=3b76cd04ea216b08037d552f3d55761c0f4aeb01;hpb=4a9d61009ab1e3df94ef4ecfcc453c9ce73010a4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 3b76cd0..db4eb56 100644
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -34,8 +34,6 @@ sub loadopts {
     }
 }
 
-FindExt::scan_ext("../ext");
-
 my %opt;
 
 my $optref = loadopts();
@@ -44,18 +42,16 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
     shift(@{$optref});
 }
 
-my @dynamic = FindExt::dynamic_extensions();
-my @noxs    = FindExt::noxs_extensions();
-my @known   = sort(@dynamic,split(/\s+/,$opt{'staticext'}),@noxs);
-$opt{'known_extensions'} = join(' ',@known);
-
-@dynamic = grep(!/Thread/,@dynamic);
-@known   = grep(!/Thread/,@dynamic);
-
-$opt{'dynamic_ext'} = join(' ',@dynamic);
-$opt{'nonxs_ext'}   = join(' ',@noxs);
+FindExt::scan_ext("../ext");
+FindExt::set_static_extensions(split ' ', $opt{'static_ext'});
 
-$opt{'extensions'} = join(' ',@known);
+my @dynamic_ext = grep(!/Thread/,FindExt::dynamic_ext());
+my @extensions  = grep(!/Thread/,FindExt::extensions());
+$opt{'nonxs_ext'}        = join(' ',FindExt::nonxs_ext()) || ' ';
+$opt{'static_ext'}       = join(' ',FindExt::static_ext()) || ' ';
+$opt{'dynamic_ext'}      = join(' ',@dynamic_ext) || ' ';
+$opt{'extensions'}       = join(' ',@extensions) || ' ';
+$opt{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' ';
 
 my $pl_h = '../patchlevel.h';
 
@@ -76,6 +72,23 @@ $opt{INST_VER} =~ s|~VERSION~|$opt{VERSION}|g;
 $opt{'version_patchlevel_string'} = "version $opt{PERL_VERSION} subversion $opt{PERL_SUBVERSION}";
 $opt{'version_patchlevel_string'} .= " patchlevel $opt{PERL_PATCHLEVEL}" if exists $opt{PERL_PATCHLEVEL};
 
+$opt{'osvers'} = join '.', (Win32::GetOSVersion())[1,2];
+
+if (exists $opt{cc}) {
+    # cl and bcc32 version detection borrowed from Test::Smoke's configsmoke.pl
+    if ($opt{cc} eq 'cl') {
+        my $output = `cl --version 2>&1`;
+        $opt{ccversion} = $output =~ /^.*Version\s+([\d.]+)/ ? $1 : '?';
+    }
+    elsif ($opt{cc} eq 'bcc32') {
+        my $output = `bcc32 --version 2>&1`;
+        $opt{ccversion} = $output =~ /([\d.]+)/ ? $1 : '?';
+    }
+    elsif ($opt{cc} eq 'gcc') {
+        chomp($opt{gccversion} = `gcc -dumpversion`);
+    }
+}
+
 $opt{'cf_by'} = $ENV{USERNAME} unless $opt{'cf_by'};
 $opt{'cf_email'} = $opt{'cf_by'} . '@' . (gethostbyname('localhost'))[0]
 	unless $opt{'cf_email'};