This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run/locale.t: Add explanation for when tests fail
[perl5.git]
/
win32
/
config_h.PL
diff --git
a/win32/config_h.PL
b/win32/config_h.PL
index
ad2c9a3
..
6b7fbda
100644
(file)
--- a/
win32/config_h.PL
+++ b/
win32/config_h.PL
@@
-1,14
+1,18
@@
-#
+#!perl -w
+use strict;
+
BEGIN { warn "Running ".__FILE__."\n" };
BEGIN
{
require "Config.pm";
die "Config.pm:$@" if $@;
BEGIN { warn "Running ".__FILE__."\n" };
BEGIN
{
require "Config.pm";
die "Config.pm:$@" if $@;
- Config
::
->import;
+ Config->import;
}
use File::Compare qw(compare);
use File::Copy qw(copy);
}
use File::Compare qw(compare);
use File::Copy qw(copy);
-my $name = $0;
+use File::Basename qw(fileparse);
+
+my ($name, $dir) = fileparse($0);
$name =~ s#^(.*)\.PL$#../$1.SH#;
my %opt;
while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
$name =~ s#^(.*)\.PL$#../$1.SH#;
my %opt;
while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
@@
-22,18
+26,12
@@
$opt{CORE_DIR} ||= '../lib/CORE';
warn "Writing $opt{CONFIG_H}\n";
warn "Writing $opt{CONFIG_H}\n";
-my $patchlevel = $opt{INST_VER};
-$patchlevel =~ s|^[\\/]||;
-$patchlevel =~ s|~VERSION~|$Config{version}|g;
-$patchlevel ||= $Config{version};
-$patchlevel = qq["$patchlevel"];
-
open(SH,"<$name") || die "Cannot open $name:$!";
while (<SH>)
{
open(SH,"<$name") || die "Cannot open $name:$!";
while (<SH>)
{
- last if /^sed/;
+ last if /^
\s*
sed/;
}
}
-
($term,$file,$pat) = /^
sed\s+<<(\S+)\s+>(\S+)\s+(.*)$/;
+
my($term,$file,$pat) = /^\s*
sed\s+<<(\S+)\s+>(\S+)\s+(.*)$/;
$file =~ s/^\$(\w+)$/$opt{$1}/g;
$file =~ s/^\$(\w+)$/$opt{$1}/g;
@@
-53,7
+51,7
@@
eval $str;
die "$str:$@" if $@;
open(H,">$file.new") || die "Cannot open $file.new:$!";
die "$str:$@" if $@;
open(H,">$file.new") || die "Cannot open $file.new:$!";
-#binmode H; # no CRs (which cause a spurious rebuild)
+binmode(H);
while (<SH>)
{
last if /^$term$/o;
while (<SH>)
{
last if /^$term$/o;
@@
-62,14
+60,19
@@
while (<SH>)
munge();
s/\\\$/\$/g;
s#/[ *\*]*\*/#/**/#;
munge();
s/\\\$/\$/g;
s#/[ *\*]*\*/#/**/#;
+ s#(.)/\*\*/#$1/ **/# if(/^\/\*/); #avoid "/*" inside comments
if (/^\s*#define\s+(PRIVLIB|SITELIB|VENDORLIB)_EXP/)
{
if (/^\s*#define\s+(PRIVLIB|SITELIB|VENDORLIB)_EXP/)
{
- $_ = "#define ". $1 . "_EXP (win32_get_". lc($1) . "(
$patchlevel
))\t/**/\n";
+ $_ = "#define ". $1 . "_EXP (win32_get_". lc($1) . "(
PERL_VERSION_STRING, NULL
))\t/**/\n";
}
# incpush() handles archlibs, so disable them
elsif (/^\s*#define\s+(ARCHLIB|SITEARCH|VENDORARCH)_EXP/)
{
}
# incpush() handles archlibs, so disable them
elsif (/^\s*#define\s+(ARCHLIB|SITEARCH|VENDORARCH)_EXP/)
{
- $_ = "/*#define ". $1 . "_EXP \"\"\t/**/\n";
+ $_ = "/*#define ". $1 . "_EXP \"\"\t/ **/\n";
+ }
+ elsif (/^\s*#define\s+CPP(STDIN|RUN)\s+"gcc(.*)"\s*$/)
+ {
+ $_ = "#define CPP" . $1 . " \"" . $opt{ARCHPREFIX} . "gcc" . $2 . "\"\n";
}
print H;
}
}
print H;
}
@@
-87,7
+90,6
@@
if (compare("$file.new",$file))
chmod(0666,$file);
unlink($file);
rename("$file.new",$file);
chmod(0666,$file);
unlink($file);
rename("$file.new",$file);
- #chmod(0444,$file);
exit(1);
}
else
exit(1);
}
else
@@
-110,7
+112,7
@@
sub BackTick
my $cmd = shift;
if ($cmd =~ /^echo\s+(.*?)\s*\|\s+sed\s+'(.*)'\s*$/)
{
my $cmd = shift;
if ($cmd =~ /^echo\s+(.*?)\s*\|\s+sed\s+'(.*)'\s*$/)
{
-
local
($data,$pat) = ($1,$2);
+
my
($data,$pat) = ($1,$2);
$data =~ s/\s+/ /g;
eval "\$data =~ $pat";
return $data;
$data =~ s/\s+/ /g;
eval "\$data =~ $pat";
return $data;