[svn:parrot] r36227 - in trunk: config/gen/makefiles lib/Parrot tools/util

[petdance at svn.parrot.org]

Author: petdance
Date: Sun Feb  1 03:51:05 2009
New Revision: 36227
URL: https://trac.parrot.org/parrot/changeset/36227

Log:
working with the cagecritic target

Modified:
   trunk/config/gen/makefiles/root.in
   trunk/lib/Parrot/BuildUtil.pm
   trunk/lib/Parrot/Configure.pm
   trunk/tools/util/perlcritic-cage.conf

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Sun Feb  1 03:50:20 2009	(r36226)
+++ trunk/config/gen/makefiles/root.in	Sun Feb  1 03:51:05 2009	(r36227)
@@ -2232,12 +2232,14 @@
 
 tags.vi.dummy:
 
+CRITIC_FILES='lib/Parrot'
+
 perlcritic:
-	perlcritic --profile tools/util/perlcritic.conf
+	perlcritic --profile tools/util/perlcritic.conf $(CRITIC_FILES)
 
 # Andy's extra-cranky Perl::Critic checking for cage cleaners
 cagecritic:
-	perlcritic -1 --profile tools/util/perlcritic-cage.conf lib/Parrot
+	perlcritic -1 --profile tools/util/perlcritic-cage.conf $(CRITIC_FILES)
 
 # This target will eventually create all the headers automatically.  If you are
 # having problems with linkage in Win32 (or elsewhere), because something is

Modified: trunk/lib/Parrot/BuildUtil.pm
==============================================================================
--- trunk/lib/Parrot/BuildUtil.pm	Sun Feb  1 03:50:20 2009	(r36226)
+++ trunk/lib/Parrot/BuildUtil.pm	Sun Feb  1 03:51:05 2009	(r36227)
@@ -1,9 +1,13 @@
-# Copyright (C) 2001-2007, The Perl Foundation.
+# Copyright (C) 2001-2009, The Perl Foundation.
 # $Id$
 
+package Parrot::BuildUtil;
+use strict;
+use warnings;
+
 =head1 NAME
 
-lib/Parrot/BuildUtil.pm - Utilities for building Parrot
+Parrot:BuildUtil - Utilities for building Parrot
 
 =head1 DESCRIPTION
 
@@ -11,12 +15,6 @@
 and C<generated_file_header>. Subroutines are not exported--each must be
 requested by using a fully qualified name.
 
-=cut
-
-package Parrot::BuildUtil;
-use strict;
-use warnings;
-
 =head1 SUBROUTINES
 
 =over 4
@@ -105,7 +103,7 @@
     my $script = File::Spec->abs2rel($0);
     $script =~ s/\\/\//g;
 
-    my $header = <<END_HEADER;
+    my $header = <<"END_HEADER";
 /* ex: set ro ft=c:
  * !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
  *

Modified: trunk/lib/Parrot/Configure.pm
==============================================================================
--- trunk/lib/Parrot/Configure.pm	Sun Feb  1 03:50:20 2009	(r36226)
+++ trunk/lib/Parrot/Configure.pm	Sun Feb  1 03:51:05 2009	(r36227)
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2008, The Perl Foundation.
+# Copyright (C) 2001-2009, The Perl Foundation.
 # $Id$
 
 =head1 NAME
@@ -364,6 +364,8 @@
     else {
         die "Mangled task in run_single_step";
     }
+
+    return;
 }
 
 sub _run_this_step {
@@ -452,6 +454,8 @@
     my ( $step, $step_name ) = @_;
     my $result = $step->result || 'no result returned';
     carp "\nstep $step_name failed: " . $result;
+
+    return;
 }
 
 
@@ -537,7 +541,7 @@
 sub replenish {
     my $conf = shift;
     my $serialized = shift;
-    foreach my $k (keys %$conf) {
+    foreach my $k (keys %{$conf}) {
         delete $conf->{$k};
     }
     local $Storable::Deparse = 1;
@@ -546,6 +550,8 @@
     while ( my ($k, $v) = each %gut ) {
         $conf->{$k} = $v;
     }
+
+    return;
 }
 
 =back

Modified: trunk/tools/util/perlcritic-cage.conf
==============================================================================
--- trunk/tools/util/perlcritic-cage.conf	Sun Feb  1 03:50:20 2009	(r36226)
+++ trunk/tools/util/perlcritic-cage.conf	Sun Feb  1 03:51:05 2009	(r36227)
@@ -11,7 +11,6 @@
 [-Documentation::RequirePodAtEnd]
 [-Documentation::RequirePodSections]
 
-[-Editor::RequireEmacsFileVariables]
 [-ErrorHandling::RequireCarping]
 
 [-InputOutput::ProhibitInteractiveTest]