Skip to content
Browse files

Remove Module::Build usage.

It adds itself to META.yml, but its presence is misleading for POE's
purposes.  POE doesn't need it to be built, configured, or installed.
  • Loading branch information...
1 parent ba53ec4 commit 054da731ea9eb83ff7c21343c2538ab9db29ad13 @rcaputo committed
Showing with 32 additions and 57 deletions.
  1. +0 −2 MANIFEST
  2. +28 −12 Makefile.PL
  3. +4 −2 mylib/PoeBuildInfo.pm
  4. +0 −41 mylib/gen-meta.perl
View
2 MANIFEST
@@ -2,7 +2,6 @@ CHANGES
HISTORY
MANIFEST This list of files
MANIFEST.SKIP
-META.yml
Makefile.PL
README
TODO
@@ -73,7 +72,6 @@ mylib/PoeBuildInfo.pm
mylib/coverage.perl
mylib/cpan-test.perl
mylib/events_per_second.pl
-mylib/gen-meta.perl
mylib/gen-tests.perl
mylib/svn-log.perl
mylib/ForkingDaemon.pm
View
40 Makefile.PL
@@ -88,14 +88,16 @@ use PoeBuildInfo qw(
CORE_REQUIREMENTS
DIST_ABSTRACT
DIST_AUTHOR
+ CONFIG_REQUIREMENTS
+ HOMEPAGE
+ REPOSITORY
);
### Touch files that will be generated at "make dist" time.
-### ExtUtils::MakeMaker and Module::Build will complain about them if
+### ExtUtils::MakeMaker will complain about them if
### they aren't present now.
open(TOUCH, ">>CHANGES") and close TOUCH;
-open(TOUCH, ">>META.yml") and close TOUCH;
### Touch gen-tests.perl so it always triggers.
@@ -189,19 +191,21 @@ EOF
}
WriteMakefile(
- NAME => 'POE',
- AUTHOR => DIST_AUTHOR,
- ABSTRACT => DIST_ABSTRACT,
+ NAME => 'POE',
+ AUTHOR => DIST_AUTHOR,
+ ABSTRACT => DIST_ABSTRACT,
+ LICENSE => 'perl',
- VERSION_FROM => 'lib/POE.pm',
- dist => {
+ CONFIGURE_REQUIRES => { CONFIG_REQUIREMENTS },
+ BUILD_REQUIRES => { CONFIG_REQUIREMENTS },
+
+ VERSION_FROM => 'lib/POE.pm',
+ dist => {
COMPRESS => 'gzip -9f',
SUFFIX => 'gz',
PREOP => (
'git-log.pl | ' .
- '/usr/bin/tee ./$(DISTNAME)-$(VERSION)/CHANGES > ./CHANGES; ' .
- "$^X mylib/gen-meta.perl; " .
- '/bin/cp -f ./META.yml ./$(DISTNAME)-$(VERSION)/META.yml'
+ '/usr/bin/tee ./$(DISTNAME)-$(VERSION)/CHANGES > ./CHANGES; '
),
},
@@ -211,9 +215,21 @@ WriteMakefile(
# Not executed on "make test".
PL_FILES => { 'mylib/gen-tests.perl' => [ 'lib/POE.pm' ] },
- # More for META.yml than anything.
- NO_META => 1,
PREREQ_PM => { CORE_REQUIREMENTS },
+
+ META_MERGE => {
+ no_index => {
+ directory => [ 'mylib' ],
+ },
+ resources => {
+ homepage => HOMEPAGE,
+ license => 'http://dev.perl.org/licenses/',
+ repository => REPOSITORY,
+ },
+ },
+
+ # TODO - ExtUtils::MakeMaker doesn't generate 'provides'.
+ # Module::Build did, but we're not using it anymore.
);
1;
View
6 mylib/PoeBuildInfo.pm
@@ -1,4 +1,4 @@
-# rocco // vim: ts=2 sw=2 expandtab
+# vim: ts=2 sw=2 expandtab
# Build information for POE. Moved into a library so it can be
# required by Makefile.PL and gen-meta.perl.
@@ -24,7 +24,9 @@ push @ISA, qw(Exporter);
sub CONFIG_REQUIREMENTS () {
- ("POE::Test::Loops" => '1.312')
+ (
+ "POE::Test::Loops" => '1.350',
+ );
}
sub CORE_REQUIREMENTS () {
View
41 mylib/gen-meta.perl
@@ -1,41 +0,0 @@
-#!/usr/bin/perl -w
-# rocco // vim: ts=2 sw=2 expandtab
-
-# Generate META.yml.
-
-use strict;
-use lib qw(./mylib);
-
-use Module::Build;
-use PoeBuildInfo qw(
- CORE_REQUIREMENTS
- DIST_ABSTRACT
- DIST_AUTHOR
- CONFIG_REQUIREMENTS
- REPOSITORY
- HOMEPAGE
-);
-
-my $build = Module::Build->new(
- dist_abstract => DIST_ABSTRACT,
- dist_author => DIST_AUTHOR,
- dist_name => 'POE',
- dist_version_from => 'lib/POE.pm',
- license => 'perl',
- requires => { CORE_REQUIREMENTS },
- build_requires => { CONFIG_REQUIREMENTS },
- configure_requires => { CONFIG_REQUIREMENTS },
- no_index => {
- directory => [ "mylib", "t" ]
- },
- meta_merge => {
- resources => {
- repository => REPOSITORY,
- homepage => HOMEPAGE,
- },
- },
-);
-
-$build->dispatch("distmeta");
-
-exit;

0 comments on commit 054da73

Please sign in to comment.
Something went wrong with that request. Please try again.