}
}
-FindExt::scan_ext("../ext");
-
my %opt;
my $optref = loadopts();
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::scan_ext("ext") if -d 'ext'; # also look in win32/ext/ if it exists
+FindExt::set_static_extensions(split ' ', $opt{'static_ext'});
-$opt{'extensions'} = join(' ',@known);
+$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';
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'} .= " patchlevel $opt{PERL_PATCHLEVEL}" if exists $opt{PERL_PATCHLEVEL};
+$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'};
$opt{'cf_email'} = $opt{'cf_by'} . '@' . (gethostbyname('localhost'))[0]
$opt{incpath} = mungepath($opt{incpath}) if exists $opt{incpath};
# some functions are not available on Win9x
-if (defined(&Win32::IsWin95) && Win32::IsWin95()) {
+unless (defined $ENV{SYSTEMROOT}) { # SystemRoot has been introduced by WinNT
$opt{d_flock} = 'undef';
$opt{d_link} = 'undef';
}
-if ($opt{uselargefiles} ne 'define') {
- $opt{lseeksize} = 4;
- $opt{lseektype} = 'off_t';
+# 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 ($opt{cc} eq 'gcc') {
+ $opt{lseektype} = 'long long';
+ }
+}
+
+# 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} = 32535244799;
+ $opt{sLOCALTIME_max} = 32535244799;
+ }
+ elsif ($ccversion >= 15) {
+ $opt{sGMTIME_min} = -43200;
+ $opt{sGMTIME_max} = 32535291599;
+ $opt{sLOCALTIME_max} = 32535244799;
+ }
+}
+
+if ($opt{useithreads} eq 'define' && $opt{ccflags} =~ /-DPERL_IMPLICIT_SYS\b/) {
+ $opt{d_pseudofork} = 'define';
}
while (<>) {