[poe-commits] poe/mylib Makefile-5004.pm,1.33,1.34 Makefile-5005.pm,1.51,1.52 PoeBuildInfo.pm,1.1,1.2 gen-meta.perl,1.1,1.2

[<rc...@us...>]

Update of /cvsroot/poe/poe/mylib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19218/mylib

Modified Files:
	Makefile-5004.pm Makefile-5005.pm PoeBuildInfo.pm 
	gen-meta.perl 
Log Message:
Switch from variables to "constant" subroutines.  Just because it
compiles, and it looks like it's runnig, doesn't mean it works.  Check
the messages more carefully before committing next time.


Index: Makefile-5004.pm
===================================================================
RCS file: /cvsroot/poe/poe/mylib/Makefile-5004.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Makefile-5004.pm	26 Nov 2004 19:02:19 -0000	1.33
--- Makefile-5004.pm	26 Nov 2004 21:21:54 -0000	1.34
***************
*** 8,16 ****
  use lib qw(./mylib);
  use PoeBuildInfo qw(
!   $clean_files
!   $dist_abstract
!   $dist_author
!   %core_requirements
!   %recommended_time_hires
  );
  
--- 8,13 ----
  use lib qw(./mylib);
  use PoeBuildInfo qw(
!   CLEAN_FILES
!   CORE_REQUIREMENTS
  );
  
***************
*** 66,74 ****
  
    clean => {
!     FILES => $clean_files,
    },
  
    PL_FILES    => { },
!   PREREQ_PM => \%core_requirements,
  );
  
--- 63,71 ----
  
    clean => {
!     FILES => CLEAN_FILES,
    },
  
    PL_FILES    => { },
!   PREREQ_PM => { CORE_REQUIREMENTS },
  );
  

Index: Makefile-5005.pm
===================================================================
RCS file: /cvsroot/poe/poe/mylib/Makefile-5005.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** Makefile-5005.pm	26 Nov 2004 18:51:21 -0000	1.51
--- Makefile-5005.pm	26 Nov 2004 21:21:54 -0000	1.52
***************
*** 8,16 ****
  use lib qw(./mylib);
  use PoeBuildInfo qw(
!   $clean_files
!   $dist_abstract
!   $dist_author
!   %core_requirements
!   %recommended_time_hires
  );
  
--- 8,16 ----
  use lib qw(./mylib);
  use PoeBuildInfo qw(
!   CLEAN_FILES
!   CORE_REQUIREMENTS
!   DIST_ABSTRACT
!   DIST_AUTHOR
!   RECOMMENDED_TIME_HIRES
  );
  
***************
*** 46,53 ****
  ExtUtils::AutoInstall->import(
    -version => '0.50',
!   -core => [ %core_requirements ],
    "Recommended modules to increase timer/alarm/delay accuracy." => [
        -default      => 0,
!       %recommended_time_hires,
    ],
    "Optional modules to speed up large-scale clients/servers." => [
--- 46,53 ----
  ExtUtils::AutoInstall->import(
    -version => '0.50',
!   -core => [ CORE_REQUIREMENTS ],
    "Recommended modules to increase timer/alarm/delay accuracy." => [
        -default      => 0,
!       RECOMMENDED_TIME_HIRES,
    ],
    "Optional modules to speed up large-scale clients/servers." => [
***************
*** 136,141 ****
      ($^O eq 'MacOS')
      ? ()
!     : ( AUTHOR   => $dist_author,
!         ABSTRACT => $dist_abstract,
        )
    ),
--- 136,141 ----
      ($^O eq 'MacOS')
      ? ()
!     : ( AUTHOR   => DIST_AUTHOR,
!         ABSTRACT => DIST_ABSTRACT,
        )
    ),
***************
*** 154,158 ****
  
    clean => {
!     FILES => $clean_files,
    },
  
--- 154,158 ----
  
    clean => {
!     FILES => CLEAN_FILES,
    },
  
***************
*** 160,164 ****
    PL_FILES       => { },
    NO_META        => 1,
!   PREREQ_PM      => \%core_requirements,
  );
  
--- 160,164 ----
    PL_FILES       => { },
    NO_META        => 1,
!   PREREQ_PM      => { CORE_REQUIREMENTS },
  );
  

