X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=configpm;h=8c53dbb7249c707087ee036ac905a704075dd0d2;hb=d6a66728474fdd676e356515043a404d3990d3de;hp=9bfeab5070e492a24491022abe9cff0a1a94c24f;hpb=3c81428c5fa001df0f0ac7d48bfc483afd5efff5;p=p5sagit%2Fp5-mst-13.2.git diff --git a/configpm b/configpm index 9bfeab5..8c53dbb 100755 --- a/configpm +++ b/configpm @@ -1,12 +1,13 @@ #!./miniperl -w -$config_pm = $ARGV[0] || 'lib/Config.pm'; +my $config_pm = $ARGV[0] || 'lib/Config.pm'; +my $glossary = $ARGV[1] || 'Porting/Glossary'; @ARGV = "./config.sh"; # list names to put first (and hence lookup fastest) @fast = qw(archname osname osvers prefix libs libpth dynamic_ext static_ext extensions dlsrc so - sig_name cc ccflags cppflags + sig_name sig_num cc ccflags cppflags privlibexp archlibexp installprivlib installarchlib sharpbang startsh shsharp ); @@ -16,17 +17,29 @@ $config_pm = $ARGV[0] || 'lib/Config.pm'; open CONFIG, ">$config_pm" or die "Can't open $config_pm: $!\n"; -$myver = sprintf("%.3f", $]); +$myver = $]; -print CONFIG <<"ENDOFBEG"; +print CONFIG <<'ENDOFBEG_NOQ', <<"ENDOFBEG"; package Config; use Exporter (); -\@ISA = (Exporter); -\@EXPORT = qw(%Config); -\@EXPORT_OK = qw(myconfig config_sh config_vars); +@EXPORT = qw(%Config); +@EXPORT_OK = qw(myconfig config_sh config_vars); + +# Define our own import method to avoid pulling in the full Exporter: +sub import { + my $pkg = shift; + @_ = @EXPORT unless @_; + my @func = grep {$_ ne '%Config'} @_; + local $Exporter::ExportLevel = 1; + Exporter::import('Config', @func) if @func; + return if @func == @_; + my $callpkg = caller(0); + *{"$callpkg\::Config"} = \%Config; +} -\$] == $myver or die sprintf - "Perl lib version ($myver) doesn't match executable version (%.3f)\\n", \$]; +ENDOFBEG_NOQ +\$] == $myver + or die "Perl lib version ($myver) doesn't match executable version (\$])"; # 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. @@ -39,19 +52,38 @@ ENDOFBEG @non_v=(); @v_fast=(); @v_others=(); +$in_v = 0; while (<>) { next if m:^#!/bin/sh:; - # Catch CONFIG=true and PATCHLEVEL=n line from Configure. + # Catch CONFIGDOTSH=true and PERL_VERSION=n line from Configure. s/^(\w+)=(true|\d+)\s*$/$1='$2'\n/; - unless (m/^(\w+)='(.*)'\s*$/){ + my ($k,$v) = ($1,$2); + # grandfather PATCHLEVEL and SUBVERSION and CONFIG + if ($k) { + if ($k eq 'PERL_VERSION') { + push @v_others, "PATCHLEVEL='$v'\n"; + } + elsif ($k eq 'PERL_SUBVERSION') { + push @v_others, "SUBVERSION='$v'\n"; + } + elsif ($k eq 'CONFIGDOTSH') { + push @v_others, "CONFIG='$v'\n"; + } + } + # We can delimit things in config.sh with either ' or ". + unless ($in_v or m/^(\w+)=(['"])(.*\n)/){ push(@non_v, "#$_"); # not a name='value' line next; } - $name = $1; + $quote = $2; + if ($in_v) { $val .= $_; } + else { ($name,$val) = ($1,$3); } + $in_v = $val !~ /$quote\n/; + next if $in_v; if ($extensions{$name}) { s,/,::,g } - if (!$fast{$name}){ push(@v_others, $_); next; } - push(@v_fast,$_); + if (!$fast{$name}){ push(@v_others, "$name=$quote$val"); next; } + push(@v_fast,"$name=$quote$val"); } foreach(@non_v){ print CONFIG $_ } @@ -61,13 +93,13 @@ print CONFIG "\n", join("", @v_fast, sort @v_others), "!END!\n\n"; -# copy config summary format from the myconfig script +# copy config summary format from the myconfig.SH script print CONFIG "my \$summary = <<'!END!';\n"; -open(MYCONFIG,") !~ /^Summary of/); -do { print CONFIG $_ } until ($_ = ) =~ /^\s*$/; +open(MYCONFIG,") && !/^Summary of/; +do { print CONFIG $_ } until !defined($_ = ) || /^\s*$/; close(MYCONFIG); print CONFIG "\n!END!\n", <<'EOT'; @@ -75,7 +107,8 @@ my $summary_expanded = 0; sub myconfig { return $summary if $summary_expanded; - $summary =~ s/\$(\w+)/$Config{$1}/ge; + $summary =~ s{\$(\w+)} + { my $c = $Config{$1}; defined($c) ? $c : 'undef' }ge; $summary_expanded = 1; $summary; } @@ -85,15 +118,46 @@ EOT print CONFIG <<'ENDOFEND'; -tie %Config, Config; -sub TIEHASH { bless {} } sub FETCH { - # check for cached value (which maybe undef so we use exists not defined) + # check for cached value (which may be undef so we use exists not defined) return $_[0]->{$_[1]} if (exists $_[0]->{$_[1]}); + + # Search for it in the big string + my($value, $start, $marker, $quote_type); + $marker = "$_[1]="; + $quote_type = "'"; + # return undef unless (($value) = $config_sh =~ m/^$_[1]='(.*)'\s*$/m); + # Check for the common case, ' delimeted + $start = index($config_sh, "\n$marker$quote_type"); + # If that failed, check for " delimited + if ($start == -1) { + $quote_type = '"'; + $start = index($config_sh, "\n$marker$quote_type"); + } + return undef if ( ($start == -1) && # in case it's first + (substr($config_sh, 0, length($marker)) ne $marker) ); + if ($start == -1) { + # It's the very first thing we found. Skip $start forward + # and figure out the quote mark after the =. + $start = length($marker) + 1; + $quote_type = substr($config_sh, $start - 1, 1); + } + else { + $start += length($marker) + 2; + } + $value = substr($config_sh, $start, + index($config_sh, "$quote_type\n", $start) - $start); - my($value); # search for the item in the big $config_sh string - return undef unless (($value) = $config_sh =~ m/^$_[1]='(.*)'\s*$/m); - + # 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\""; + } + #$value = sprintf($value) if $quote_type eq '"'; $value = undef if $value eq 'undef'; # So we can say "if $Config{'foo'}". $_[0]->{$_[1]} = $value; # cache it return $value; @@ -103,19 +167,27 @@ my $prevpos = 0; sub FIRSTKEY { $prevpos = 0; - my($key) = $config_sh =~ m/^(.*?)=/; - $key; + # my($key) = $config_sh =~ m/^(.*?)=/; + substr($config_sh, 0, index($config_sh, '=') ); + # $key; } sub NEXTKEY { - my $pos = index($config_sh, "\n", $prevpos) + 1; + # Find out how the current key's quoted so we can skip to its end. + my $quote = substr($config_sh, index($config_sh, "=", $prevpos)+1, 1); + my $pos = index($config_sh, qq($quote\n), $prevpos) + 2; my $len = index($config_sh, "=", $pos) - $pos; $prevpos = $pos; $len > 0 ? substr($config_sh, $pos, $len) : undef; } sub EXISTS { - exists($_[0]->{$_[1]}) or $config_sh =~ m/^$_[1]=/m; + # exists($_[0]->{$_[1]}) or $config_sh =~ m/^$_[1]=/m; + exists($_[0]->{$_[1]}) or + index($config_sh, "\n$_[1]='") != -1 or + substr($config_sh, 0, length($_[1])+2) eq "$_[1]='" or + index($config_sh, "\n$_[1]=\"") != -1 or + substr($config_sh, 0, length($_[1])+2) eq "$_[1]=\""; } sub STORE { die "\%Config::Config is read-only\n" } @@ -126,14 +198,49 @@ sub CLEAR { &STORE } sub config_sh { $config_sh } + +sub config_re { + my $re = shift; + my @matches = ($config_sh =~ /^$re=.*\n/mg); + @matches ? (print @matches) : print "$re: not found\n"; +} + sub config_vars { foreach(@_){ + config_re($_), next if /\W/; my $v=(exists $Config{$_}) ? $Config{$_} : 'UNKNOWN'; $v='undef' unless defined $v; print "$_='$v';\n"; } } +ENDOFEND + +if ($^O eq 'os2') { + print CONFIG <<'ENDOFSET'; +my %preconfig; +if ($OS2::is_aout) { + my ($value, $v) = $config_sh =~ m/^used_aout='(.*)'\s*$/m; + for (split ' ', $value) { + ($v) = $config_sh =~ m/^aout_$_='(.*)'\s*$/m; + $preconfig{$_} = $v eq 'undef' ? undef : $v; + } +} +sub TIEHASH { bless {%preconfig} } +ENDOFSET +} else { + print CONFIG <<'ENDOFSET'; +sub TIEHASH { bless {} } +ENDOFSET +} + +print CONFIG <<'ENDOFTAIL'; + +# avoid Config..Exporter..UNIVERSAL search for DESTROY then AUTOLOAD +sub DESTROY { } + +tie %Config, 'Config'; + 1; __END__ @@ -166,7 +273,7 @@ Shell variables from the F file (written by Configure) are stored in the readonly-variable C<%Config>, indexed by their names. Values stored in config.sh as 'undef' are returned as undefined -values. The perl C function can be used to check is a +values. The perl C function can be used to check if a named variable exists. =over 4 @@ -198,17 +305,23 @@ See also C<-V:name> in L. Here's a more sophisticated example of using %Config: use Config; + use strict; + + my %sig_num; + my @sig_name; + unless($Config{sig_name} && $Config{sig_num}) { + die "No sigs?"; + } else { + my @names = split ' ', $Config{sig_name}; + @sig_num{@names} = split ' ', $Config{sig_num}; + foreach (@names) { + $sig_name[$sig_num{$_}] ||= $_; + } + } - defined $Config{sig_name} || die "No sigs?"; - foreach $name (split(' ', $Config{sig_name})) { - $signo{$name} = $i; - $signame[$i] = $name; - $i++; - } - - print "signal #17 = $signame[17]\n"; - if ($signo{ALRM}) { - print "SIGALRM is $signo{ALRM}\n"; + print "signal #17 = $sig_name[17]\n"; + if ($sig_num{ALRM}) { + print "SIGALRM is $sig_num{ALRM}\n"; } =head1 WARNING @@ -221,6 +334,79 @@ The Config module is installed into the architecture and version specific library directory ($Config{installarchlib}) and it checks the perl version number when loaded. +The values stored in config.sh may be either single-quoted or +double-quoted. Double-quoted strings are handy for those cases where you +need to include escape sequences in the strings. To avoid runtime variable +interpolation, any C<$> and C<@> characters are replaced by C<\$> and +C<\@>, respectively. This isn't foolproof, of course, so don't embed C<\$> +or C<\@> in double-quoted strings unless you're willing to deal with the +consequences. (The slashes will end up escaped and the C<$> or C<@> will +trigger variable interpolation) + +=head1 GLOSSARY + +Most C variables are determined by the C script +on platforms supported by it (which is most UNIX platforms). Some +platforms have custom-made C variables, and may thus not have +some of the variables described below, or may have extraneous variables +specific to that particular port. See the port specific documentation +in such cases. + +ENDOFTAIL + +open(GLOS, "<$glossary") or die "Can't open $glossary: $!"; +%seen = (); +$text = 0; +$/ = ''; + +sub process { + s/\A(\w*)\s+\(([\w.]+)\):\s*\n(\t?)/=item C<$1>\n\nFrom F<$2>:\n\n/m; + my $c = substr $1, 0, 1; + unless ($seen{$c}++) { + print CONFIG < paragraphs + s/^(? text + s{([\'\"])(?=[^\'\"\s]*[./][^\'\"\s]*\1)([^\'\"\s]+)\1}(F<$2>)g; # '.o' + s{([\'\"])([^\'\"\s]+)\1}(C<$2>)g; # "date" command + s{\'([A-Za-z_\- *=/]+)\'}(C<$1>)g; # 'ln -s' + s{ + (?)xg; # /usr/local + s/((?<=\s)~\w*)/F<$1>/g; # ~name + s/(?/g; # UNISTD + s/(? macro/g; # FILE_cnt macro + s/n[\0]t/n't/g; # undo can't, won't damage +} + +; # Skip the preamble +while () { + process; + print CONFIG; +} + +print CONFIG <<'ENDOFTAIL'; + +=back + =head1 NOTE This module contains a good example of how to use tie to implement a @@ -229,9 +415,10 @@ outside of it. =cut -ENDOFEND +ENDOFTAIL close(CONFIG); +close(GLOS); # Now do some simple tests on the Config.pm file we have created unshift(@INC,'lib'); @@ -239,11 +426,11 @@ require $config_pm; import Config; die "$0: $config_pm not valid" - unless $Config{'CONFIG'} eq 'true'; + unless $Config{'CONFIGDOTSH'} eq 'true'; die "$0: error processing $config_pm" if defined($Config{'an impossible name'}) - or $Config{'CONFIG'} ne 'true' # test cache + or $Config{'CONFIGDOTSH'} ne 'true' # test cache ; die "$0: error processing $config_pm"