[svn:parrot] r37601 - in trunk: . config/auto lib/Parrot/Configure/Options lib/Parrot/Configure/Options/Conf t/steps

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Thu Mar 19 23:32:59 2009
New Revision: 37601
URL: https://trac.parrot.org/parrot/changeset/37601

Log:
Merge remove_pmc_option branch into trunk.  This removes the '--pmc' option
from Configure.pl along with associated documentation and tests. Cf.:
https://trac.parrot.org/parrot/ticket/310.

Modified:
   trunk/Configure.pl
   trunk/config/auto/pmc.pm
   trunk/lib/Parrot/Configure/Options/Conf.pm
   trunk/lib/Parrot/Configure/Options/Conf/Shared.pm
   trunk/t/steps/auto_pmc-01.t

Modified: trunk/Configure.pl
==============================================================================
--- trunk/Configure.pl	Thu Mar 19 21:04:49 2009	(r37600)
+++ trunk/Configure.pl	Thu Mar 19 23:32:59 2009	(r37601)
@@ -311,10 +311,6 @@
 
 Use the given ops files.
 
-=item C<--pmc=(files)>
-
-Use the given PMC files.
-
 =item C<--cgoto=0>
 
 Don't build cgoto core. This is recommended when you are short of memory.
@@ -585,7 +581,6 @@
     inter::encoding
     inter::types
     auto::ops
-    auto::pmc
     auto::alignptrs
     auto::headers
     auto::sizes

Modified: trunk/config/auto/pmc.pm
==============================================================================
--- trunk/config/auto/pmc.pm	Thu Mar 19 21:04:49 2009	(r37600)
+++ trunk/config/auto/pmc.pm	Thu Mar 19 23:32:59 2009	(r37601)
@@ -7,7 +7,7 @@
 
 =head1 DESCRIPTION
 
-Asks the user to select which PMC files to include.
+Prepare PMC files for inclusion.
 
 =cut
 
@@ -38,9 +38,7 @@
 
     my @pmc = sort_pmcs( @{ $self->{srcpmc} } );
 
-    my $pmc_list = $conf->options->get('pmc')
-        ? $conf->options->get('pmc')
-        : join( ' ', grep { defined $_ } @pmc );
+    my $pmc_list = join( ' ', grep { defined $_ } @pmc );
 
     # names of class files for src/pmc/Makefile
     ( my $TEMP_pmc_o   = $pmc_list ) =~ s/\.pmc/\$(O)/g;

Modified: trunk/lib/Parrot/Configure/Options/Conf.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Options/Conf.pm	Thu Mar 19 21:04:49 2009	(r37600)
+++ trunk/lib/Parrot/Configure/Options/Conf.pm	Thu Mar 19 23:32:59 2009	(r37601)
@@ -87,7 +87,6 @@
    --floatval=(type)    Use the given type for FLOATVAL
    --opcode=(type)      Use the given type for opcodes
    --ops=(files)        Use the given ops files
-   --pmc=(files)        Use the given PMC files
 
    --cgoto=0            Don't build cgoto core - recommended when short of mem
    --jitcapable         Use JIT

Modified: trunk/lib/Parrot/Configure/Options/Conf/Shared.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Options/Conf/Shared.pm	Thu Mar 19 21:04:49 2009	(r37600)
+++ trunk/lib/Parrot/Configure/Options/Conf/Shared.pm	Thu Mar 19 23:32:59 2009	(r37601)
@@ -56,7 +56,6 @@
     ops
     optimize
     parrot_is_shared
-    pmc
     prefix
     profile
     sbindir

Modified: trunk/t/steps/auto_pmc-01.t
==============================================================================
--- trunk/t/steps/auto_pmc-01.t	Thu Mar 19 21:04:49 2009	(r37600)
+++ trunk/t/steps/auto_pmc-01.t	Thu Mar 19 23:32:59 2009	(r37601)
@@ -5,7 +5,7 @@
 
 use strict;
 use warnings;
-use Test::More tests =>  32;
+use Test::More tests =>  28;
 use Carp;
 use Cwd;
 use File::Path qw| mkpath |;
@@ -141,92 +141,6 @@
     ok( chdir $cwd, 'changed back to original directory after testing' );
 }
 
-$conf->replenish($serialized);
-
-########## --pmc ##########
-# What happens when user tells Configure.pl to use only 
-# specified PMCs to build Parrot?
-###########################
-
-my @dummy_options = qw(
-    default.pmc
-    null.pmc
-    env.pmc
-    key.pmc
-    random.pmc
-    unmanagedstruct.pmc
-    managedstruct.pmc
-    exception.pmc
-    parrotlibrary.pmc
-    parrotinterpreter.pmc
-    parrotthread.pmc
-    lexpad.pmc
-    timer.pmc
-    pointer.pmc
-    sub.pmc
-    continuation.pmc
-    retcontinuation.pmc
-    exceptionhandler.pmc
-    coroutine.pmc
-    eval.pmc
-    nci.pmc
-    float.pmc
-    integer.pmc
-    bigint.pmc
-    complex.pmc
-    string.pmc
-    boolean.pmc
-    ref.pmc
-    sharedref.pmc
-    array.pmc
-    fixedintegerarray.pmc
-    iterator.pmc
-    fixedstringarray.pmc
-    hash.pmc
-    orderedhash.pmc
-    os.pmc
-    file.pmc
-    addrregistry.pmc
-    bound_nci.pmc
-    capture.pmc
-    class.pmc
-    codestring.pmc
-    exporter.pmc
-    fixedbooleanarray.pmc
-    fixedfloatarray.pmc
-    fixedpmcarray.pmc
-    lexinfo.pmc
-    multisub.pmc
-    namespace.pmc
-    object.pmc
-    parrotrunningthread.pmc
-    pccmethod_test.pmc
-    pmcproxy.pmc
-    resizablebooleanarray.pmc
-    resizablefloatarray.pmc
-    resizableintegerarray.pmc
-    resizablepmcarray.pmc
-    resizablestringarray.pmc
-    role.pmc
-    scalar.pmc
-    scheduler.pmc
-    task.pmc
-    undef.pmc
-);
-my $dummy_options = join q{ } => @dummy_options;
-
-($args, $step_list_ref) = process_options(
-    {
-        argv => [ qq{--pmc=$dummy_options} ],
-        mode => q{configure},
-    }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-
 pass("Completed all tests in $0");
 
 ################### DOCUMENTATION ###################