Some Win32 Config fixes for patchlevel and perl_patchlevel:

- Set $Config{patchlevel} to PERL_VERSION (it was previously blank
  because it was wrongly being set from PATCHLEVEL, which was blank)
- Set $Config{perl_patchlevel} and $Config{PERL_PATCHLEVEL} to the
  value in the top-level ".patch" file if it exists (the former was
  previously not set, while the latter was previously wrongly set to
  PERL_VERSION)

p4raw-id: //depot/perl@31569

6 files changed, 24 insertions, 13 deletions

diff --git a/win32/config.bc b/win32/config.bc
index d46c838729..f00136d88a 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -817,11 +817,11 @@ otherlibdirs=''
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='~PATCHLEVEL~'
+patchlevel='~PERL_VERSION~'
 path_sep=';'
 perl5=''
 perl='perl'
-perl_patchlevel=''
+perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
@@ -1043,5 +1043,5 @@ PERL_VERSION='~PERL_VERSION~'
 PERL_API_REVISION='~PERL_API_REVISION~'
 PERL_API_SUBVERSION='~PERL_API_SUBVERSION~'
 PERL_API_VERSION='~PERL_API_VERSION~'
-PERL_PATCHLEVEL='~PERL_VERSION~'
+PERL_PATCHLEVEL='~PERL_PATCHLEVEL~'
 PERL_CONFIG_SH='true'
diff --git a/win32/config.ce b/win32/config.ce
index bd6935ed10..01855fc7a7 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -790,10 +790,11 @@ otherlibdirs=''
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='~PATCHLEVEL~'
+patchlevel='~PERL_VERSION~'
 path_sep=';'
 perl5=''
 perl='perl'
+perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
 pg=''
@@ -992,4 +993,5 @@ PERL_API_REVISION='~PERL_API_REVISION~'
 PERL_API_SUBVERSION='~PERL_API_SUBVERSION~'
 PERL_API_VERSION='~PERL_API_VERSION~'
 PATCHLEVEL='~PERL_VERSION~'
+PERL_PATCHLEVEL='~PERL_PATCHLEVEL~'
 PERL_CONFIG_SH='true'
diff --git a/win32/config.gc b/win32/config.gc
index 63c22500ac..33c521361a 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -817,11 +817,11 @@ otherlibdirs=''
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='~PATCHLEVEL~'
+patchlevel='~PERL_VERSION~'
 path_sep=';'
 perl5=''
 perl='perl'
-perl_patchlevel=''
+perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
@@ -1043,5 +1043,5 @@ PERL_VERSION='~PERL_VERSION~'
 PERL_API_REVISION='~PERL_API_REVISION~'
 PERL_API_SUBVERSION='~PERL_API_SUBVERSION~'
 PERL_API_VERSION='~PERL_API_VERSION~'
-PERL_PATCHLEVEL='~PERL_VERSION~'
+PERL_PATCHLEVEL='~PERL_PATCHLEVEL~'
 PERL_CONFIG_SH='true'
diff --git a/win32/config.vc b/win32/config.vc
index 0ac9e8bf85..f89ffbfb23 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -817,11 +817,11 @@ otherlibdirs=''
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='~PATCHLEVEL~'
+patchlevel='~PERL_VERSION~'
 path_sep=';'
 perl5=''
 perl='perl'
-perl_patchlevel=''
+perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
@@ -1043,5 +1043,5 @@ PERL_VERSION='~PERL_VERSION~'
 PERL_API_REVISION='~PERL_API_REVISION~'
 PERL_API_SUBVERSION='~PERL_API_SUBVERSION~'
 PERL_API_VERSION='~PERL_API_VERSION~'
-PERL_PATCHLEVEL='~PERL_VERSION~'
+PERL_PATCHLEVEL='~PERL_PATCHLEVEL~'
 PERL_CONFIG_SH='true'
diff --git a/win32/config.vc64 b/win32/config.vc64
index a5cb3589ee..b94303c5a3 100644
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -817,11 +817,11 @@ otherlibdirs=''
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='~PATCHLEVEL~'
+patchlevel='~PERL_VERSION~'
 path_sep=';'
 perl5=''
 perl='perl'
-perl_patchlevel=''
+perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
@@ -1043,5 +1043,5 @@ PERL_VERSION='~PERL_VERSION~'
 PERL_API_REVISION='~PERL_API_REVISION~'
 PERL_API_SUBVERSION='~PERL_API_SUBVERSION~'
 PERL_API_VERSION='~PERL_API_VERSION~'
-PERL_PATCHLEVEL='~PERL_VERSION~'
+PERL_PATCHLEVEL='~PERL_PATCHLEVEL~'
 PERL_CONFIG_SH='true'
diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 21829fd2e3..67f9c20353 100644
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -66,6 +66,15 @@ if (-e $pl_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}";