In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/8b02cf248f2584ba87dda62d49ce9d0db9877b8d?hp=662a27517b774fb0b240784bd97ebc123dcfed02>
- Log ----------------------------------------------------------------- commit 8b02cf248f2584ba87dda62d49ce9d0db9877b8d Author: Steve Hay <[email protected]> Date: Thu Jun 7 08:58:13 2012 +0100 Remove $patchlevel from win32/config_h.PL since it is never used M win32/config_h.PL commit 1bdff581bdb14e65e5ea2bc4aad23cd79d67cf09 Author: Steve Hay <[email protected]> Date: Thu Jun 7 08:48:09 2012 +0100 Set version directly in Windows config.xxx files There is no need for doing it via a ~VERSION~ substitution string since that is not used anywhere else. M win32/config.ce M win32/config.gc M win32/config.gc64 M win32/config.gc64nox M win32/config.vc M win32/config.vc64 M win32/config_sh.PL commit 9b35202992f9b05c38f2a5847f86b51e8f1e7efb Author: Steve Hay <[email protected]> Date: Thu Jun 7 08:35:23 2012 +0100 Update how subversion is set in win32 config.xxx files SUBVERSION was the old name from patchlevel.h but we should prefer to use PERL_SUBVERSION now, just like patchlevel is already set from PERL_VERSION rather than the old PATCHLEVEL. M win32/config.ce M win32/config.gc M win32/config.gc64 M win32/config.gc64nox M win32/config.vc M win32/config.vc64 commit 84ee0a66f289b99c3c892aea8a9748ba7a3b2513 Author: Steve Hay <[email protected]> Date: Thu Jun 7 08:20:09 2012 +0100 Remove INST_DRV from Windows makefiles' CFG_VARS It isn't directly used by config_sh.PL, and the only appearance of it in a config.xxx file was config.ce, where it was surely wrong: prefixexp should be a ~name expanded version of prefix, so just set it to ~INST_TOP~ like the other config.xxx files all do. M win32/Makefile M win32/Makefile.ce M win32/config.ce M win32/makefile.mk ----------------------------------------------------------------------- Summary of changes: win32/Makefile | 1 - win32/Makefile.ce | 1 - win32/config.ce | 6 +++--- win32/config.gc | 4 ++-- win32/config.gc64 | 4 ++-- win32/config.gc64nox | 4 ++-- win32/config.vc | 4 ++-- win32/config.vc64 | 4 ++-- win32/config_h.PL | 6 ------ win32/config_sh.PL | 2 +- win32/makefile.mk | 1 - 11 files changed, 14 insertions(+), 23 deletions(-) diff --git a/win32/Makefile b/win32/Makefile index 8025ec7..afc4dce 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -768,7 +768,6 @@ STATIC_EXT = Win32CORE DYNALOADER = ..\DynaLoader$(o) CFG_VARS = \ - "INST_DRV=$(INST_DRV)" \ "INST_TOP=$(INST_TOP)" \ "INST_VER=$(INST_VER)" \ "INST_ARCH=$(INST_ARCH)" \ diff --git a/win32/Makefile.ce b/win32/Makefile.ce index 2f150d5..3ae055c 100644 --- a/win32/Makefile.ce +++ b/win32/Makefile.ce @@ -670,7 +670,6 @@ EXTENSION_PM = \ $(ERRNO_PM) CFG_VARS = \ - "INST_DRV=$(INST_DRV)" \ "INST_TOP=$(INST_TOP)" \ "INST_VER=$(INST_VER)" \ "INST_ARCH=$(INST_ARCH)" \ diff --git a/win32/config.ce b/win32/config.ce index c963e82..6ba1650 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -833,7 +833,7 @@ plibpth='' pmake='' pr='' prefix='~INST_TOP~' -prefixexp='~INST_DRV~' +prefixexp='~INST_TOP~' privlib='~INST_TOP~~INST_VER~\lib' privlibexp='~INST_TOP~~INST_VER~\lib' procselfexe='' @@ -940,7 +940,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='~SUBVERSION~' +subversion='~PERL_SUBVERSION~' sysman='/usr/man/man1' tail='' tar='' @@ -1019,7 +1019,7 @@ vendorlib_stem='' vendorlibexp='' vendorprefix='' vendorprefixexp='' -version='~VERSION~' +version='' versiononly='undef' vi='' voidflags='15' diff --git a/win32/config.gc b/win32/config.gc index 3cc0ed7..14d200b 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -982,7 +982,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='~SUBVERSION~' +subversion='~PERL_SUBVERSION~' sysman='/usr/man/man1' tail='' tar='' @@ -1072,7 +1072,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='~VERSION~' +version='' version_patchlevel_string='' versiononly='undef' vi='' diff --git a/win32/config.gc64 b/win32/config.gc64 index 2b13d2d..3c4368a 100644 --- a/win32/config.gc64 +++ b/win32/config.gc64 @@ -983,7 +983,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='~SUBVERSION~' +subversion='~PERL_SUBVERSION~' sysman='/usr/man/man1' tail='' tar='' @@ -1073,7 +1073,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='~VERSION~' +version='' version_patchlevel_string='' versiononly='undef' vi='' diff --git a/win32/config.gc64nox b/win32/config.gc64nox index c463323..9f41cbb 100644 --- a/win32/config.gc64nox +++ b/win32/config.gc64nox @@ -983,7 +983,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='~SUBVERSION~' +subversion='~PERL_SUBVERSION~' sysman='/usr/man/man1' tail='' tar='' @@ -1073,7 +1073,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='~VERSION~' +version='' version_patchlevel_string='' versiononly='undef' vi='' diff --git a/win32/config.vc b/win32/config.vc index 7636a26..3b19a64 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -982,7 +982,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='~SUBVERSION~' +subversion='~PERL_SUBVERSION~' sysman='/usr/man/man1' tail='' tar='' @@ -1072,7 +1072,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='~VERSION~' +version='' version_patchlevel_string='' versiononly='undef' vi='' diff --git a/win32/config.vc64 b/win32/config.vc64 index 30fec79..dd7130b 100644 --- a/win32/config.vc64 +++ b/win32/config.vc64 @@ -982,7 +982,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='~SUBVERSION~' +subversion='~PERL_SUBVERSION~' sysman='/usr/man/man1' tail='' tar='' @@ -1072,7 +1072,7 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='~VERSION~' +version='' version_patchlevel_string='' versiononly='undef' vi='' diff --git a/win32/config_h.PL b/win32/config_h.PL index 89b8553..dbefeb5 100644 --- a/win32/config_h.PL +++ b/win32/config_h.PL @@ -23,12 +23,6 @@ $opt{CORE_DIR} ||= '../lib/CORE'; 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>) { diff --git a/win32/config_sh.PL b/win32/config_sh.PL index fb23ee7..7f56025 100644 --- a/win32/config_sh.PL +++ b/win32/config_sh.PL @@ -76,7 +76,7 @@ if (-e $patch_file) { close $fh; } -$opt{VERSION} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}"; +$opt{'version'} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}"; $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}; diff --git a/win32/makefile.mk b/win32/makefile.mk index 2dfd2e1..5914486 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -881,7 +881,6 @@ DYNALOADER = ..\DynaLoader$(o) # trying to fit them all on the command line) # -- BKS 10-17-1999 CFG_VARS = \ - INST_DRV=$(INST_DRV) ~ \ INST_TOP=$(INST_TOP) ~ \ INST_VER=$(INST_VER) ~ \ INST_ARCH=$(INST_ARCH) ~ \ -- Perl5 Master Repository
