summaryrefslogtreecommitdiff
path: root/cpan/Win32
diff options
context:
space:
mode:
authorJan Dubois <jand@activestate.com>2011-01-06 16:07:40 -0800
committerJan Dubois <jand@activestate.com>2011-01-06 16:08:16 -0800
commitad927ab045c6e80e8fa93fe96c869e231194ecf7 (patch)
tree4fdab760ae8e794e7a6ba05c4e4d2aacd721bd59 /cpan/Win32
parentf53cfc927e2160a1907d28f583f3a82d0296b8b9 (diff)
downloadperl-ad927ab045c6e80e8fa93fe96c869e231194ecf7.tar.gz
Update to Win32-0.42 from CPAN
Diffstat (limited to 'cpan/Win32')
-rw-r--r--cpan/Win32/Changes5
-rw-r--r--cpan/Win32/Makefile.PL2
-rw-r--r--cpan/Win32/Win32.pm4
-rw-r--r--cpan/Win32/t/GetLongPathName.t1
4 files changed, 8 insertions, 4 deletions
diff --git a/cpan/Win32/Changes b/cpan/Win32/Changes
index 24235aadbf..00c74078e1 100644
--- a/cpan/Win32/Changes
+++ b/cpan/Win32/Changes
@@ -1,5 +1,10 @@
Revision history for the Perl extension Win32.
+0.42 [2011-01-06]
+ - remove brittle test for Win32::GetLongPathName($ENV{SYSTEMROOT})
+ which will fail if the case of the environment value doesn't
+ exactly match the case of the directory name on the filesystem.
+
0.41 [2010-12-10]
- Fix Win32::GetChipName() to return the native processor type when
running 32-bit Perl on 64-bit Windows (WOW64). This will also
diff --git a/cpan/Win32/Makefile.PL b/cpan/Win32/Makefile.PL
index 913641e968..89a568a5f6 100644
--- a/cpan/Win32/Makefile.PL
+++ b/cpan/Win32/Makefile.PL
@@ -10,7 +10,7 @@ unless ($^O eq "MSWin32" || $^O eq "cygwin") {
my %param = (
NAME => 'Win32',
VERSION_FROM => 'Win32.pm',
- INSTALLDIRS => ($] >= 5.008004 ? 'perl' : 'site'),
+ INSTALLDIRS => ($] >= 5.008004 && $] < 5.012 ? 'perl' : 'site'),
);
$param{NO_META} = 1 if eval "$ExtUtils::MakeMaker::VERSION" >= 6.10_03;
$param{LIBS} = ['-L/lib/w32api -lole32 -lversion'] if $^O eq "cygwin";
diff --git a/cpan/Win32/Win32.pm b/cpan/Win32/Win32.pm
index d2eb1ad895..792ed7f161 100644
--- a/cpan/Win32/Win32.pm
+++ b/cpan/Win32/Win32.pm
@@ -8,7 +8,7 @@ package Win32;
require DynaLoader;
@ISA = qw|Exporter DynaLoader|;
- $VERSION = '0.41';
+ $VERSION = '0.42';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -475,7 +475,7 @@ sub _GetOSName {
}
elsif ($productinfo == PRODUCT_BUSINESS) {
# "Windows 7 Business" had a name change to "Windows 7 Professional"
- $desc .= $minor == 0 ? " Business" : "Professional";
+ $desc .= $minor == 0 ? " Business" : " Professional";
}
elsif ($productinfo == PRODUCT_STARTER) {
$desc .= " Starter";
diff --git a/cpan/Win32/t/GetLongPathName.t b/cpan/Win32/t/GetLongPathName.t
index 8ad51dbdfd..b7da71991c 100644
--- a/cpan/Win32/t/GetLongPathName.t
+++ b/cpan/Win32/t/GetLongPathName.t
@@ -34,7 +34,6 @@ if ($drive) {
for (@paths) {
s/^c:/$drive/;
}
- push @paths, $ENV{SYSTEMROOT} if $ENV{SYSTEMROOT};
}
my %expect;
@expect{@paths} = map { my $x = $_;