Index: PoeBuildInfo.pm
===================================================================
RCS file: /cvsroot/poe/poe/mylib/PoeBuildInfo.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PoeBuildInfo.pm	26 Nov 2004 18:49:55 -0000	1.1
--- PoeBuildInfo.pm	26 Nov 2004 21:21:54 -0000	1.2
***************
*** 13,53 ****
  
  @EXPORT_OK = qw(
!   $clean_files
!   $dist_abstract
!   $dist_author
!   %core_requirements
!   %recommended_time_hires
  );
  
! my %core_requirements = (
!   "Carp"               => 0,
!   "Exporter"           => 0,
!   "IO"                 => 1.20,
!   "POSIX"              => 1.02,
!   "Socket"             => 1.7,
!   "Filter::Util::Call" => 1.06,
!   "Test::More"         => 0.47,
!   "File::Spec"         => 0.87,
!   "Errno"              => 1.09,
! );
  
! my %recommended_time_hires = ( "Time::HiRes" => 1.59 );
  
! my $dist_author   = 'Rocco Caputo <rc...@cp...>';
! my $dist_abstract = 'A portable networking and multitasking framework.';
  
! my @clean_files = qw(
!   coverage.report
!   poe_report.xml
!   run_network_tests
!   tests/20_resources/10_perl/*
!   tests/20_resources/20_xs/*
!   tests/30_loops/10_select/*
!   tests/30_loops/20_poll/*
!   tests/30_loops/30_event/*
!   tests/30_loops/40_gtk/*
!   tests/30_loops/50_tk/*
!   test-output.err
! );
! my $clean_files = "@clean_files";
  
--- 13,65 ----
  
  @EXPORT_OK = qw(
!   CLEAN_FILES
!   CORE_REQUIREMENTS
!   DIST_ABSTRACT
!   DIST_AUTHOR
!   RECOMMENDED_TIME_HIRES
  );
  
! sub CORE_REQUIREMENTS () {
!   (
!     "Carp"               => 0,
!     "Exporter"           => 0,
!     "IO"                 => 1.20,
!     "POSIX"              => 1.02,
!     "Socket"             => 1.7,
!     "Filter::Util::Call" => 1.06,
!     "Test::More"         => 0.47,
!     "File::Spec"         => 0.87,
!     "Errno"              => 1.09,
!   )
! }
  
! sub RECOMMENDED_TIME_HIRES () {
!   ( "Time::HiRes" => 1.59 )
! }
  
! sub DIST_AUTHOR () {
!   ( 'Rocco Caputo <rc...@cp...>' )
! }
  
! sub DIST_ABSTRACT () {
!   ( 'A portable networking and multitasking framework.' )
! }
  
+ sub CLEAN_FILES () {
+   my @clean_files = qw(
+     coverage.report
+     poe_report.xml
+     run_network_tests
+     tests/20_resources/10_perl/*
+     tests/20_resources/20_xs/*
+     tests/30_loops/10_select/*
+     tests/30_loops/20_poll/*
+     tests/30_loops/30_event/*
+     tests/30_loops/40_gtk/*
+     tests/30_loops/50_tk/*
+     test-output.err
+   );
+   "@clean_files";
+ }
+ 
+ 1;

Index: gen-meta.perl
===================================================================
RCS file: /cvsroot/poe/poe/mylib/gen-meta.perl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gen-meta.perl	26 Nov 2004 18:47:57 -0000	1.1
--- gen-meta.perl	26 Nov 2004 21:21:54 -0000	1.2
***************
*** 9,28 ****
  use Module::Build;
  use PoeBuildInfo qw(
!   $dist_abstract
!   $dist_author
!   %core_requirements
!   %recommended_time_hires
  );
  
  my $build = Module::Build->new(
!   dist_abstract     => $dist_abstract,
!   dist_author       => $dist_author,
    dist_name         => 'POE',
    dist_version_from => 'lib/POE.pm',
    license           => 'perl',
    recommends        => {
!     %recommended_time_hires,
    },
!   requires          => \%core_requirements,
  );
  
--- 9,28 ----
  use Module::Build;
  use PoeBuildInfo qw(
!   CORE_REQUIREMENTS
!   DIST_ABSTRACT
!   DIST_AUTHOR
!   RECOMMENDED_TIME_HIRES
  );
  
  my $build = Module::Build->new(
!   dist_abstract     => DIST_ABSTRACT,
!   dist_author       => DIST_AUTHOR,
    dist_name         => 'POE',
    dist_version_from => 'lib/POE.pm',
    license           => 'perl',
    recommends        => {
!     RECOMMENDED_TIME_HIRES,
    },
!   requires          => { CORE_REQUIREMENTS },
  );