From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 16 Dec 2012 11:53:20 +0000 (+0100)
Subject: Create distinct lib/ subdir in maint/.Generated_Pod (no functional changes)
X-Git-Tag: v0.08205~43
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3e2a5d5d6b3b941870b99a80531122126466a918;p=dbsrgits%2FDBIx-Class.git

Create distinct lib/ subdir in maint/.Generated_Pod (no functional changes)
---

diff --git a/maint/Makefile.PL.inc/53_autogen_pod.pl b/maint/Makefile.PL.inc/53_autogen_pod.pl
index e31dd1d..5d68f65 100644
--- a/maint/Makefile.PL.inc/53_autogen_pod.pl
+++ b/maint/Makefile.PL.inc/53_autogen_pod.pl
@@ -22,7 +22,7 @@ else {
 {
   print "Regenerating Optional/Dependencies.pod\n";
   require DBIx::Class::Optional::Dependencies;
-  DBIx::Class::Optional::Dependencies->_gen_pod ($ver, $pod_dir);
+  DBIx::Class::Optional::Dependencies->_gen_pod ($ver, "$pod_dir/lib");
 
   postamble <<"EOP";
 
@@ -30,7 +30,7 @@ clonedir_generate_files : dbic_clonedir_gen_optdeps_pod
 
 dbic_clonedir_gen_optdeps_pod :
 \t@{[
-  $mm_proto->oneliner("DBIx::Class::Optional::Dependencies->_gen_pod(q($ver), q($pod_dir))", [qw/-Ilib -MDBIx::Class::Optional::Dependencies/])
+  $mm_proto->oneliner("DBIx::Class::Optional::Dependencies->_gen_pod(q($ver), q($pod_dir/lib))", [qw/-Ilib -MDBIx::Class::Optional::Dependencies/])
 ]}
 
 EOP
@@ -55,7 +55,7 @@ EOP
 }
 
 
-# copy the contents of $pod_dir over to lib/
+# copy the contents of $pod_dir over to the workdir
 # (yes, overwriting is fine, though nothing should reside there)
 {
   postamble <<"EOP";
@@ -65,13 +65,13 @@ clonedir_post_generate_files : dbic_clonedir_copy_generated_pod
 dbic_clonedir_copy_generated_pod :
 \t\$(RM_F) $pod_dir.packlist
 \t@{[
-  $mm_proto->oneliner("install([ from_to => {q($pod_dir) => 'lib', write => q($pod_dir.packlist)}, verbose => 0, uninstall_shadows => 0, skip => [] ])", ['-MExtUtils::Install'])
+  $mm_proto->oneliner("install([ from_to => {q($pod_dir) => File::Spec->curdir(), write => q($pod_dir.packlist)}, verbose => 0, uninstall_shadows => 0, skip => [] ])", ['-MExtUtils::Install'])
 ]}
 EOP
 }
 
 
-# everything that came from $pod_dir, needs to be removed from our lib/
+# everything that came from $pod_dir, needs to be removed from the workdir
 {
   postamble <<"EOP";
 
diff --git a/maint/gen_pod_inherit b/maint/gen_pod_inherit
index d50eae9..db0f65a 100755
--- a/maint/gen_pod_inherit
+++ b/maint/gen_pod_inherit
@@ -15,7 +15,7 @@ require File::Copy;
 File::Copy::copy(
   "$result_metapod_fn.proto",
   "$result_metapod_fn",
-) or die "Copying ResultClass proto pod ($result_metapod_fn.pod) failed: $!";
+) or die "Copying ResultClass proto pod ($result_metapod_fn) failed: $!";
 
 # cleanup
 END {
@@ -27,7 +27,7 @@ require Pod::Inherit;
 
 Pod::Inherit->new({
    input_files       => $lib_dir,
-   out_dir           => $pod_dir,
+   out_dir           => "$pod_dir/lib",
    force_permissions => 1,
    class_map         => {
       "DBIx::Class::Relationship::HasMany"    => "DBIx::Class::Relationship",
diff --git a/xt/podcoverage.t b/xt/podcoverage.t
index 40041ac..ad93c42 100644
--- a/xt/podcoverage.t
+++ b/xt/podcoverage.t
@@ -3,7 +3,7 @@ use strict;
 
 use Test::More;
 use List::Util 'first';
-use lib qw(t/lib maint/.Generated_Pod);
+use lib qw(t/lib maint/.Generated_Pod/lib);
 use DBICTest;
 use namespace::clean;