X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=configpm;h=8c53dbb7249c707087ee036ac905a704075dd0d2;hb=7ce18cd550b1bab2307a39ab5ca99680532c3fb2;hp=1fef6fe1b2c629e651d627ff1a7af60a03fc40d0;hpb=44a8e56aa037ed0f03f0506f6f85f5ed290c78e1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/configpm b/configpm
index 1fef6fe..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
 );
@@ -18,13 +19,25 @@ $config_pm = $ARGV[0] || 'lib/Config.pm';
 open CONFIG, ">$config_pm" or die "Can't open $config_pm: $!\n";
 $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;
+}
 
+ENDOFBEG_NOQ
 \$] == $myver
   or die "Perl lib version ($myver) doesn't match executable version (\$])";
 
@@ -43,19 +56,34 @@ $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 ($in_v or m/^(\w+)='(.*\n)/){
+    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;
     }
+    $quote = $2;
     if ($in_v) { $val .= $_;             }
-    else       { ($name,$val) = ($1,$2); }
-    $in_v = $val !~ /'\n/;
+    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, "$name='$val"); next; }
-    push(@v_fast,"$name='$val");
+    if (!$fast{$name}){ push(@v_others, "$name=$quote$val"); next; }
+    push(@v_fast,"$name=$quote$val");
 }
 
 foreach(@non_v){ print CONFIG $_ }
@@ -65,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,"<myconfig") || die "open myconfig failed: $!";
-1 while( ($_=<MYCONFIG>) !~ /^Summary of/);
-do { print CONFIG $_ } until ($_ = <MYCONFIG>) =~ /^\s*$/;
+open(MYCONFIG,"<myconfig.SH") || die "open myconfig.SH failed: $!";
+1 while defined($_ = <MYCONFIG>) && !/^Summary of/;
+do { print CONFIG $_ } until !defined($_ = <MYCONFIG>) || /^\s*$/;
 close(MYCONFIG);
 
 print CONFIG "\n!END!\n", <<'EOT';
@@ -79,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;
 }
@@ -94,17 +123,41 @@ sub FETCH {
     return $_[0]->{$_[1]} if (exists $_[0]->{$_[1]});
 
     # Search for it in the big string 
-    my($value, $start, $marker);
-    $marker = "$_[1]='";
+    my($value, $start, $marker, $quote_type);
+    $marker = "$_[1]=";
+    $quote_type = "'";
     # return undef unless (($value) = $config_sh =~ m/^$_[1]='(.*)'\s*$/m);
-    $start = index($config_sh, "\n$marker");
+    # 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) { $start = length($marker) } 
-        else { $start += length($marker) + 1 }
+    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, qq('\n), $start) - $start);
+        index($config_sh, "$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\"";
+    }
+    #$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;
@@ -120,7 +173,9 @@ sub FIRSTKEY {
 }
 
 sub NEXTKEY {
-    my $pos = index($config_sh, qq('\n), $prevpos) + 2;
+    # 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;
@@ -130,7 +185,9 @@ sub EXISTS {
     # 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]='";
+    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" }
@@ -179,6 +236,9 @@ ENDOFSET
 
 print CONFIG <<'ENDOFTAIL';
 
+# avoid Config..Exporter..UNIVERSAL search for DESTROY then AUTOLOAD
+sub DESTROY { }
+
 tie %Config, 'Config';
 
 1;
@@ -245,17 +305,23 @@ See also C<-V:name> in L<perlrun/Switches>.
 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
@@ -268,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<Config> variables are determined by the C<Configure> script
+on platforms supported by it (which is most UNIX platforms).  Some
+platforms have custom-made C<Config> 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 <<EOF if $text;
+=back
+
+EOF
+    print CONFIG <<EOF;
+=head2 $c
+
+=over
+
+EOF
+    $text = 1;
+  }
+  s/n't/n\00t/g;		# leave can't, won't etc untouched
+  s/^\t\s+(.*)/\n\t$1\n/gm;	# Indented lines ===> paragraphs
+  s/^(?<!\n\n)\t(.*)/$1/gm;	# Not indented lines ===> 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{
+     (?<! [\w./<\'\"] )		# Only standalone file names
+     (?! e \. g \. )		# Not e.g.
+     (?! \. \. \. )		# Not ...
+     (?! \d )			# Not 5.004
+     ( [\w./]* [./] [\w./]* )	# Require . or / inside
+     (?<! \. (?= \s ) )		# Do not include trailing dot
+     (?! [\w/] )		# Include all of it
+   }
+   (F<$1>)xg;			# /usr/local
+  s/((?<=\s)~\w*)/F<$1>/g;	# ~name
+  s/(?<![.<\'\"])\b([A-Z_]{2,})\b(?![\'\"])/C<$1>/g;	# UNISTD
+  s/(?<![.<\'\"])\b(?!the\b)(\w+)\s+macro\b/C<$1> macro/g; # FILE_cnt macro
+  s/n[\0]t/n't/g;		# undo can't, won't damage
+}
+
+<GLOS>;				# Skip the preamble
+while (<GLOS>) {
+  process;
+  print CONFIG;
+}
+
+print CONFIG <<'ENDOFTAIL';
+
+=back
+
 =head1 NOTE
 
 This module contains a good example of how to use tie to implement a
@@ -279,6 +418,7 @@ outside of it.
 ENDOFTAIL
 
 close(CONFIG);
+close(GLOS);
 
 # Now do some simple tests on the Config.pm file we have created
 unshift(@INC,'lib');
@@ -286,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"