X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/a8e1d30be55774dfed1ebdbeeb60084324b04c25..d1992db059626dbd1b9a7e2cf67ef89e6428a9c0:/configpm diff --git a/configpm b/configpm index abe71bf..21bd3ef 100755 --- a/configpm +++ b/configpm @@ -1,4 +1,39 @@ #!./miniperl -w +# +# configpm +# +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007 Larry Wall and others. +# +# +# Regenerate the files +# +# lib/Config.pm +# lib/Config_heavy.pl +# lib/Config.pod +# +# +# from the contents of the static files +# +# Porting/Glossary +# myconfig.SH +# +# and from the contents of the Configure-generated file +# +# config.sh +# +# +# It will only update Config.pm and Config_heavy.pl if the contents of +# either file would be different. Note that *both* files are updated in +# this case, since for example an extension makefile that has a dependency +# on Config.pm should trigger even if only Config_heavy.pl has changed. + +sub usage { die < '', # --cross=PLATFORM - crosscompiling for PLATFORM 'glossary' => 1, # --no-glossary - no glossary file inclusion, # for compactness - 'heavy' => '', # pathname of the Config_heavy.pl file + 'chdir' => '', # --chdir=dir - change directory before writing files ); sub opts { @@ -38,7 +106,8 @@ sub opts { my %opts = (%Allowed_Opts, %given_opts); for my $opt (grep {!exists $Allowed_Opts{$_}} keys %given_opts) { - die "option '$opt' is not recognized"; + warn "option '$opt' is not recognized"; + usage; } @ARGV = grep {!/^--/} @ARGV; @@ -48,60 +117,69 @@ sub opts { my %Opts = opts(); -my ($Config_PM, $Config_heavy); -my $Glossary = $ARGV[1] || 'Porting/Glossary'; - -if ($Opts{cross}) { - # creating cross-platform config file - mkdir "xlib"; - mkdir "xlib/$Opts{cross}"; - $Config_PM = $ARGV[0] || "xlib/$Opts{cross}/Config.pm"; -} -else { - $Config_PM = $ARGV[0] || 'lib/Config.pm'; -} -if ($Opts{heavy}) { - $Config_heavy = $Opts{heavy}; -} -else { - ($Config_heavy = $Config_PM) =~ s!\.pm$!_heavy.pl!; - die "Can't automatically determine name for Config_heavy.pl from '$Config_PM'" - if $Config_heavy eq $Config_PM; +if ($Opts{chdir}) { + chdir $Opts{chdir} or die "$0: could not chdir $Opts{chdir}: $!" } -open CONFIG, ">$Config_PM" or die "Can't open $Config_PM: $!\n"; -open CONFIG_HEAVY, ">$Config_heavy" or die "Can't open $Config_heavy: $!\n"; +my ($Config_SH, $Config_PM, $Config_heavy, $Config_POD); +my $Glossary = 'Porting/Glossary'; -print CONFIG_HEAVY <<'ENDOFBEG'; -# 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. +$Config_PM = "lib/Config.pm"; +$Config_POD = "lib/Config.pod"; +$Config_SH = "config.sh"; -package Config; -use strict; -# use warnings; Pulls in Carp -# use vars pulls in Carp -ENDOFBEG +($Config_heavy = $Config_PM) =~ s/\.pm$/_heavy.pl/; +die "Can't automatically determine name for Config_heavy.pl from '$Config_PM'" + if $Config_heavy eq $Config_PM; -my $myver = sprintf "v%vd", $^V; +my $config_txt; +my $heavy_txt; -printf CONFIG <<'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. +# for a description of the variables, please have a look at the +# Glossary file, as written in the Porting folder, or use the url: +# http://perl5.git.perl.org/perl.git/blob/HEAD:/Porting/Glossary + 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; -my %%Export_Cache = map {($_ => 1)} (@Config::EXPORT, @Config::EXPORT_OK); +# Need to stub all the functions to make code such as print Config::config_sh +# keep working -our %%Config; +EOT + +$config_txt .= "sub $_;\n" foreach sort keys %export_ok; + +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', @_; @@ -110,8 +188,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}; } @@ -119,73 +197,26 @@ sub import { return; } -die "Perl lib version (%s) doesn't match executable version ($])" +die "$0: Perl lib version (%s) doesn't match executable '$^X' version ($])" unless $^V; $^V eq %s - or die "Perl lib version (%s) doesn't match executable version (" . - sprintf("v%%vd",$^V) . ")"; + or die sprintf "%%s: Perl lib version (%s) doesn't match executable '$^X' version (%%vd)", $0, $^V; ENDOFBEG my @non_v = (); -my @v_fast = (); my @v_others = (); my $in_v = 0; my %Data = (); +my $quote; -# This is somewhat grim, but I want the code for parsing config.sh here and -# now so that I can expand $Config{ivsize} and $Config{ivtype} - -my $fetch_string = <<'EOT'; - -# Search for it in the big string -sub fetch_string { - my($self, $key) = @_; - - 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"); - } - # 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($marker) + 2; - - my $value = substr($Config_SH_expanded, $start, - index($Config_SH_expanded, "$quote_type\n", $start) - - $start); - - # 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 - if ($quote_type eq '"') { - $value =~ s/\$/\\\$/g; - $value =~ s/\@/\\\@/g; - eval "\$value = \"$value\""; - } - - # So we can say "if $Config{'foo'}". - $value = undef if $value eq 'undef'; - $self->{$key} = $value; # cache it -} -EOT - -eval $fetch_string; -die if $@; +my %seen_quotes; { my ($name, $val); - open(CONFIG_SH, 'config.sh') || die "Can't open config.sh: $!"; + open(CONFIG_SH, $Config_SH) || die "Can't open $Config_SH: $!"; while () { next if m:^#!/bin/sh:; @@ -211,11 +242,11 @@ die if $@; 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/; @@ -226,20 +257,66 @@ die if $@; $val =~ s/$quote\n?\z//; my $line = "$name=$quote$val$quote\n"; - if (!$Common{$name}){ - push(@v_others, $line); - } - else { - push(@v_fast, $line); - } + push(@v_others, $line); + $seen_quotes{$quote}++; } close CONFIG_SH; } +# This is somewhat grim, but I want the code for parsing config.sh here and +# now so that I can expand $Config{ivsize} and $Config{ivtype} + +my $fetch_string = <<'EOT'; + +# Search for it in the big string +sub fetch_string { + my($self, $key) = @_; + +EOT + +if ($seen_quotes{'"'}) { + # We need the full ' and " code + +$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\""; + } + + # So we can say "if $Config{'foo'}". + $self->{$key} = $value eq 'undef' ? undef : $value; # cache it +} +EOT + +} else { + # We only have ' delimited. + +$fetch_string .= <<'EOT'; + return undef unless $Config_SH_expanded =~ /\n$key=\'(.*?)\'\n/s; + # So we can say "if $Config{'foo'}". + $self->{$key} = $1 eq 'undef' ? undef : $1; +} +EOT + +} + +eval $fetch_string; +die if $@; # Calculation for the keys for byteorder # This is somewhat grim, but I need to run fetch_string here. -our $Config_SH_expanded = join "\n", '', @v_fast, @v_others; +our $Config_SH_expanded = join "\n", '', @v_others; my $t = fetch_string ({}, 'ivtype'); my $s = fetch_string ({}, 'ivsize'); @@ -253,39 +330,230 @@ 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 { $byteorder_code = "our \$byteorder = '?'x$s;\n"; } -print CONFIG $byteorder_code; -print CONFIG_HEAVY @non_v, "\n"; +my @need_relocation; + +if (fetch_string({},'userelocatableinc')) { + foreach my $what (qw(prefixexp + + archlibexp + html1direxp + html3direxp + man1direxp + man3direxp + privlibexp + scriptdirexp + sitearchexp + sitebinexp + sitehtml1direxp + sitehtml3direxp + sitelibexp + siteman1direxp + siteman3direxp + sitescriptexp + vendorarchexp + vendorbinexp + vendorhtml1direxp + vendorhtml3direxp + vendorlibexp + vendorman1direxp + vendorman3direxp + vendorscriptexp + + siteprefixexp + sitelib_stem + vendorlib_stem + + installarchlib + installhtml1dir + installhtml3dir + installman1dir + installman3dir + installprefix + installprefixexp + installprivlib + installscript + installsitearch + installsitebin + installsitehtml1dir + installsitehtml3dir + installsitelib + installsiteman1dir + installsiteman3dir + installsitescript + installvendorarch + installvendorbin + installvendorhtml1dir + installvendorhtml3dir + installvendorlib + installvendorman1dir + installvendorman3dir + installvendorscript + )) { + push @need_relocation, $what if fetch_string({}, $what) =~ m!^\.\.\./!; + } +} + +my %need_relocation; +@need_relocation{@need_relocation} = @need_relocation; + +# This can have .../ anywhere: +if (fetch_string({}, 'otherlibdirs') =~ m!\.\.\./!) { + $need_relocation{otherlibdirs} = 'otherlibdirs'; +} + +my $relocation_code = <<'EOT'; + +sub relocate_inc { + my $libdir = shift; + return $libdir unless $libdir =~ s!^\.\.\./!!; + my $prefix = $^X; + if ($prefix =~ s!/[^/]*$!!) { + while ($libdir =~ m!^\.\./!) { + # Loop while $libdir starts "../" and $prefix still has a trailing + # directory + last unless $prefix =~ s!/([^/]+)$!!; + # but bail out if the directory we picked off the end of $prefix is . + # or .. + if ($1 eq '.' or $1 eq '..') { + # Undo! This should be rare, hence code it this way rather than a + # check each time before the s!!! above. + $prefix = "$prefix/$1"; + last; + } + # Remove that leading ../ and loop again + substr ($libdir, 0, 3, ''); + } + $libdir = "$prefix/$libdir"; + } + $libdir; +} +EOT + +my $osname = fetch_string({}, 'osname'); +my $from = $osname eq 'VMS' ? 'PERLSHR image' : 'binary (from libperl)'; +my $env_cygwin = $osname eq 'cygwin' + ? 'push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $ENV{CYGWIN};' . "\n" : ""; + +$heavy_txt .= sprintf <<'ENDOFBEG', $osname, $osname, $from, $osname, $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; +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 + +$heavy_txt .= $header_files . "\n}\n\n"; + +if (%need_relocation) { + my $relocations_in_common; + # otherlibdirs only features in the hash + foreach (keys %need_relocation) { + $relocations_in_common++ if $Common{$_}; + } + if ($relocations_in_common) { + $config_txt .= $relocation_code; + } else { + $heavy_txt .= $relocation_code; + } +} + +$heavy_txt .= join('', @non_v) . "\n"; # copy config summary format from the myconfig.SH script -print CONFIG_HEAVY "our \$summary : unique = <<'!END!';\n"; +$heavy_txt .= "our \$summary = <<'!END!';\n"; open(MYCONFIG,") && !/^Summary of/; -do { print CONFIG_HEAVY $_ } until !defined($_ = ) || /^\s*$/; +do { $heavy_txt .= $_ } until !defined($_ = ) || /^\s*$/; close(MYCONFIG); -# NB. as $summary is unique, we need to copy it in a lexical variable -# before expanding it, because may have been made readonly if a perl -# interpreter has been cloned. - -print CONFIG_HEAVY "\n!END!\n", <<'EOT'; +$heavy_txt .= "\n!END!\n" . <<'EOT'; my $summary_expanded; sub myconfig { return $summary_expanded if $summary_expanded; ($summary_expanded = $summary) =~ s{\$(\w+)} - { my $c = $Config::Config{$1}; defined($c) ? $c : 'undef' }ge; + { + my $c; + if ($1 eq 'git_ancestor_line') { + if ($Config::Config{git_ancestor}) { + $c= "\n Ancestor: $Config::Config{git_ancestor}"; + } else { + $c= ""; + } + } else { + $c = $Config::Config{$1}; + } + defined($c) ? $c : 'undef' + }ge; $summary_expanded; } @@ -293,25 +561,54 @@ local *_ = \my $a; $_ = <<'!END!'; EOT -print CONFIG_HEAVY join("", @v_fast, sort @v_others); +$heavy_txt .= join('', sort @v_others) . "!END!\n"; + +# Only need the dynamic byteorder code in Config.pm if 'byteorder' is one of +# the precached keys +if ($Common{byteorder}) { + $config_txt .= $byteorder_code; +} else { + $heavy_txt .= $byteorder_code; +} + +if (@need_relocation) { +$heavy_txt .= 'foreach my $what (qw(' . join (' ', @need_relocation) . + ")) {\n" . <<'EOT'; + s/^($what=)(['"])(.*?)\2/$1 . $2 . relocate_inc($3) . $2/me; +} +EOT +# Currently it only makes sense to do the ... relocation on Unix, so there's +# no need to emulate the "which separator for this platform" logic in perl.c - +# ':' will always be applicable +if ($need_relocation{otherlibdirs}) { +$heavy_txt .= << 'EOT'; +s{^(otherlibdirs=)(['"])(.*?)\2} + {$1 . $2 . join ':', map {relocate_inc($_)} split ':', $3 . $2}me; +EOT +} +} -print CONFIG_HEAVY <<'EOT'; -!END! +$heavy_txt .= <<'EOT'; s/(byteorder=)(['"]).*?\2/$1$2$Config::byteorder$2/m; -our $Config_SH : unique = $_; -our $Config_SH_expanded : unique = "\n$_" . << 'EOVIRTUAL'; +my $config_sh_len = length $_; + +our $Config_SH_expanded = "\n$_" . << 'EOVIRTUAL'; EOT foreach my $prefix (qw(ccflags ldflags)) { my $value = fetch_string ({}, $prefix); my $withlargefiles = fetch_string ({}, $prefix . "_uselargefiles"); - $value =~ s/\Q$withlargefiles\E\b//; - print CONFIG_HEAVY "${prefix}_nolargefiles='$value'\n"; + if (defined $withlargefiles) { + $value =~ s/\Q$withlargefiles\E\b//; + $heavy_txt .= "${prefix}_nolargefiles='$value'\n"; + } } foreach my $prefix (qw(libs libswanted)) { my $value = fetch_string ({}, $prefix); + my $withlf = fetch_string ({}, 'libswanted_uselargefiles'); + next unless defined $withlf; my @lflibswanted = split(' ', fetch_string ({}, 'libswanted_uselargefiles')); if (@lflibswanted) { @@ -328,26 +625,53 @@ foreach my $prefix (qw(libs libswanted)) { $value = join(' ', @libswanted); } } - print CONFIG_HEAVY "${prefix}_nolargefiles='$value'\n"; + $heavy_txt .= "${prefix}_nolargefiles='$value'\n"; } -print CONFIG_HEAVY "EOVIRTUAL\n"; +if (open(my $fh, "cflags")) { + my $ccwarnflags; + my $ccstdflags; + while (<$fh>) { + if (/^warn="(.+)"$/) { + $ccwarnflags = $1; + } elsif (/^stdflags="(.+)"$/) { + $ccstdflags = $1; + } + } + if (defined $ccwarnflags) { + $heavy_txt .= "ccwarnflags='$ccwarnflags'\n"; + } + if (defined $ccstdflags) { + $heavy_txt .= "ccstdflags='$ccstdflags'\n"; + } +} -print CONFIG_HEAVY $fetch_string; +$heavy_txt .= "EOVIRTUAL\n"; -print CONFIG <<'ENDOFEND'; +$heavy_txt .= <<'ENDOFGIT'; +eval { + # do not have hairy conniptions if this isnt available + require 'Config_git.pl'; + $Config_SH_expanded .= $Config::Git_Data; + 1; +} or warn "Warning: failed to load Config_git.pl, something strange about this perl...\n"; +ENDOFGIT + +$heavy_txt .= $fetch_string; + +$config_txt .= <<'ENDOFEND'; 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 -print CONFIG_HEAVY <<'ENDOFEND'; +$heavy_txt .= <<'ENDOFEND'; + my $prevpos = 0; sub FIRSTKEY { @@ -356,10 +680,21 @@ sub FIRSTKEY { } sub NEXTKEY { +ENDOFEND +if ($seen_quotes{'"'}) { +$heavy_txt .= <<'ENDOFEND'; # Find out how the current key's quoted so we can skip to its end. my $quote = substr($Config_SH_expanded, index($Config_SH_expanded, "=", $prevpos)+1, 1); my $pos = index($Config_SH_expanded, qq($quote\n), $prevpos) + 2; +ENDOFEND +} else { + # Just ' quotes, so it's much easier. +$heavy_txt .= <<'ENDOFEND'; + my $pos = index($Config_SH_expanded, qq('\n), $prevpos) + 2; +ENDOFEND +} +$heavy_txt .= <<'ENDOFEND'; my $len = index($Config_SH_expanded, "=", $pos) - $pos; $prevpos = $pos; $len > 0 ? substr($Config_SH_expanded, $pos, $len) : undef; @@ -368,18 +703,22 @@ sub NEXTKEY { sub EXISTS { return 1 if exists($_[0]->{$_[1]}); - return(index($Config_SH_expanded, "\n$_[1]='") != -1 or - index($Config_SH_expanded, "\n$_[1]=\"") != -1 + return(index($Config_SH_expanded, "\n$_[1]='") != -1 +ENDOFEND +if ($seen_quotes{'"'}) { +$heavy_txt .= <<'ENDOFEND'; + or index($Config_SH_expanded, "\n$_[1]=\"") != -1 +ENDOFEND +} +$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 { - $Config_SH + substr $Config_SH_expanded, 1, $config_sh_len; } sub config_re { @@ -421,7 +760,7 @@ sub launcher { ENDOFEND if ($^O eq 'os2') { - print CONFIG <<'ENDOFSET'; + $config_txt .= <<'ENDOFSET'; my %preconfig; if ($OS2::is_aout) { my ($value, $v) = $Config_SH_expanded =~ m/^used_aout='(.*)'\s*$/m; @@ -441,11 +780,11 @@ ENDOFSET $dll = $1, last if /^PERL_DLL_BASE\s*=\s*(\S*)\s*$/; } } - print CONFIG < $byteorder'); -print CONFIG sprintf <<'ENDOFTIE', $fast_config; +if ($Common{byteorder}) { + $Common{byteorder} = 'byteorder => $byteorder'; +} +my $fast_config = join '', map { " $_,\n" } sort values %Common; + +# 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 { } sub AUTOLOAD { require 'Config_heavy.pl'; - goto \&launcher; + goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/; die "&Config::AUTOLOAD failed on $Config::AUTOLOAD"; } +# tie returns the object, so the value returned to require will be true. tie %%Config, 'Config', { %s}; - -1; ENDOFTIE -open(CONFIG_POD, ">lib/Config.pod") or die "Can't open lib/Config.pod: $!"; +open(CONFIG_POD, ">$Config_POD") or die "Can't open $Config_POD: $!"; print CONFIG_POD <<'ENDOFTAIL'; =head1 NAME @@ -522,12 +870,16 @@ Values stored in config.sh as 'undef' are returned as undefined values. The perl C function can be used to check if a named variable exists. +For a description of the variables, please have a look at the +Glossary file, as written in the Porting folder, or use the url: +http://perl5.git.perl.org/perl.git/blob/HEAD:/Porting/Glossary + =over 4 =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() @@ -547,7 +899,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 @@ -603,6 +982,8 @@ some of the variables described below, or may have extraneous variables specific to that particular port. See the port specific documentation in such cases. +=cut + ENDOFTAIL if ($Opts{glossary}) { @@ -611,6 +992,7 @@ if ($Opts{glossary}) { my %seen = (); my $text = 0; $/ = ''; +my $errors= 0; sub process { if (s/\A(\w*)\s+\(([\w.]+)\):\s*\n(\t?)/=item C<$1>\n\nFrom F<$2>:\n\n/m) { @@ -619,19 +1001,25 @@ sub process { print CONFIG_POD < new paragraph @@ -640,7 +1028,7 @@ EOF s{([\'\"])([^\'\"\s]+)\1}(C<$2>)g; # "date" command s{\'([A-Za-z_\- *=/]+)\'}(C<$1>)g; # 'ln -s' s{ - (?. 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 @@ -684,41 +1094,34 @@ outside of it. ENDOFTAIL -close(CONFIG_HEAVY); -close(CONFIG); -close(GLOS); +close(GLOS) if $Opts{glossary}; close(CONFIG_POD); +print "written $Config_POD\n"; -# Now create Cross.pm if needed -if ($Opts{cross}) { - open CROSS, ">lib/Cross.pm" or die "Can not open >lib/Cross.pm: $!"; - my $cross = <<'EOS'; -# typical invocation: -# perl -MCross Makefile.PL -# perl -MCross=wince -V:cc -package Cross; - -sub import { - my ($package,$platform) = @_; - unless (defined $platform) { - # if $platform is not specified, then use last one when - # 'configpm; was invoked with --cross option - $platform = '***replace-marker***'; - } - @INC = map {/\blib\b/?(do{local $_=$_;s/\blib\b/xlib\/$platform/;$_},$_):($_)} @INC; - $::Cross::platform = $platform; +my $orig_config_txt = ""; +my $orig_heavy_txt = ""; +{ + local $/; + my $fh; + $orig_config_txt = <$fh> if open $fh, "<", $Config_PM; + $orig_heavy_txt = <$fh> if open $fh, "<", $Config_heavy; } -1; -EOS - $cross =~ s/\*\*\*replace-marker\*\*\*/$Opts{cross}/g; - print CROSS $cross; - close CROSS; +if ($orig_config_txt ne $config_txt or $orig_heavy_txt ne $heavy_txt) { + open CONFIG, ">", $Config_PM or die "Can't open $Config_PM: $!\n"; + open CONFIG_HEAVY, ">", $Config_heavy or die "Can't open $Config_heavy: $!\n"; + print CONFIG $config_txt; + print CONFIG_HEAVY $heavy_txt; + close(CONFIG_HEAVY); + close(CONFIG); + print "updated $Config_PM\n"; + print "updated $Config_heavy\n"; } # Now do some simple tests on the Config.pm file we have created unshift(@INC,'lib'); require $Config_PM; +require $Config_heavy; import Config; die "$0: $Config_PM not valid"