X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/3acf89b2d2d81700d338ab245dc8f4eb79dcf1fc..0e27d581cb664f678ac5c3df263d85f7774efc69:/configpm diff --git a/configpm b/configpm index 7651a9c..d3983f7 100755 --- a/configpm +++ b/configpm @@ -34,6 +34,7 @@ sub usage { die < '', # --cross=PLATFORM - crosscompiling for PLATFORM 'glossary' => 1, # --no-glossary - no glossary file inclusion, # for compactness + 'chdir' => '', # --chdir=dir - change directory before writing files ); sub opts { @@ -85,6 +122,10 @@ sub opts { my %Opts = opts(); +if ($Opts{chdir}) { + chdir $Opts{chdir} or die "$0: could not chdir $Opts{chdir}: $!" +} + my ($Config_SH, $Config_PM, $Config_heavy, $Config_POD); my $Glossary = 'Porting/Glossary'; @@ -108,19 +149,86 @@ 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 split ' ', (Internals::V())[0]; +} + +sub non_bincompat_options { + return split ' ', (Internals::V())[1]; +} + +sub compile_date { + return (Internals::V())[2] +} + +sub local_patches { + my (undef, undef, undef, @patches) = Internals::V(); + return @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"; + + # wrap at 76 columns. + + $opts =~ s/(?=.{53})(.{1,53}) /$1\n /mg; + + print Config::myconfig(); + print "\nCharacteristics of this %s: \n"; + + print " Compile-time options: $opts\n"; + + if (@patches) { + print " Locally applied patches:\n"; + print "\t$_\n" foreach @patches; + } + + print " Built under %s\n"; + + print " $date\n" if defined $date; + + my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %%ENV; +%s + if (@env) { + print " \%%ENV:\n"; + print " $_\n" foreach @env; + } + print " \@INC:\n"; + print " $_\n" foreach @INC; +} + +sub header_files { ENDOFBEG -my $myver = sprintf "%vd", $^V; +$heavy_txt .= $header_files . "\n}\n\n"; -$config_txt .= sprintf <<'ENDOFBEG', ($myver) x 3; +my $export_funcs = <<'EOT'; +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, + header_files => 1); +EOT + +my %export_ok = eval $export_funcs or die; + +$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. @@ -130,26 +238,32 @@ $config_txt .= sprintf <<'ENDOFBEG', ($myver) x 3; 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 +# lifetime of Perl 5. +%s @Config::EXPORT = qw(%%Config); -@Config::EXPORT_OK = qw(myconfig config_sh config_vars config_re); +@Config::EXPORT_OK = keys %%Export_Cache; # Need to stub all the functions to make code such as print Config::config_sh # keep working -sub myconfig; -sub config_sh; -sub config_vars; -sub config_re; +EOT -my %%Export_Cache = map {($_ => 1)} (@Config::EXPORT, @Config::EXPORT_OK); +$config_txt .= "sub $_;\n" foreach sort keys %export_ok; -our %%Config; +my $myver = sprintf "%vd", $^V; + +$config_txt .= sprintf <<'ENDOFBEG', ($myver) x 3; # Define our own import method to avoid pulling in the full Exporter: sub import { - my $pkg = shift; + shift; @_ = @Config::EXPORT unless @_; my @funcs = grep $_ ne '%%Config', @_; @@ -158,8 +272,8 @@ sub import { no strict 'refs'; my $callpkg = caller(0); foreach my $func (@funcs) { - die sprintf qq{"%%s" is not exported by the %%s module\n}, - $func, __PACKAGE__ unless $Export_Cache{$func}; + die qq{"$func" is not exported by the Config module\n} + unless $Export_Cache{$func}; *{$callpkg.'::'.$func} = \&{$func}; } @@ -167,11 +281,11 @@ sub import { return; } -die "Perl lib version (%s) doesn't match executable version ($])" +die "Perl lib version (%s) doesn't match executable '$0' version ($])" unless $^V; $^V eq %s - or die "Perl lib version (%s) doesn't match executable version (" . + or die "Perl lib version (%s) doesn't match executable '$0' version (" . sprintf("v%%vd",$^V) . ")"; ENDOFBEG @@ -181,6 +295,7 @@ my @non_v = (); my @v_others = (); my $in_v = 0; my %Data = (); +my $quote; my %seen_quotes; @@ -212,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/; @@ -246,63 +361,41 @@ EOT if ($seen_quotes{'"'}) { # We need the full ' and " code - $fetch_string .= <<'EOT'; - my $quote_type = "'"; - my $marker = "$key="; - - # Check for the common case, ' delimited - my $start = index($Config_SH_expanded, "\n$marker$quote_type"); - # If that failed, check for " delimited - if ($start == -1) { - $quote_type = '"'; - $start = index($Config_SH_expanded, "\n$marker$quote_type"); - } -EOT -} else { - $fetch_string .= <<'EOT'; - # We only have ' delimted. - my $start = index($Config_SH_expanded, "\n$key=\'"); -EOT -} -$fetch_string .= <<'EOT'; - # Start can never be -1 now, as we've rigged the long string we're - # searching with an initial dummy newline. - return undef if $start == -1; - - $start += length($key) + 3; -EOT -if (!$seen_quotes{'"'}) { - # Don't need the full ' and " code, or the eval expansion. - $fetch_string .= <<'EOT'; - my $value = substr($Config_SH_expanded, $start, - index($Config_SH_expanded, "'\n", $start) - - $start); -EOT -} else { - $fetch_string .= <<'EOT'; - my $value = substr($Config_SH_expanded, $start, - index($Config_SH_expanded, "$quote_type\n", $start) - - $start); +$fetch_string .= <<'EOT'; + return undef unless my ($quote_type, $value) = $Config_SH_expanded =~ /\n$key=(['"])(.*?)\1\n/s; # If we had a double-quote, we'd better eval it so escape # sequences and such can be interpolated. Since the incoming # value is supposed to follow shell rules and not perl rules, # we escape any perl variable markers + + # Historically, since " 'support' was added in change 1409, the + # interpolation was done before the undef. Stick to this arguably buggy + # behaviour as we're refactoring. if ($quote_type eq '"') { $value =~ s/\$/\\\$/g; $value =~ s/\@/\\\@/g; eval "\$value = \"$value\""; } -EOT + + # So we can say "if $Config{'foo'}". + $self->{$key} = $value eq 'undef' ? undef : $value; # cache it } +EOT + +} else { + # We only have ' delimted. + $fetch_string .= <<'EOT'; + return undef unless $Config_SH_expanded =~ /\n$key=\'(.*?)\'\n/s; # So we can say "if $Config{'foo'}". - $value = undef if $value eq 'undef'; - $self->{$key} = $value; # cache it + $self->{$key} = $1 eq 'undef' ? undef : $1; } EOT +} + eval $fetch_string; die if $@; @@ -322,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 { @@ -568,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'; @@ -619,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; @@ -722,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 { } @@ -785,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. +See also C<-V> in L. =item config_sh() @@ -805,7 +894,34 @@ printed on a separate line in the form: name='value'; Names which are unknown are output as C. -See also C<-V:name> in L. +See also C<-V:name> in L. + +=item bincompat_options() + +Returns a list of C pre-processor options used when compiling this F +binary, which affect its binary compatibility with extensions. +C and C are shown together in +the output of C as I. + +=item non_bincompat_options() + +Returns a list of C pre-processor options used when compiling this F +binary, which do not affect binary compatibility with extensions. + +=item compile_date() + +Returns the compile date (as a string), equivalent to what is shown by +C + +=item local_patches() + +Returns a list of the names of locally applied patches, equivalent to what +is shown by C. + +=item header_files() + +Returns a list of the header files that should be used as dependencies for +XS code, for this version of Perl on this platform. =back @@ -938,6 +1054,21 @@ print CONFIG_POD <<'ENDOFTAIL'; =back +=head1 GIT DATA + +Information on the git commit from which the current perl binary was compiled +can be found in the variable C<$Config::Git_Data>. The variable is a +structured string that looks something like this: + + git_commit_id='ea0c2dbd5f5ac6845ecc7ec6696415bf8e27bd52' + git_describe='GitLive-blead-1076-gea0c2db' + git_branch='smartmatch' + git_uncommitted_changes='' + git_commit_id_title='Commit id:' + git_commit_date='2009-05-09 17:47:31 +0200' + +Its format is not guaranteed not to change over time. + =head1 NOTE This module contains a good example of how to use tie to implement a