diff options
| -rwxr-xr-x | configpm | 238 | ||||
| -rw-r--r-- | embed.h | 3 | ||||
| -rw-r--r-- | global.sym | 1 | ||||
| -rw-r--r-- | interp.sym | 1 | ||||
| -rwxr-xr-x | myconfig | 20 | ||||
| -rw-r--r-- | perl.h | 2 | ||||
| -rw-r--r-- | pod/perlrun.pod | 24 | ||||
| -rw-r--r-- | writemain.SH | 13 |
8 files changed, 183 insertions, 119 deletions
@@ -4,10 +4,12 @@ $config_pm = $ARGV[0] || 'lib/Config.pm'; @ARGV = "./config.sh"; # list names to put first (and hence lookup fastest) -@fast = qw(osname osvers so libpth archlib +@fast = qw(archname osname osvers prefix libs libpth + dynamic_ext static_ext extensions dlsrc so + sig_name cc ccflags cppflags + privlibexp archlibexp installprivlib installarchlib sharpbang startsh shsharp - dynamic_ext static_ext extensions dl_src - sig_name ccflags cppflags intsize); +); # names of things which may need to have slashes changed to double-colons @extensions = qw(dynamic_ext static_ext extensions known_extensions); @@ -15,11 +17,13 @@ $config_pm = $ARGV[0] || 'lib/Config.pm'; open CONFIG, ">$config_pm" or die "Can't open $config_pm: $!\n"; $myver = sprintf("%.3f", $]); + print CONFIG <<"ENDOFBEG"; package Config; -require Exporter; +use Exporter (); \@ISA = (Exporter); \@EXPORT = qw(%Config); +\@EXPORT_OK = qw(myconfig config_sh config_vars); \$] == $myver or die sprintf "Perl lib version ($myver) doesn't match executable version (%.3f)\\n", \$]; @@ -29,51 +33,6 @@ require Exporter; ENDOFBEG -print CONFIG <<'EndOfPod'; -=head1 NAME - -Config - access Perl configuration option - -=head1 SYNOPSIS - - use Config; - if ($Config{'cc'} =~ /gcc/) { - print "built by gcc\n"; - } - -=head1 DESCRIPTION - -The Config module contains everything that was available to the -C<Configure> program at Perl build time. Shell variables from -F<config.sh> are stored in the readonly-variable C<%Config>, indexed by -their names. - -=head1 EXAMPLE - -Here's a more sophisticated example of using %Config: - - use Config; - - 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"; - } - -=head1 NOTE - -This module contains a good example of how to make a variable -readonly to those outside of it. - -=cut - -EndOfPod @fast{@fast} = @fast; @extensions{@extensions} = @extensions; @@ -98,10 +57,31 @@ while (<>) { foreach(@non_v){ print CONFIG $_ } print CONFIG "\n", - "\$config_sh=<<'!END!OF!CONFIG!';\n", + "my \$config_sh = <<'!END!';\n", join("", @v_fast, sort @v_others), - "!END!OF!CONFIG!\n\n"; + "!END!\n\n"; + +# copy config summary format from the myconfig 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*$/; +close(MYCONFIG); +print CONFIG "\n!END!\n", <<'EOT'; +my $summary_expanded = 0; + +sub myconfig { + return $summary if $summary_expanded; + $summary =~ s/\$(\w+)/$Config{$1}/ge; + $summary_expanded = 1; + $summary; +} +EOT + +# ---- print CONFIG <<'ENDOFEND'; @@ -119,66 +99,136 @@ sub FETCH { return $value; } +my $prevpos = 0; + sub FIRSTKEY { $prevpos = 0; - my $key; - ($key) = $config_sh =~ m/^(.*)=/; + my($key) = $config_sh =~ m/^(.*?)=/; $key; } sub NEXTKEY { - my ($pos, $len); - $pos = $prevpos; - $pos = index( $config_sh, "\n", $pos) + 1; + my $pos = index($config_sh, "\n", $prevpos) + 1; + my $len = index($config_sh, "=", $pos) - $pos; $prevpos = $pos; - $len = index( $config_sh, "=", $pos) - $pos; - $len > 0 ? substr( $config_sh, $pos, $len) : undef; + $len > 0 ? substr($config_sh, $pos, $len) : undef; } -sub EXISTS{ +sub EXISTS { exists($_[0]->{$_[1]}) or $config_sh =~ m/^$_[1]=/m; } -sub readonly { die "\%Config::Config is read-only\n" } +sub STORE { die "\%Config::Config is read-only\n" } +sub DELETE { &STORE } +sub CLEAR { &STORE } -sub myconfig { - my($output); - - $output = <<'END'; -Summary of my $package (patchlevel $PATCHLEVEL) configuration: - Platform: - osname=$osname, osver=$osvers, archname=$archname - uname='$myuname' - hint=$hint - Compiler: - cc='$cc', optimize='$optimize' - cppflags='$cppflags' - ccflags ='$ccflags' - ldflags ='$ldflags' - stdchar='$stdchar', d_stdstdio=$d_stdstdio, usevfork=$usevfork - voidflags=$voidflags, castflags=$castflags, d_casti32=$d_casti32, d_castneg=$d_castneg - intsize=$intsize, alignbytes=$alignbytes, usemymalloc=$usemymalloc, randbits=$randbits - Libraries: - so=$so - libpth=$libpth - libs=$libs - libc=$libc - Dynamic Linking: - dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun - cccdlflags='$cccdlflags', ccdlflags='$ccdlflags', lddlflags='$lddlflags' - -END - $output =~ s/\$(\w+)/$Config{$1}/ge; - $output; + +sub config_sh { + $config_sh } +sub config_vars { + foreach(@_){ + my $v=(exists $Config{$_}) ? $Config{$_} : 'UNKNOWN'; + $v='undef' unless defined $v; + print "$_='$v';\n"; + } +} + +1; +__END__ -sub STORE { &readonly } -sub DELETE{ &readonly } -sub CLEAR { &readonly } +=head1 NAME -sub config_sh { $config_sh } +Config - access Perl configuration information + +=head1 SYNOPSIS + + use Config; + if ($Config{'cc'} =~ /gcc/) { + print "built by gcc\n"; + } + + use Config qw(myconfig config_sh config_vars); + + print myconfig(); + + print config_sh(); + + config_vars(qw(osname archname)); + + +=head1 DESCRIPTION + +The Config module contains all the information that was available to +the C<Configure> program at Perl build time (over 900 values). + +Shell variables from the F<config.sh> 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<exists> function can be used to check is a +named variable exists. + +=over 4 + +=item myconfig() + +Returns a textual summary of the major perl configuration values. +See also C<-V> in L<perlrun/Switches>. + +=item config_sh() + +Returns the entire perl configuration information in the form of the +original config.sh shell variable assignment script. + +=item config_vars(@names) + +Prints to STDOUT the values of the named configuration variable. Each is +printed on a separate line in the form: + + name='value'; + +Names which are unknown are output as C<name='UNKNOWN';>. +See also C<-V:name> in L<perlrun/Switches>. + +=back + +=head1 EXAMPLE + +Here's a more sophisticated example of using %Config: + + use Config; + + 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"; + } + +=head1 WARNING + +Because this information is not stored within the perl executable +itself it is possible (but unlikely) that the information does not +relate to the actual perl binary which is being used to access it. + +The Config module is installed into the architecture and version +specific library directory ($Config{installarchlib}) and it checks the +perl version number when loaded. + +=head1 NOTE + +This module contains a good example of how to use tie to implement a +cache and an example of how to make a tied variable readonly to those +outside of it. + +=cut -1; ENDOFEND close(CONFIG); @@ -17,7 +17,6 @@ #define amagic_generation Perl_amagic_generation #define an Perl_an #define atan2_amg Perl_atan2_amg -#define autoboot_preamble Perl_autoboot_preamble #define band_amg Perl_band_amg #define bool__amg Perl_bool__amg #define bor_amg Perl_bor_amg @@ -1109,6 +1108,7 @@ #define perl_destruct_level (curinterp->Iperl_destruct_level) #define pidstatus (curinterp->Ipidstatus) #define preambled (curinterp->Ipreambled) +#define preambleav (curinterp->Ipreambleav) #define preprocess (curinterp->Ipreprocess) #define restartop (curinterp->Irestartop) #define rightgv (curinterp->Irightgv) @@ -1267,6 +1267,7 @@ #define Iperl_destruct_level perl_destruct_level #define Ipidstatus pidstatus #define Ipreambled preambled +#define Ipreambleav preambleav #define Ipreprocess preprocess #define Irestartop restartop #define Irightgv rightgv diff --git a/global.sym b/global.sym index 15352dd710..5f398496f5 100644 --- a/global.sym +++ b/global.sym @@ -14,7 +14,6 @@ additem amagic_generation an atan2_amg -autoboot_preamble band_amg bool__amg bor_amg diff --git a/interp.sym b/interp.sym index e6d5c3852d..8cad64be40 100644 --- a/interp.sym +++ b/interp.sym @@ -111,6 +111,7 @@ perldb perl_destruct_level pidstatus preambled +preambleav preprocess restartop rightgv @@ -14,28 +14,30 @@ else fi . $TOP/config.sh +# Note that the text lines /^Summary of/ .. /^\s*$/ are copied into Config.pm. +# XXX Add d_sigaction (?) once it's defined. + $spitshell <<!GROK!THIS! -Summary of my $package (patchlevel $PATCHLEVEL) configuration: +Summary of my $package ($baserev patchlevel $PATCHLEVEL) configuration: Platform: osname=$osname, osver=$osvers, archname=$archname uname='$myuname' - hint=$hint + hint=$hint, useposix=$useposix Compiler: - cc='$cc', optimize='$optimize', ld='$ld' + cc='$cc', optimize='$optimize', gccversion=$gccversion cppflags='$cppflags' ccflags ='$ccflags' - ldflags ='$ldflags' stdchar='$stdchar', d_stdstdio=$d_stdstdio, usevfork=$usevfork voidflags=$voidflags, castflags=$castflags, d_casti32=$d_casti32, d_castneg=$d_castneg intsize=$intsize, alignbytes=$alignbytes, usemymalloc=$usemymalloc, randbits=$randbits - Libraries: - so=$so + Linker and Libraries: + ld='$ld', ldflags ='$ldflags' libpth=$libpth libs=$libs - libc=$libc + libc=$libc, so=$so Dynamic Linking: - dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun - cccdlflags='$cccdlflags', ccdlflags='$ccdlflags', lddlflags='$lddlflags' + dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags' + cccdlflags='$cccdlflags', lddlflags='$lddlflags' !GROK!THIS! @@ -1101,7 +1101,6 @@ EXT char * oldbufptr; EXT char * oldoldbufptr; EXT char * bufend; EXT expectation expect INIT(XSTATE); /* how to interpret ambiguous tokens */ -EXT char * autoboot_preamble INIT(Nullch); EXT AV * rsfp_filters; EXT I32 multi_start; /* 1st line of multi-line string */ @@ -1366,6 +1365,7 @@ IEXT I32 Idumplvl; /* indentation level on syntax tree dump */ IEXT PMOP * Ioldlastpm; /* for saving regexp context during debugger */ IEXT I32 Igensym; /* next symbol for getsym() to define */ IEXT bool Ipreambled; +IEXT AV * Ipreambleav; IEXT int Ilaststatval IINIT(-1); IEXT I32 Ilaststype IINIT(OP_STAT); diff --git a/pod/perlrun.pod b/pod/perlrun.pod index 12ccaa8e18..1e1a0cb814 100644 --- a/pod/perlrun.pod +++ b/pod/perlrun.pod @@ -131,6 +131,12 @@ your program. runs the script under the Perl debugger. See L<perldebug>. +=item B<-d:foo> + +runs the script under the control of a debugging or tracing module +installed as Devel::foo. E.g., -d:DProf executes the script using the +Devel::DProf profiler. See L<perldebug>. + =item B<-D>I<number> =item B<-D>I<list> @@ -240,6 +246,15 @@ separator if the B<-l> switch is followed by a B<-0> switch: This sets $\ to newline and then sets $/ to the null character. +=item B<-M>I<module> + +executes C<use> I<module> C<;> before executing your script. You can +also do C<-M'Foo qw(Bar Baz)'>. + +=item B<-m>I<module> + +executes C<use> I<module> C<();> before executing your script. + =item B<-n> causes Perl to assume the following loop around your script, which @@ -358,6 +373,15 @@ warnings. prints the version and patchlevel of your Perl executable. +=item B<-V> + +prints summary of the major perl configuration values and the current +value of @INC. + +=item B<-V:name> + +Prints to STDOUT the value of the named configuration variable. + =item B<-w> prints warnings about identifiers that are mentioned only once, and diff --git a/writemain.SH b/writemain.SH index c70ac20709..e53af7d7de 100644 --- a/writemain.SH +++ b/writemain.SH @@ -90,21 +90,8 @@ if test X"$args" != "X" ; then else echo " newXS(\"${mname}::bootstrap\", boot_${cname}, file);" fi - # does this extension wish to supply automatic booting code? - for aifile in ext/$ext/AutoInit.* ; do - case $aifile in - *.c)echo " /* autoinit code from $aifile follows: */" - echo " {"; cat $aifile; echo " }" - ;; - *.pl) ai="$ai `cat $aifile | tr '\012' ' '`;" - ;; - esac - done echo " }" done - if test "X$ai" != "X"; then - echo " autoboot_preamble = \"BEGIN { $ai }\";" - fi fi cat << 'EOP' |