X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fconfig_sh.PL;h=2cdd155eb4d4c4d75f4048223ee7134b5f6ba09e;hb=3e2a970dfeb55332005c7648ee670aa10bb9b414;hp=59e64f967581ece11df3da351c5381b1350b3e13;hpb=10609e9a342de3bae37d4ac9f8d8bc93c0a4e896;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 59e64f9..2cdd155 100644
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -1,15 +1,106 @@
+use FindExt;
+# take a semicolon separated path list and turn it into a quoted
+# list of paths that Text::Parsewords will grok
+sub mungepath {
+    my $p = shift;
+    # remove leading/trailing semis/spaces
+    $p =~ s/^[ ;]+//;
+    $p =~ s/[ ;]+$//;
+    $p =~ s/'/"/g;
+    my @p = map { $_ = "\"$_\"" if /\s/ and !/^".*"$/; $_ } split /;/, $p;
+    return join(' ', @p);
+}
+
+# generate an array of option strings from command-line args
+# or an option file
+#    -- added by BKS, 10-17-1999 to fix command-line overflow problems
+sub loadopts {
+    if ($ARGV[0] =~ /--cfgsh-option-file/) {
+	shift @ARGV;
+	my $optfile = shift @ARGV;
+	local (*F);
+	open OPTF, $optfile or die "Can't open $optfile: $!\n";
+	my @opts;
+	chomp(my $line = <OPTF>);
+	my @vars = split(/\t+~\t+/, $line);
+	for (@vars) {
+	    push(@opts, $_) unless (/^\s*$/);
+	}
+	close OPTF;
+	return \@opts;
+    }
+    else {
+	return \@ARGV;
+    }
+}
+
 my %opt;
-while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
- {
-  $opt{$1}=$2;
-  shift(@ARGV);
- }
 
-$opt{VERSION} = $];
-$opt{INST_VER} =~ s|~VERSION~|$]|g;
-if ($] =~ /\.(\d\d\d)?(\d\d)?$/) { # should always be true
-  $opt{PATCHLEVEL} = int($1 || 0);
-  $opt{SUBVERSION} = $2 || '00';
+my $optref = loadopts();
+while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
+    $opt{$1}=$2;
+    shift(@{$optref});
+}
+
+FindExt::scan_ext("../ext");
+FindExt::scan_ext("ext") if -d 'ext';  # also look in win32/ext/ if it exists
+FindExt::set_static_extensions(split ' ', $opt{'static_ext'});
+
+$opt{'nonxs_ext'}        = join(' ',FindExt::nonxs_ext()) || ' ';
+$opt{'static_ext'}       = join(' ',FindExt::static_ext()) || ' ';
+$opt{'dynamic_ext'}      = join(' ',FindExt::dynamic_ext()) || ' ';
+$opt{'extensions'}       = join(' ',FindExt::extensions()) || ' ';
+$opt{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' ';
+
+my $pl_h = '../patchlevel.h';
+
+if (-e $pl_h) {
+    open PL, "<$pl_h" or die "Can't open $pl_h: $!";
+    while (<PL>) {
+	if (/^#\s*define\s+(PERL_\w+)\s+([\d.]+)/) {
+	    $opt{$1} = $2;
+	}
+    }
+    close PL;
+}
+else {
+    die "Can't find $pl_h: $!";
+}
+
+my $patch_file = '../.patch';
+
+if (-e $patch_file) {
+    open my $fh, "<", $patch_file or die "Can't open $patch_file: $!";
+    chomp($opt{PERL_PATCHLEVEL} = <$fh>);
+    close $fh;
+}
+
+$opt{VERSION} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}";
+$opt{INST_VER} =~ s|~VERSION~|$opt{VERSION}|g;
+$opt{'version_patchlevel_string'} = "version $opt{PERL_VERSION} subversion $opt{PERL_SUBVERSION}";
+$opt{'version_patchlevel_string'} .= " patch $opt{PERL_PATCHLEVEL}" if exists $opt{PERL_PATCHLEVEL};
+
+my $ver = `ver 2>nul`;
+if ($ver =~ /Version (\d+\.\d+)/) {
+    $opt{'osvers'} = $1;
+}
+else {
+    $opt{'osvers'} = '4.0';
+}
+
+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'};
@@ -17,18 +108,56 @@ $opt{'cf_email'} = $opt{'cf_by'} . '@' . (gethostbyname('localhost'))[0]
 	unless $opt{'cf_email'};
 $opt{'usemymalloc'} = 'y' if $opt{'d_mymalloc'} eq 'define';
 
-while (<>)
- {
-  s/~([\w_]+)~/$opt{$1}/g;
-  if (/^([\w_]+)=(.*)$/) {
-    # this depends on cf_time being empty in the template (or we'll get a loop)
-    if ($1 eq 'cf_time') {
-      $_ = "$1='" . localtime(time) . "'\n" if $2 =~ /^\s*'\s*'/;
+$opt{libpth} = mungepath($opt{libpth}) if exists $opt{libpth};
+$opt{incpath} = mungepath($opt{incpath}) if exists $opt{incpath};
+
+# some functions are not available on Win9x
+unless (defined $ENV{SYSTEMROOT}) { # SystemRoot has been introduced by WinNT
+    $opt{d_flock} = 'undef';
+    $opt{d_link} = 'undef';
+}
+
+# change the lseeksize and lseektype from their canned default values (which
+# are set-up for a non-uselargefiles build) if we are building with
+# uselargefiles. don't do this for bcc32: the code contains special handling
+# for bcc32 and the lseeksize and lseektype should not be changed.
+if ($opt{uselargefiles} eq 'define' and $opt{cc} ne 'bcc32') {
+    $opt{lseeksize} = 8;
+    if ($opt{cc} eq 'cl') {
+	$opt{lseektype} = '__int64';
     }
-    elsif (exists $opt{$1}) {
-      $_ = "$1='$opt{$1}'\n";
+    elsif ($opt{cc} eq 'gcc') {
+	$opt{lseektype} = 'long long';
     }
-  }
-  print;
- }
+}
+
+# change the s{GM|LOCAL}TIME_{min|max} for VS2005 (aka VC 8) and
+# VS2008 (aka VC 9) or higher (presuming that later versions will have
+# at least the range of that).
+if ($opt{cc} eq 'cl' and $opt{ccversion} =~ /^(\d+)/) {
+    my $ccversion = $1;
+    if ($ccversion >= 14) {
+	$opt{sGMTIME_max} = 32535291599;
+	$opt{sLOCALTIME_max} = 32535244799;
+    }
+}
 
+if ($opt{useithreads} eq 'define' && $opt{ccflags} =~ /-DPERL_IMPLICIT_SYS\b/) {
+    $opt{d_pseudofork} = 'define';
+}
+
+while (<>) {
+    s/~([\w_]+)~/$opt{$1}/g;
+    if (/^([\w_]+)=(.*)$/) {
+	my($k,$v) = ($1,$2);
+	# this depends on cf_time being empty in the template (or we'll
+	# get a loop)
+	if ($k eq 'cf_time') {
+	    $_ = "$k='" . localtime(time) . "'\n" if $v =~ /^\s*'\s*'/;
+	}
+	elsif (exists $opt{$k}) {
+	    $_ = "$k='$opt{$k}'\n";
+	}
+    }
+    print;
+}