X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/3acb769b7e0a362f74c892536b04646fe37d0929..2b4b3ebb703a73c0945957a42a77d70b29dceefb:/configpm

diff --git a/configpm b/configpm
index 5ca58c7..7d6de37 100755
--- a/configpm
+++ b/configpm
@@ -61,6 +61,36 @@ $Common{$_} = $_ foreach qw(dlext so);
 my %Extensions = map {($_,$_)}
                  qw(dynamic_ext static_ext extensions known_extensions);
 
+# The plan is that this information is used by ExtUtils::MakeMaker to generate
+# Makefile dependencies, rather than hardcoding a list, which has become out
+# of date. However, currently, MM_Unix.pm and MM_VMS.pm have *different* lists,
+# *and* descrip_mms.template doesn't actually install all the headers.
+# The "Unix" list seems to (attempt to) avoid the generated headers, which I'm
+# not sure is the right thing to do. Also, not certain whether it would be
+# easier to parse MANIFEST to get these (adding config.h, and potentially
+# removing others), but for now, stick to a hard coded list.
+
+# Could use a map to add ".h", but I suspect that it's easier to use literals,
+# so that anyone using grep will find them
+# This is the list from MM_VMS, plus pad.h, parser.h, perlsfio.h utf8.h
+# which it installs. It *doesn't* install perliol.h - FIXME.
+my @header_files = qw(EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h
+		      embed.h embedvar.h form.h gv.h handy.h hv.h intrpvar.h
+		      iperlsys.h keywords.h mg.h nostdio.h op.h opcode.h
+		      pad.h parser.h patchlevel.h perl.h perlio.h perlsdio.h
+		      perlsfio.h perlvars.h perly.h pp.h pp_proto.h proto.h
+		      regcomp.h regexp.h regnodes.h scope.h sv.h thread.h utf8.h
+		      util.h);
+
+# No point in adding fakethr.h, as it no longer works
+push @header_files,
+    $^O eq 'VMS' ? 'vmsish.h' : qw(dosish.h perliol.h time64.h unixish.h);
+
+my $header_files = '    return qw(' . join(' ', sort @header_files) . ');';
+$header_files =~ s/(?=.{64})   # If line is still overlength
+		   (.{1,64})\  # Split at the last convenient space
+		  /$1\n              /gx;
+
 # allowed opts as well as specifies default and initial values
 my %Allowed_Opts = (
     'cross'    => '', # --cross=PLATFORM - crosscompiling for PLATFORM
@@ -125,15 +155,15 @@ $heavy_txt .= <<'ENDOFBEG';
 
 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 {
@@ -173,7 +203,7 @@ sub _V {
     print "  $date\n" if defined $date;
 
     my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %ENV;
-    push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $^O eq 'cygwin';
+    push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $^O eq 'cygwin' and $ENV{CYGWIN};
 
     if (@env) {
         print "  \%ENV:\n";
@@ -183,13 +213,16 @@ sub _V {
     print "    $_\n" foreach @INC;
 }
 
+sub header_files {
 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;
@@ -204,8 +237,8 @@ $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';
 
 # 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
@@ -224,7 +257,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 {
@@ -625,10 +657,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';
@@ -676,9 +707,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;
@@ -886,6 +915,11 @@ C<perl -V>
 Returns a list of the names of locally applied patches, equivalent to what
 is shown by C<perl -V>.
 
+=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
 
 =head1 EXAMPLE