[poe-commits] poe/mylib Makefile-5004.pm,1.31,1.32 Makefile-5005.pm,1.50,1.51

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	Makefile-5004.pm Makefile-5005.pm 
Log Message:
Use PoeBuildInfo.pm rather than hardcode common data in both versions
of Makefile.pm.

Index: Makefile-5004.pm
===================================================================
RCS file: /cvsroot/poe/poe/mylib/Makefile-5004.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Makefile-5004.pm	26 Nov 2004 16:41:38 -0000	1.31
--- Makefile-5004.pm	26 Nov 2004 18:51:21 -0000	1.32
***************
*** 2,8 ****
  # $Id$

  use ExtUtils::MakeMaker;

! # Add a new target.

  sub MY::postamble {
--- 2,30 ----
  # $Id$

+ use strict;
+ 
  use ExtUtils::MakeMaker;

! use lib qw(./mylib);
! use PoeBuildInfo qw(
!   $clean_files
!   $dist_abstract
!   $dist_author
!   %core_requirements
!   %recommended_time_hires
! );
! 
! ### Touch files that will be generated at "make dist" time.
! ### ExtUtils::MakeMaker and Module::Build will complain about them if
! ### they aren't present now.
! 
! open(TOUCH, ">>CHANGES") and close TOUCH;
! open(TOUCH, ">>META.yml") and close TOUCH;
! 
! ### Generate dynamic test files.
! 
! system($^X, "mylib/gen-tests.perl") and die "couldn't generate tests: $!";
! 
! ### Generate Makefile.PL.

  sub MY::postamble {
***************
*** 23,37 ****

  cover: coverage
  EOF
  }

- # Generate dynamic test files.
- 
- system($^X, "mylib/gen-tests.perl") and die "couldn't generate tests: $!";
- 
- # Touch generated files so they exist.
- open(TOUCH, ">>CHANGES") and close TOUCH;
- open(TOUCH, ">>META.yml") and close TOUCH;
- 
  WriteMakefile(
    NAME           => 'POE',
--- 45,55 ----

  cover: coverage
+ 
+ ppmdist:
+ \cIecho Use a recent version of Perl to build the PPM distribution.
+ \cIfalse
  EOF
  }

  WriteMakefile(
    NAME           => 'POE',
***************
*** 41,76 ****
      COMPRESS => 'gzip -9f',
      SUFFIX   => 'gz',
!     PREOP    => (
!       './mylib/cvs-log.perl | ' .
!       'tee ./$(DISTNAME)-$(VERSION)/CHANGES > ./CHANGES'
!     ),
!   },
!   PREREQ_PM      => {
!     "Carp"               => 0,
!     "Exporter"           => 0,
!     "IO"                 => 1.20,
!     "POSIX"              => 1.02,
!     "Socket"             => 1.7,
!     "Filter::Util::Call" => 1.06,
!     "Test::More"         => 0.50,
!     "File::Spec"         => 3.01,
!     "Errno"              => 1.09,
    },
!   PL_FILES    => { },
    clean => {
!     FILES => (
!       "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 "
!     ),
    }
  );

--- 59,71 ----
      COMPRESS => 'gzip -9f',
      SUFFIX   => 'gz',
!     PREOP    => ( 'false' ),
    },
! 
    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.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Makefile-5005.pm	25 Nov 2004 16:56:22 -0000	1.50
--- Makefile-5005.pm	26 Nov 2004 18:51:21 -0000	1.51
***************
*** 4,10 ****
  use strict;

  use lib qw(./mylib);

! use ExtUtils::MakeMaker;

  eval "require ExtUtils::AutoInstall";
--- 4,26 ----
  use strict;

+ use ExtUtils::MakeMaker;
+ 
  use lib qw(./mylib);
+ use PoeBuildInfo qw(
+   $clean_files
+   $dist_abstract
+   $dist_author
+   %core_requirements
+   %recommended_time_hires
+ );

! ### Touch files that will be generated at "make dist" time.
! ### ExtUtils::MakeMaker and Module::Build will complain about them if
! ### they aren't present now.
! 
! open(TOUCH, ">>CHANGES") and close TOUCH;
! open(TOUCH, ">>META.yml") and close TOUCH;
! 
! ### Ensure ExtUtils::AutoInstall is installed.

  eval "require ExtUtils::AutoInstall";
***************
*** 15,20 ****
      "\n",
      "POE's installer magic requires ExtUtils::AutoInstall.  POE comes\n",
!     "with an older version, but it will not be installed.  You should\n",
!     "install the most recent ExtUtils::AutoInstall at your convenience.\n",
      "\n",
      "====================================================================\n",
--- 31,37 ----
      "\n",
      "POE's installer magic requires ExtUtils::AutoInstall.  POE comes\n",
!     "with its own version, but it is usually out of date and won't be\n",
!     "installed.  You should install the most recent version at your\n",
!     "earliest convenience.\n",
      "\n",
      "====================================================================\n",
***************
*** 25,39 ****
  }

! 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,
! );

  ExtUtils::AutoInstall->import(
--- 42,46 ----
  }

! ### Prompt for additional modules.

  ExtUtils::AutoInstall->import(
***************
*** 42,46 ****
    "Recommended modules to increase timer/alarm/delay accuracy." => [
        -default      => 0,
!       'Time::HiRes' => '1.59',
    ],
    "Optional modules to speed up large-scale clients/servers." => [
--- 49,53 ----
    "Recommended modules to increase timer/alarm/delay accuracy." => [
        -default      => 0,
!       %recommended_time_hires,
    ],
    "Optional modules to speed up large-scale clients/servers." => [
***************
*** 89,99 ****
  );

! # Generate dynamic test files.

  system($^X, "mylib/gen-tests.perl") and die "couldn't generate tests: $!";

! # Touch generated files so they exist.
! open(TOUCH, ">>CHANGES") and close TOUCH;
! open(TOUCH, ">>META.yml") and close TOUCH;

  sub MY::postamble {
--- 96,104 ----
  );

! ### Generate dynamic test files.

  system($^X, "mylib/gen-tests.perl") and die "couldn't generate tests: $!";

! ### Generate Makefile.PL.

  sub MY::postamble {
***************
*** 131,136 ****
      ($^O eq 'MacOS')
      ? ()
!     : ( AUTHOR   => 'Rocco Caputo <rc...@cp...>',
!         ABSTRACT => 'A highly portable networking and multitasking framework.',
        )
    ),
--- 136,141 ----
      ($^O eq 'MacOS')
      ? ()
!     : ( AUTHOR   => $dist_author,
!         ABSTRACT => $dist_abstract,
        )
    ),
***************
*** 143,166 ****
        './mylib/cvs-log.perl | ' .
        '/usr/bin/tee ./$(DISTNAME)-$(VERSION)/CHANGES > ./CHANGES; ' .
!       "$^X Build.PL; " .
!       './Build distmeta; ' .
        '/bin/cp -f ./META.yml ./$(DISTNAME)-$(VERSION)/META.yml'
      ),
    },

!   clean          => {
!     FILES => (
!       "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 "
!     ),
    },

--- 148,158 ----
        './mylib/cvs-log.perl | ' .
        '/usr/bin/tee ./$(DISTNAME)-$(VERSION)/CHANGES > ./CHANGES; ' .
!       "$^X mylib/gen-meta.perl; " .
        '/bin/cp -f ./META.yml ./$(DISTNAME)-$(VERSION)/META.yml'
      ),
    },

!   clean => {
!     FILES => $clean_files,
    },