Move Module::Pluggable into ext/ as the next version has actions in its

Makefile.PL that we will need to run as part of a core build.

p4raw-id: //depot/perl@33499

diff --git a/MANIFEST b/MANIFEST
index 94418cf..d5ee48b 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -908,6 +908,9 @@ ext/MIME/Base64/t/base64.t  See whether MIME::Base64 works
 ext/MIME/Base64/t/quoted-print.t       See whether MIME::QuotedPrint works
 ext/MIME/Base64/t/unicode.t    See whether MIME::Base64 works
 ext/MIME/Base64/t/warn.t       See whether MIME::Base64 works
+ext/Module/Pluggable/lib/Devel/InnerPackage.pm         Find inner packages
+ext/Module/Pluggable/lib/Module/Pluggable/Object.pm    Module::Pluggable
+ext/Module/Pluggable/lib/Module/Pluggable.pm           Module::Pluggable
 ext/NDBM_File/hints/cygwin.pl  Hint for NDBM_File for named architecture
 ext/NDBM_File/hints/dec_osf.pl Hint for NDBM_File for named architecture
 ext/NDBM_File/hints/dynixptx.pl        Hint for NDBM_File for named architecture
@@ -1712,7 +1715,6 @@ lib/DBM_Filter/utf8.pm            DBM Filter for UTF-8 Encoding
 lib/dbm_filter_util.pl         Utility functions used by DBM Filter tests
 lib/DB.pm                      Debugger API (draft)
 lib/DB.t                       See if DB works
-lib/Devel/InnerPackage.pm      Find inner packages
 lib/Devel/SelfStubber.pm       Generate stubs for SelfLoader.pm
 lib/Devel/SelfStubber.t                See if Devel::SelfStubber works
 lib/diagnostics.pm             Print verbose diagnostics
@@ -2237,8 +2239,6 @@ lib/Module/Load/t/to_load/LoadMe.pl       Module::Load tests
 lib/Module/Load/t/to_load/Must/Be/Loaded.pm    Module::Load tests
 lib/Module/Load/t/to_load/TestModule.pm        Module::Load tests
 lib/Module/Load/t/to_load/ToBeLoaded   Module::Load tests
-lib/Module/Pluggable/Object.pm Module::Pluggable
-lib/Module/Pluggable.pm        Module::Pluggable
 lib/mro.pm                     mro extension
 lib/Net/Changes                        libnet
 lib/Net/Cmd.pm                 libnet

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 91a0832..2e641ef 100644 (file)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -613,8 +613,7 @@ package Maintainers;
        'Module::Pluggable' =>
                {
                'MAINTAINER'    => 'simonw',
-               'FILES'         => q[lib/Module/Pluggable lib/Module/Pluggable.pm
-                                    lib/Devel/InnerPackage.pm t/Module_Pluggable],
+               'FILES'         => q[ext/Module/Pluggable t/Module_Pluggable],
                'CPAN'          => 1,
                },
 

diff --git a/ext/Module/Pluggable/Makefile.PL b/ext/Module/Pluggable/Makefile.PL
new file mode 100644 (file)
index 0000000..8bf1034
--- /dev/null
+++ b/ext/Module/Pluggable/Makefile.PL
@@ -0,0 +1,16 @@
+use ExtUtils::MakeMaker;
+
+WriteMakefile
+(
+          'NAME' => 'Module::Pluggable',
+          'VERSION_FROM' => 'lib/Module/Pluggable.pm',
+           MAN3PODS     => {},         # Pods will be built by installman.
+          'PREREQ_PM' => {
+                           'File::Basename' => '0',
+                           'File::Spec' => '3.00',
+                           'Test::More' => '0.62'
+                         },
+          'EXE_FILES' => [],
+          'PL_FILES' => {}
+        )
+;

diff --git a/lib/Devel/InnerPackage.pm b/ext/Module/Pluggable/lib/Devel/InnerPackage.pm
similarity index 100%
rename from lib/Devel/InnerPackage.pm
rename to ext/Module/Pluggable/lib/Devel/InnerPackage.pm

diff --git a/lib/Module/Pluggable.pm b/ext/Module/Pluggable/lib/Module/Pluggable.pm
similarity index 100%
rename from lib/Module/Pluggable.pm
rename to ext/Module/Pluggable/lib/Module/Pluggable.pm

diff --git a/lib/Module/Pluggable/Object.pm b/ext/Module/Pluggable/lib/Module/Pluggable/Object.pm
similarity index 100%
rename from lib/Module/Pluggable/Object.pm
rename to ext/Module/Pluggable/lib/Module/Pluggable/Object.pm