add a missing 5 to the release announcement template

[perl5.git] / configpm

diff --git a/configpm b/configpm
index 0975373..d3983f7 100755 (executable)
--- a/configpm
+++ b/configpm
@@ -149,21 +149,24 @@ die "Can't automatically determine name for Config_heavy.pl from '$Config_PM'"
 my $config_txt;
 my $heavy_txt;
 
-$heavy_txt .= <<'ENDOFBEG';
+my $from = $^O eq 'VMS' ? 'PERLSHR image' : 'binary (from libperl)';
+my $env_cygwin = $^O eq 'cygwin'
+    ? 'push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $ENV{CYGWIN};' . "\n" : "";
+$heavy_txt .= sprintf <<'ENDOFBEG', $^O, $^O, $from, $^O, $env_cygwin;
 # This file was created by configpm when Perl was built. Any changes
 # made to this file will be lost the next time perl is built.
 
 package Config;
 use strict;
-# use warnings; Pulls in Carp
-# use vars pulls in Carp
+use warnings;
+use vars '%%Config';
 
 sub bincompat_options {
-    return sort split ' ', (Internals::V())[0];
+    return split ' ', (Internals::V())[0];
 }
 
 sub non_bincompat_options {
-    return sort split ' ', (Internals::V())[1];
+    return split ' ', (Internals::V())[1];
 }
 
 sub compile_date {
@@ -176,6 +179,9 @@ sub local_patches {
 }
 
 sub _V {
+    die "Perl lib was built for '%s' but is being run on '$^O'"
+        unless "%s" eq $^O;
+
     my ($bincompat, $non_bincompat, $date, @patches) = Internals::V();
 
     my $opts = join ' ', sort split ' ', "$bincompat $non_bincompat";
@@ -185,11 +191,7 @@ sub _V {
     $opts =~ s/(?=.{53})(.{1,53}) /$1\n                        /mg;
 
     print Config::myconfig();
-    if ($^O eq 'VMS') {
-        print "\nCharacteristics of this PERLSHR image: \n";
-    } else {
-        print "\nCharacteristics of this binary (from libperl): \n";
-    }
+    print "\nCharacteristics of this %s: \n";
 
     print "  Compile-time options: $opts\n";
 
@@ -198,15 +200,14 @@ sub _V {
         print "\t$_\n" foreach @patches;
     }
 
-    print "  Built under $^O\n";
+    print "  Built under %s\n";
 
     print "  $date\n" if defined $date;
 
-    my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %ENV;
-    push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $^O eq 'cygwin';
-
+    my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %%ENV;
+%s
     if (@env) {
-        print "  \%ENV:\n";
+        print "  \%%ENV:\n";
         print "    $_\n" foreach @env;
     }
     print "  \@INC:\n";
@@ -219,16 +220,15 @@ ENDOFBEG
 $heavy_txt .= $header_files . "\n}\n\n";
 
 my $export_funcs = <<'EOT';
-my %Export_Cache = (myconfig => 1,
-                   config_sh => 1, config_vars => 1, config_re => 1,
+my %Export_Cache = (myconfig => 1, config_sh => 1, config_vars => 1,
+                   config_re => 1, compile_date => 1, local_patches => 1,
                    bincompat_options => 1, non_bincompat_options => 1,
-                   compile_date => 1, local_patches => 1,
                    header_files => 1);
 EOT
 
 my %export_ok = eval $export_funcs or die;
 
-$config_txt .= sprintf << 'EOT', $export_funcs;
+$config_txt .= sprintf << 'EOT', $], $export_funcs;
 # This file was created by configpm when Perl was built. Any changes
 # made to this file will be lost the next time perl is built.
 
@@ -238,8 +238,10 @@ $config_txt .= sprintf << 'EOT', $export_funcs;
 
 package Config;
 use strict;
-# use warnings; Pulls in Carp
-# use vars pulls in Carp
+use warnings;
+use vars '%%Config', '$VERSION';
+
+$VERSION = "%s";
 
 # Skip @Config::EXPORT because it only contains %%Config, which we special
 # case below as it's not a function. @Config::EXPORT won't change in the
@@ -258,7 +260,6 @@ $config_txt .= "sub $_;\n" foreach sort keys %export_ok;
 my $myver = sprintf "%vd", $^V;
 
 $config_txt .= sprintf <<'ENDOFBEG', ($myver) x 3;
-our %%Config;
 
 # Define our own import method to avoid pulling in the full Exporter:
 sub import {
@@ -294,6 +295,7 @@ my @non_v    = ();
 my @v_others = ();
 my $in_v     = 0;
 my %Data     = ();
+my $quote;
 
 
 my %seen_quotes;
@@ -325,11 +327,11 @@ my %seen_quotes;
        push(@non_v, "#$_"); # not a name='value' line
        next;
     }
-    my $quote = $2;
     if ($in_v) { 
         $val .= $_;
     }
     else { 
+       $quote = $2;
         ($name,$val) = ($1,$3); 
     }
     $in_v = $val !~ /$quote\n/;
@@ -413,13 +415,12 @@ my $f = $t eq 'long' ? 'L!' : $s == 8 ? 'Q': 'I';
 
 my $byteorder_code;
 if ($s == 4 || $s == 8) {
-    my $list = join ',', reverse(2..$s);
+    my $list = join ',', reverse(1..$s-1);
     my $format = 'a'x$s;
     $byteorder_code = <<"EOT";
 
-my \$i = 0;
-foreach my \$c ($list) { \$i |= ord(\$c); \$i <<= 8 }
-\$i |= ord(1);
+my \$i = ord($s);
+foreach my \$c ($list) { \$i <<= 8; \$i |= ord(\$c); }
 our \$byteorder = join('', unpack('$format', pack('$f', \$i)));
 EOT
 } else {
@@ -659,10 +660,9 @@ sub FETCH {
     my($self, $key) = @_;
 
     # check for cached value (which may be undef so we use exists not defined)
-    return $self->{$key} if exists $self->{$key};
-
-    return $self->fetch_string($key);
+    return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key);
 }
+
 ENDOFEND
 
 $heavy_txt .= <<'ENDOFEND';
@@ -710,9 +710,7 @@ $heavy_txt .= <<'ENDOFEND';
 }
 
 sub STORE  { die "\%Config::Config is read-only\n" }
-*DELETE = \&STORE;
-*CLEAR  = \&STORE;
-
+*DELETE = *CLEAR = \*STORE; # Typeglob aliasing uses less space
 
 sub config_sh {
     substr $Config_SH_expanded, 1, $config_sh_len;
@@ -813,8 +811,8 @@ if ($Common{byteorder}) {
 }
 my $fast_config = join '', map { "    $_,\n" } sort values %Common;
 
-# Sanity check needed to stop an infite loop if Config_heavy.pl fails to define
-# &launcher for some reason (eg it got truncated)
+# Sanity check needed to stop an infinite loop if Config_heavy.pl fails to
+# define &launcher for some reason (eg it got truncated)
 $config_txt .= sprintf <<'ENDOFTIE', $fast_config;
 
 sub DESTROY { }
@@ -876,7 +874,7 @@ http://perl5.git.perl.org/perl.git/blob/HEAD:/Porting/Glossary
 =item myconfig()
 
 Returns a textual summary of the major perl configuration values.
-See also C<-V> in L<perlrun/Switches>.
+See also C<-V> in L<perlrun/Command Switches>.
 
 =item config_sh()
 
@@ -896,7 +894,7 @@ printed on a separate line in the form:
   name='value';
 
 Names which are unknown are output as C<name='UNKNOWN';>.
-See also C<-V:name> in L<perlrun/Switches>.
+See also C<-V:name> in L<perlrun/Command Switches>.
 
 =item bincompat_options()