Author: jkeenan Date: Wed Nov 28 19:36:14 2007 New Revision: 23229 Modified: branches/initp5/config/auto/alignptrs.pm branches/initp5/config/auto/gdbm.pm branches/initp5/config/auto/gmp.pm branches/initp5/config/auto/m4.pm branches/initp5/config/auto/pack.pm branches/initp5/config/auto/readline.pm branches/initp5/config/auto/signal.pm branches/initp5/config/auto/socklen_t.pm branches/initp5/config/gen/config_h.pm branches/initp5/config/gen/config_pm.pm branches/initp5/config/gen/platform.pm branches/initp5/config/init/defaults.pm branches/initp5/config/init/hints/linux.pm branches/initp5/config/init/hints/openbsd.pm branches/initp5/config/init/optimize.pm
Log: Implement use of Parrot::Configure::Data::set_p5() and get_p5() methods in 15 modules under config/. Modified: branches/initp5/config/auto/alignptrs.pm ============================================================================== --- branches/initp5/config/auto/alignptrs.pm (original) +++ branches/initp5/config/auto/alignptrs.pm Wed Nov 28 19:36:14 2007 @@ -43,7 +43,7 @@ $align = $conf->data->get('ptr_alignment'); $result_str .= "configured: "; } - elsif ( $^O eq 'hpux' && $conf->data->get('p5Config_ccflags') !~ /DD64/ ) { + elsif ( $^O eq 'hpux' && $conf->data->get_p5('ccflags') !~ /DD64/ ) { # HP-UX 10.20/32 hangs in this test. $align = 4; Modified: branches/initp5/config/auto/gdbm.pm ============================================================================== --- branches/initp5/config/auto/gdbm.pm (original) +++ branches/initp5/config/auto/gdbm.pm Wed Nov 28 19:36:14 2007 @@ -52,7 +52,7 @@ my $linkflags = $conf->data->get('linkflags'); my $ccflags = $conf->data->get('ccflags'); - my $osname = $conf->data->get('p5Config_osname'); + my $osname = $conf->data->get_p5('osname'); # On OS X check the presence of the gdbm header in the standard # Fink location. Modified: branches/initp5/config/auto/gmp.pm ============================================================================== --- branches/initp5/config/auto/gmp.pm (original) +++ branches/initp5/config/auto/gmp.pm Wed Nov 28 19:36:14 2007 @@ -61,7 +61,7 @@ $conf->data->add( ' ', libs => '-lgmp' ); } - my $osname = $conf->data->get('p5Config_osname'); + my $osname = $conf->data->get_p5('osname'); # On OS X check the presence of the gmp header in the standard # Fink location. Modified: branches/initp5/config/auto/m4.pm ============================================================================== --- branches/initp5/config/auto/m4.pm (original) +++ branches/initp5/config/auto/m4.pm Wed Nov 28 19:36:14 2007 @@ -39,7 +39,7 @@ $verbose = $conf->options->get( 'verbose' ); print $/ if $verbose; - my $archname = $conf->data->get('p5Config_archname'); + my $archname = $conf->data->get_p5('archname'); my ( $cpuarch, $osname ) = split m/-/, $archname, 2; if ( !defined $osname ) { ( $osname, $cpuarch ) = ( $cpuarch, "" ); Modified: branches/initp5/config/auto/pack.pm ============================================================================== --- branches/initp5/config/auto/pack.pm (original) +++ branches/initp5/config/auto/pack.pm Wed Nov 28 19:36:14 2007 @@ -48,7 +48,7 @@ if ( ( $] >= 5.006 ) && ( $size == $longsize ) && - ( $size == $conf->data->get('p5Config_longsize') ) + ( $size == $conf->data->get_p5('longsize') ) ) { $format = 'l!'; } @@ -56,7 +56,7 @@ $format = 'l'; } elsif ( $size == 8 || - $conf->data->get('p5Config_use64bitint') eq 'define' ) { + $conf->data->get_p5('use64bitint') eq 'define' ) { # pp_pack is annoying, and this won't work unless sizeof(UV) >= 8 $format = 'q'; } Modified: branches/initp5/config/auto/readline.pm ============================================================================== --- branches/initp5/config/auto/readline.pm (original) +++ branches/initp5/config/auto/readline.pm Wed Nov 28 19:36:14 2007 @@ -51,7 +51,7 @@ $conf->data->add( ' ', libs => '-lreadline' ); } - my $osname = $conf->data->get('p5Config_osname'); + my $osname = $conf->data->get_p5('osname'); # On OS X check the presence of the readline header in the standard # Fink/macports location. Modified: branches/initp5/config/auto/signal.pm ============================================================================== --- branches/initp5/config/auto/signal.pm (original) +++ branches/initp5/config/auto/signal.pm Wed Nov 28 19:36:14 2007 @@ -86,7 +86,7 @@ EOF my ( $i, $name ); $i = 0; - foreach $name ( split( ' ', $conf->data->get('p5Config_sig_name') ) ) { + foreach $name ( split( ' ', $conf->data->get_p5('sig_name') ) ) { print {$O} ".constant SIG$name\t$i\n" if $i; $i++; } Modified: branches/initp5/config/auto/socklen_t.pm ============================================================================== --- branches/initp5/config/auto/socklen_t.pm (original) +++ branches/initp5/config/auto/socklen_t.pm Wed Nov 28 19:36:14 2007 @@ -44,7 +44,7 @@ my $conf = shift; return $conf->data->get('has_socklen_t') || - $conf->data->get('p5Config_d_socklen_t'); + $conf->data->get_p5('d_socklen_t'); } sub _evaluate_socklen_t { Modified: branches/initp5/config/gen/config_h.pm ============================================================================== --- branches/initp5/config/gen/config_h.pm (original) +++ branches/initp5/config/gen/config_h.pm Wed Nov 28 19:36:14 2007 @@ -71,7 +71,6 @@ EOF for ( sort( $conf->data->keys() ) ) { - next if /^p5Config_/; next unless /i_(\w+)/; if ( $conf->data->get($_) ) { print {$HH} "#define PARROT_HAS_HEADER_\U$1 1\n"; @@ -108,7 +107,6 @@ EOF for ( sort( $conf->data->keys() ) ) { - next if /^p5Config_/; next unless /HAS_(\w+)/; if ( $conf->data->get($_) ) { print {$HH} "#define PARROT_HAS_\U$1 1\n"; @@ -122,7 +120,6 @@ EOF for ( sort( $conf->data->keys() ) ) { - next if /^p5Config_/; next unless /D_(\w+)/; my $val; if ( $val = $conf->data->get($_) ) { Modified: branches/initp5/config/gen/config_pm.pm ============================================================================== --- branches/initp5/config/gen/config_pm.pm (original) +++ branches/initp5/config/gen/config_pm.pm Wed Nov 28 19:36:14 2007 @@ -38,13 +38,6 @@ $conf->data->clean; - my @p5Config_keys; - foreach my $key (keys %{$conf->data->{c}}) { - my $del = delete $conf->data->{c}->{$key} - if $key =~ /^p5Config_/; - push @p5Config_keys, $del; - } - genfile( 'config/gen/config_pm/myconfig.in', 'myconfig' ); open( my $IN, "<", "config/gen/config_pm/Config_pm.in" ) Modified: branches/initp5/config/gen/platform.pm ============================================================================== --- branches/initp5/config/gen/platform.pm (original) +++ branches/initp5/config/gen/platform.pm Wed Nov 28 19:36:14 2007 @@ -41,7 +41,7 @@ $platform = "win32" if $platform =~ /^mingw/; $platform =~ s/^ms//; - if ( ( split m/-/, $conf->data->get('p5Config_archname'), 2 )[0] eq 'ia64' ) { + if ( ( split m/-/, $conf->data->get_p5('archname'), 2 )[0] eq 'ia64' ) { $platform = 'ia64'; } Modified: branches/initp5/config/init/defaults.pm ============================================================================== --- branches/initp5/config/init/defaults.pm (original) +++ branches/initp5/config/init/defaults.pm Wed Nov 28 19:36:14 2007 @@ -60,13 +60,12 @@ sig_name use64bitint | ) { - $conf->data->set( qq{p5Config_$orig} => $Config{$orig} ); + $conf->data->set_p5( $orig => $Config{$orig} ); } # Stage 2 (anticipating needs of config/auto/headers.pm): - $conf->data->set( - map { q|p5Config_| . $_ => $Config{$_} } - grep { /^i_/ } keys %Config + $conf->data->set_p5( + map { $_ => $Config{$_} } grep { /^i_/ } keys %Config ); # We need a Glossary somewhere! Modified: branches/initp5/config/init/hints/linux.pm ============================================================================== --- branches/initp5/config/init/hints/linux.pm (original) +++ branches/initp5/config/init/hints/linux.pm Wed Nov 28 19:36:14 2007 @@ -144,7 +144,7 @@ libparrot_soname => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)', ); - if ( ( split( m/-/, $conf->data->get('p5Config_archname'), 2 ) )[0] eq 'ia64' ) { + if ( ( split( m/-/, $conf->data->get_p5('archname'), 2 ) )[0] eq 'ia64' ) { $conf->data->set( platform_asm => 1 ); } Modified: branches/initp5/config/init/hints/openbsd.pm ============================================================================== --- branches/initp5/config/init/hints/openbsd.pm (original) +++ branches/initp5/config/init/hints/openbsd.pm Wed Nov 28 19:36:14 2007 @@ -21,7 +21,7 @@ } $conf->data->set( libs => $libs ); - if ( ( split( m/-/, $conf->data->get('p5Config_archname'), 2 ) )[0] eq 'powerpc' ) { + if ( ( split( m/-/, $conf->data->get_p5('archname'), 2 ) )[0] eq 'powerpc' ) { $conf->data->set( as => 'as -mregnames' ); } Modified: branches/initp5/config/init/optimize.pm ============================================================================== --- branches/initp5/config/init/optimize.pm (original) +++ branches/initp5/config/init/optimize.pm Wed Nov 28 19:36:14 2007 @@ -55,7 +55,7 @@ # use perl5's value # gcc 4.1 doesn't like -mcpu=xx, i.e. it's deprecated - my $opts = $conf->data->get('p5Config_optimize'); + my $opts = $conf->data->get_p5('optimize'); my $gccversion = $conf->data->get( 'gccversion' ); my $arch_opt = 'cpu'; if ( defined $gccversion and $gccversion > 3.3 ) {