Only normalize conditions during resolution time, instead on every ->search

[dbsrgits/DBIx-Class.git] / maint / Makefile.PL.inc / 50_redefine_makefile_flow.pl

diff --git a/maint/Makefile.PL.inc/50_redefine_makefile_flow.pl b/maint/Makefile.PL.inc/50_redefine_makefile_flow.pl
index c407680..251c184 100644 (file)
--- a/maint/Makefile.PL.inc/50_redefine_makefile_flow.pl
+++ b/maint/Makefile.PL.inc/50_redefine_makefile_flow.pl
@@ -4,9 +4,12 @@
   package MY;
   sub distdir {
     (my $snippet = shift->SUPER::distdir(@_)) =~ s/^create_distdir :/create_distdir_copy_manifested :/;
+    no warnings 'qw';
     return <<"EOM";
 $snippet
 
+.NOTPARALLEL :
+
 create_distdir : check_create_distdir_prereqs clonedir_generate_files clonedir_post_generate_files fresh_manifest create_distdir_copy_manifested clonedir_cleanup_generated_files
 \t\$(NOECHO) \$(NOOP)
 
@@ -21,14 +24,29 @@ clonedir_cleanup_generated_files :
 
 check_create_distdir_prereqs :
 \t\$(NOECHO) @{[
-  $mm_proto->oneliner("DBIx::Class::Optional::Dependencies->die_unless_req_ok_for(q(dist_dir))", [qw/-Ilib -MDBIx::Class::Optional::Dependencies/])
+  $mm_proto->oneliner("1", [qw( -Ilib -MDBIx::Class::Optional::Dependencies=-die_without,dist_dir )])
 ]}
 
+EOM
+  }
+}
+
+# M::I inserts its own default postamble, so we can't easily override upload
+# but we can still hook postamble in EU::MM
+{
+  package MY;
+
+  sub postamble {
+    my $snippet = shift->SUPER::postamble(@_);
+    no warnings 'qw';
+    return <<"EOM";
+$snippet
+
 upload :: check_create_distdir_prereqs check_upload_dist_prereqs
 
 check_upload_dist_prereqs :
 \t\$(NOECHO) @{[
-  $mm_proto->oneliner("DBIx::Class::Optional::Dependencies->die_unless_req_ok_for(q(dist_upload))", [qw/-Ilib -MDBIx::Class::Optional::Dependencies/])
+  $mm_proto->oneliner("1", [qw( -Ilib -MDBIx::Class::Optional::Dependencies=-die_without,dist_upload )])
 ]}
 
 EOM