Skip to content

Commit

Permalink
Updated manifest and Makefile.PL defaults.
Browse files Browse the repository at this point in the history 
We now define a minimum perl version, and generate our MANIFEST
programattically
  • Loading branch information
@skx
skx committed Sep 6, 2014
1 parent 9900eb1 commit 7c485bb
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 72 deletions.
38 changes: 1 addition & 37 deletions MANIFEST
View file
Original file line number Diff line number Diff line change
@@ -1,68 +1,34 @@
bin/templer
bin/templer-generate
ChangeLog
examples/
examples/breadcrumbs
examples/breadcrumbs/input
examples/breadcrumbs/input/index.skx
examples/breadcrumbs/input/robots.txt
examples/breadcrumbs/input/software
examples/breadcrumbs/input/software/example
examples/breadcrumbs/input/software/example/index.skx
examples/breadcrumbs/input/software/index.skx
examples/breadcrumbs/layouts
examples/breadcrumbs/layouts/default.layout
examples/breadcrumbs/templer.cfg
examples/complex
examples/complex/input
examples/complex/input/dark.css
examples/complex/input/file.skx
examples/complex/input/file.wgn
examples/complex/input/glob.skx
examples/complex/input/glob.wgn
examples/complex/input/img
examples/complex/input/img/cat1.jpg
examples/complex/input/img/cat2.jpg
examples/complex/input/index.skx
examples/complex/input/index.wgn
examples/complex/input/jquery.min.js
examples/complex/input/layout.skx
examples/complex/input/layout.wgn
examples/complex/input/page.skx
examples/complex/input/page.wgn
examples/complex/input/sidebar.inc
examples/complex/input/structure.skx
examples/complex/input/structure.wgn
examples/complex/input/style.css
examples/complex/input/stylesheet.skx
examples/complex/input/stylesheet.wgn
examples/complex/input/variables.skx
examples/complex/input/variables.wgn
examples/complex/layouts
examples/complex/layouts/default.layout
examples/complex/templer.cfg
examples/simple
examples/simple/input
examples/simple/input/about.skx
examples/simple/input/foo.skx
examples/simple/input/index.skx
examples/simple/input/robots.txt
examples/simple/layouts
examples/simple/layouts/default.layout
examples/simple/templer.cfg
examples/symlinks
examples/symlinks/input
examples/symlinks/input/index.skx
examples/symlinks/input/index.wgn
examples/symlinks/input/js
examples/symlinks/input/js/jquery
examples/symlinks/input/js/jquery-1.8.3
examples/symlinks/input/js/jquery-1.8.3/jquery-1.8.3.js
examples/symlinks/input/js/jquery-1.8.3/jquery-1.8.3.min.js
examples/symlinks/input/js/jquery-1.8.3/jquery.js
examples/symlinks/layouts
examples/symlinks/layouts/default.layout
examples/symlinks/templer.cfg
lib/Templer.pm
lib/Templer/Global.pm
lib/Templer/Plugin/Breadcrumbs.pm
Expand All @@ -89,9 +55,7 @@ lib/Templer/Timer.pm
LICENSE
Makefile.PL
MANIFEST This list of files
MANIFEST.SKIP
META.yml Module meta-data (added by MakeMaker)
MYMETA.yml
META.yml
PLUGINS.md
README.md
t/style-no-tabs.t
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.SKIP
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Makefile$
Makefile.old
MYMETA.yml
TODO
CVS
pm_to_blib
Expand Down
96 changes: 61 additions & 35 deletions Makefile.PL
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,43 @@

use strict;
use warnings;

use ExtUtils::MakeMaker;

my %prereq_pm = (
'HTML::Template' => 0,
'Getopt::Long' => 0,
'Module::Pluggable' => 0,

# these are OPTIONAL.
"Image::Size" => 0,
"Redis" => 0,
"Text::Markdown" => 0,
"Text::Template" => 0,
"Text::Textile" => 0,
);

my %test_pm = (

# solely for the test-suite.
'Test::More' => 0,
'Test::Pod' => 0,
'Test::Strict' => 0,
'Test::Exception' => 0,
'Test::NoTabs' => 0,
);
use 5.008;

use ExtUtils::MakeMaker 6.30;



my %WriteMakefileArgs = (
NAME => 'App::Templer',
VERSION_FROM => 'lib/Templer.pm',
EXE_FILES => ['bin/templer', 'bin/templer-generate'],
PREREQ_PM => {
'HTML::Template' => 0,
'Getopt::Long' => 0,
'Module::Pluggable' => 0,

# these are OPTIONAL.
"Image::Size" => 0,
"Redis" => 0,
"Text::Markdown" => 0,
"Text::Template" => 0,
"Text::Textile" => 0,
},
TEST_REQUIRES => {

WriteMakefile(
NAME => 'App::Templer',
VERSION_FROM => 'lib/Templer.pm',
EXE_FILES => ['bin/templer', 'bin/templer-generate'],
PREREQ_PM => \%prereq_pm,
TEST_REQUIRES => \%test_pm,
ABSTRACT => 'Extensible Static Site Generator.',
AUTHOR => 'Steve Kemp <steve@steve.org.uk>',
LICENSE => 'perl',
# solely for the test-suite.
'Test::More' => 0,
'Test::Pod' => 0,
'Test::Strict' => 0,
'Test::Exception' => 0,
'Test::NoTabs' => 0,

},
ABSTRACT => 'Extensible Static Site Generator.',
AUTHOR => 'Steve Kemp <steve@steve.org.uk>',
LICENSE => 'perl',

MIN_PERL_VERSION => '5.008',

META_MERGE => {
resources => {
Expand All @@ -46,5 +48,29 @@ WriteMakefile(
GitMirror => 'http://git.steve.org.uk/skx/templer',
},
},
);
);




unless ( eval {ExtUtils::MakeMaker->VERSION(6.56)} )
{
my $br = delete $WriteMakefileArgs{ BUILD_REQUIRES };
my $pp = $WriteMakefileArgs{ PREREQ_PM };
for my $mod ( keys %$br )
{
if ( exists $pp->{ $mod } )
{
$pp->{ $mod } = $br->{ $mod } if $br->{ $mod } > $pp->{ $mod };
}
else
{
$pp->{ $mod } = $br->{ $mod };
}
}
}

delete $WriteMakefileArgs{ CONFIGURE_REQUIRES }
unless eval {ExtUtils::MakeMaker->VERSION(6.52)};

WriteMakefile(%WriteMakefileArgs);

0 comments on commit 7c485bb

Please sign in to comment.