Skip to content

Commit 30b7f58

Browse files
wip for removing MI catalyst plugin, and replacing with autogenerating a dist.ini
1 parent 50b263e commit 30b7f58

File tree

5 files changed

+8
-45
lines changed

5 files changed

+8
-45
lines changed

Makefile.PL

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ my %META = (
3232
'File::Copy::Recursive' => 0,
3333
'Path::Class' => '0.09',
3434
'Template' => '2.14',
35-
'Module::Install' => '1.02',
3635
},
3736
},
3837
develop => {

lib/Catalyst/Devel.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ them. This is intended to make it easier to deploy Catalyst apps. The
2424
runtime parts of Catalyst are now known as C<Catalyst::Runtime>.
2525
2626
C<Catalyst-Devel> includes the L<Catalyst::Helper> system, which
27-
autogenerates scripts and tests; L<Module::Install::Catalyst>, a
28-
L<Module::Install> extension for Catalyst; and requirements for a
27+
autogenerates scripts and tests;
28+
and requirements for a
2929
variety of development-related modules. The documentation remains with
3030
L<Catalyst::Runtime>.
3131

lib/Catalyst/Helper.pm

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ sub mk_app {
107107
|| 'Catalyst developer';
108108

109109
my $gen_scripts = ( $self->{makefile} ) ? 0 : 1;
110-
my $gen_makefile = ( $self->{scripts} ) ? 0 : 1;
110+
my $gen_dist_ini = ( $self->{scripts} ) ? 0 : 1;
111111
my $gen_app = ( $self->{scripts} || $self->{makefile} ) ? 0 : 1;
112112

113113
if ($gen_app) {
@@ -117,8 +117,8 @@ sub mk_app {
117117
$self->$_;
118118
}
119119
}
120-
if ($gen_makefile) {
121-
$self->_mk_makefile;
120+
if ($gen_dist_ini) {
121+
$self->_mk_dist_ini;
122122
}
123123
if ($gen_scripts) {
124124
for ( qw/ _mk_cgi _mk_fastcgi _mk_server
@@ -376,19 +376,8 @@ sub _mk_rootclass {
376376
file( $self->{c}, "Root.pm" ) );
377377
}
378378

379-
sub _mk_makefile {
380-
my $self = shift;
381-
$self->{path} = join('/', 'lib', split( '::', $self->{name} ) );
382-
$self->{path} .= '.pm';
383-
my $dir = $self->{dir};
384-
$self->render_sharedir_file( 'Makefile.PL.tt', file($dir, "Makefile.PL") );
385-
386-
if ( $self->{makefile} ) {
387-
388-
# deprecate the old Build.PL file when regenerating Makefile.PL
389-
$self->_deprecate_file(
390-
file( $self->{dir}, 'Build.PL' ) );
391-
}
379+
sub _mk_dist_ini {
380+
# TODO
392381
}
393382

394383
sub _mk_psgi {

share/Makefile.PL.tt

Lines changed: 0 additions & 26 deletions
This file was deleted.

share/dist.ini.tt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
; TODO

0 commit comments

Comments
 (0)