From: Chris Williams Date: Tue, 8 Sep 2009 10:02:09 +0000 (+0100) Subject: Move CPAN from lib/ to ext/ X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=087f1bf3a29bd837d3103a3637ea69e4499ca06b;p=p5sagit%2Fp5-mst-13.2.git Move CPAN from lib/ to ext/ --- diff --git a/MANIFEST b/MANIFEST index 4573af7..f0e38ca 100644 --- a/MANIFEST +++ b/MANIFEST @@ -379,6 +379,44 @@ ext/Compress-Raw-Zlib/zlib-src/zlib.h Compress::Raw::Zlib ext/Compress-Raw-Zlib/zlib-src/zutil.c Compress::Raw::Zlib ext/Compress-Raw-Zlib/zlib-src/zutil.h Compress::Raw::Zlib ext/Compress-Raw-Zlib/Zlib.xs Compress::Raw::Zlib +ext/CPAN/lib/CPAN/API/HOWTO.pod recipe book for programming with CPAN.pm +ext/CPAN/lib/CPAN/Author.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Bundle.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/CacheMgr.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Complete.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Debug.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/DeferredCode.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Distribution.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Distroprefs.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Distrostatus.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/FirstTime.pm Utility for creating CPAN config files +ext/CPAN/lib/CPAN/FTP/netrc.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/FTP.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/HandleConfig.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Index.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/InfoObj.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd helper file for validating config files +ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml helper file for validating config files +ext/CPAN/lib/CPAN/Kwalify.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/LWP/UserAgent.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Module.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/Nox.pm Runs CPAN while avoiding compiled extensions +ext/CPAN/lib/CPAN/PAUSE2003.pub CPAN public key +ext/CPAN/lib/CPAN/PAUSE2005.pub CPAN public key +ext/CPAN/lib/CPAN/PAUSE2007.pub CPAN public key +ext/CPAN/lib/CPAN/PAUSE2009.pub CPAN public key +ext/CPAN/lib/CPAN.pm Interface to Comprehensive Perl Archive Network +ext/CPAN/lib/CPAN/Prompt.pm +ext/CPAN/lib/CPAN/Queue.pm queueing system for CPAN.pm +ext/CPAN/lib/CPAN/Shell.pm +ext/CPAN/lib/CPAN/SIGNATURE CPAN public key +ext/CPAN/lib/CPAN/Tarzip.pm helper package for CPAN.pm +ext/CPAN/lib/CPAN/URL.pm +ext/CPAN/lib/CPAN/Version.pm Simple math with different flavors of version strings +ext/CPAN/Makefile.PL ext/CPANPLUS/bin/cpan2dist the cpan2dist utility ext/CPANPLUS/bin/cpanp the cpanp utility ext/CPANPLUS/bin/cpanp-run-perl the cpanp-run-perl utility @@ -473,6 +511,12 @@ ext/CPANPLUS/t/dummy-CPAN/autobundle/Snapshot.pm CPANPLUS tests ext/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz CPANPLUS tests ext/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz CPANPLUS tests ext/CPANPLUS/t/inc/conf.pl CPANPLUS tests +ext/CPAN/scripts/cpan easily interact with CPAN from the command line +ext/CPAN/t/01loadme.t See if CPAN the module works +ext/CPAN/t/02nox.t See if CPAN::Nox works +ext/CPAN/t/03pkgs.t See if CPAN::Version works +ext/CPAN/t/10version.t See if CPAN the module works +ext/CPAN/t/11mirroredby.t See if CPAN::Mirrored::By works ext/Cwd/Changes Cwd extension Changelog ext/Cwd/Cwd.xs Cwd extension external subroutines ext/Cwd/Makefile.PL Cwd extension makefile maker @@ -2367,49 +2411,6 @@ lib/Config.t See if Config works lib/constant.pm For "use constant" lib/constant.t See if compile-time constants work lib/CORE.pod document the CORE namespace -lib/CPAN/API/HOWTO.pod recipe book for programming with CPAN.pm -lib/CPAN/Author.pm helper package for CPAN.pm -lib/CPAN/bin/cpan easily interact with CPAN from the command line -lib/CPAN/Bundle.pm helper package for CPAN.pm -lib/CPAN/CacheMgr.pm helper package for CPAN.pm -lib/CPAN/Complete.pm helper package for CPAN.pm -lib/CPAN/Debug.pm helper package for CPAN.pm -lib/CPAN/DeferredCode.pm helper package for CPAN.pm -lib/CPAN/Distribution.pm helper package for CPAN.pm -lib/CPAN/Distroprefs.pm helper package for CPAN.pm -lib/CPAN/Distrostatus.pm helper package for CPAN.pm -lib/CPAN/Exception/blocked_urllist.pm helper package for CPAN.pm -lib/CPAN/Exception/RecursiveDependency.pm helper package for CPAN.pm -lib/CPAN/Exception/yaml_not_installed.pm helper package for CPAN.pm -lib/CPAN/FirstTime.pm Utility for creating CPAN config files -lib/CPAN/FTP/netrc.pm helper package for CPAN.pm -lib/CPAN/FTP.pm helper package for CPAN.pm -lib/CPAN/HandleConfig.pm helper package for CPAN.pm -lib/CPAN/Index.pm helper package for CPAN.pm -lib/CPAN/InfoObj.pm helper package for CPAN.pm -lib/CPAN/Kwalify/distroprefs.dd helper file for validating config files -lib/CPAN/Kwalify/distroprefs.yml helper file for validating config files -lib/CPAN/Kwalify.pm helper package for CPAN.pm -lib/CPAN/LWP/UserAgent.pm helper package for CPAN.pm -lib/CPAN/Module.pm helper package for CPAN.pm -lib/CPAN/Nox.pm Runs CPAN while avoiding compiled extensions -lib/CPAN/PAUSE2003.pub CPAN public key -lib/CPAN/PAUSE2005.pub CPAN public key -lib/CPAN/PAUSE2007.pub CPAN public key -lib/CPAN/PAUSE2009.pub CPAN public key -lib/CPAN.pm Interface to Comprehensive Perl Archive Network -lib/CPAN/Prompt.pm -lib/CPAN/Queue.pm queueing system for CPAN.pm -lib/CPAN/Shell.pm -lib/CPAN/SIGNATURE CPAN public key -lib/CPAN/t/01loadme.t See if CPAN the module works -lib/CPAN/t/02nox.t See if CPAN::Nox works -lib/CPAN/t/03pkgs.t See if CPAN::Version works -lib/CPAN/t/10version.t See if CPAN the module works -lib/CPAN/t/11mirroredby.t See if CPAN::Mirrored::By works -lib/CPAN/Tarzip.pm helper package for CPAN.pm -lib/CPAN/URL.pm -lib/CPAN/Version.pm Simple math with different flavors of version strings lib/ctime.pl A ctime workalike lib/Cwd.pm Various cwd routines (getcwd, fastcwd, chdir) lib/DBM_Filter/Changes DBM Filter Change history diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index e3be5a7..1672c6e 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -383,7 +383,7 @@ use File::Glob qw(:case); { 'MAINTAINER' => 'andk', 'DISTRIBUTION' => 'ANDK/CPAN-1.9402.tar.gz', - 'FILES' => q[lib/CPAN.pm lib/CPAN], + 'FILES' => q[ext/CPAN], 'EXCLUDED' => [ qr{^distroprefs/}, qr{^inc/Test/}, qr{^t/CPAN/authors/}, @@ -419,10 +419,6 @@ use File::Glob qw(:case); t/yaml_code.yml }, ], - 'MAP' => { 'lib/' => 'lib/', - '' => 'lib/CPAN/', - 'scripts/' => 'lib/CPAN/bin/', - }, 'CPAN' => 1, 'UPSTREAM' => 'CPAN', }, diff --git a/ext/CPAN/Makefile.PL b/ext/CPAN/Makefile.PL new file mode 100644 index 0000000..589b597 --- /dev/null +++ b/ext/CPAN/Makefile.PL @@ -0,0 +1,10 @@ +use strict; +use ExtUtils::MakeMaker; + +WriteMakefile ( + NAME => 'CPAN', + VERSION_FROM => 'lib/CPAN.pm', # finds $VERSION + EXE_FILES => ['scripts/cpan'], + AUTHOR => 'Andreas Koenig ', + ABSTRACT_FROM => 'lib/CPAN.pm', +); diff --git a/lib/CPAN.pm b/ext/CPAN/lib/CPAN.pm similarity index 100% rename from lib/CPAN.pm rename to ext/CPAN/lib/CPAN.pm diff --git a/lib/CPAN/API/HOWTO.pod b/ext/CPAN/lib/CPAN/API/HOWTO.pod similarity index 100% rename from lib/CPAN/API/HOWTO.pod rename to ext/CPAN/lib/CPAN/API/HOWTO.pod diff --git a/lib/CPAN/Author.pm b/ext/CPAN/lib/CPAN/Author.pm similarity index 100% rename from lib/CPAN/Author.pm rename to ext/CPAN/lib/CPAN/Author.pm diff --git a/lib/CPAN/Bundle.pm b/ext/CPAN/lib/CPAN/Bundle.pm similarity index 100% rename from lib/CPAN/Bundle.pm rename to ext/CPAN/lib/CPAN/Bundle.pm diff --git a/lib/CPAN/CacheMgr.pm b/ext/CPAN/lib/CPAN/CacheMgr.pm similarity index 100% rename from lib/CPAN/CacheMgr.pm rename to ext/CPAN/lib/CPAN/CacheMgr.pm diff --git a/lib/CPAN/Complete.pm b/ext/CPAN/lib/CPAN/Complete.pm similarity index 100% rename from lib/CPAN/Complete.pm rename to ext/CPAN/lib/CPAN/Complete.pm diff --git a/lib/CPAN/Debug.pm b/ext/CPAN/lib/CPAN/Debug.pm similarity index 100% rename from lib/CPAN/Debug.pm rename to ext/CPAN/lib/CPAN/Debug.pm diff --git a/lib/CPAN/DeferredCode.pm b/ext/CPAN/lib/CPAN/DeferredCode.pm similarity index 100% rename from lib/CPAN/DeferredCode.pm rename to ext/CPAN/lib/CPAN/DeferredCode.pm diff --git a/lib/CPAN/Distribution.pm b/ext/CPAN/lib/CPAN/Distribution.pm similarity index 100% rename from lib/CPAN/Distribution.pm rename to ext/CPAN/lib/CPAN/Distribution.pm diff --git a/lib/CPAN/Distroprefs.pm b/ext/CPAN/lib/CPAN/Distroprefs.pm similarity index 100% rename from lib/CPAN/Distroprefs.pm rename to ext/CPAN/lib/CPAN/Distroprefs.pm diff --git a/lib/CPAN/Distrostatus.pm b/ext/CPAN/lib/CPAN/Distrostatus.pm similarity index 100% rename from lib/CPAN/Distrostatus.pm rename to ext/CPAN/lib/CPAN/Distrostatus.pm diff --git a/lib/CPAN/Exception/RecursiveDependency.pm b/ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm similarity index 100% rename from lib/CPAN/Exception/RecursiveDependency.pm rename to ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm diff --git a/lib/CPAN/Exception/blocked_urllist.pm b/ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm similarity index 100% rename from lib/CPAN/Exception/blocked_urllist.pm rename to ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm diff --git a/lib/CPAN/Exception/yaml_not_installed.pm b/ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm similarity index 100% rename from lib/CPAN/Exception/yaml_not_installed.pm rename to ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm diff --git a/lib/CPAN/FTP.pm b/ext/CPAN/lib/CPAN/FTP.pm similarity index 100% rename from lib/CPAN/FTP.pm rename to ext/CPAN/lib/CPAN/FTP.pm diff --git a/lib/CPAN/FTP/netrc.pm b/ext/CPAN/lib/CPAN/FTP/netrc.pm similarity index 100% rename from lib/CPAN/FTP/netrc.pm rename to ext/CPAN/lib/CPAN/FTP/netrc.pm diff --git a/lib/CPAN/FirstTime.pm b/ext/CPAN/lib/CPAN/FirstTime.pm similarity index 100% rename from lib/CPAN/FirstTime.pm rename to ext/CPAN/lib/CPAN/FirstTime.pm diff --git a/lib/CPAN/HandleConfig.pm b/ext/CPAN/lib/CPAN/HandleConfig.pm similarity index 100% rename from lib/CPAN/HandleConfig.pm rename to ext/CPAN/lib/CPAN/HandleConfig.pm diff --git a/lib/CPAN/Index.pm b/ext/CPAN/lib/CPAN/Index.pm similarity index 100% rename from lib/CPAN/Index.pm rename to ext/CPAN/lib/CPAN/Index.pm diff --git a/lib/CPAN/InfoObj.pm b/ext/CPAN/lib/CPAN/InfoObj.pm similarity index 100% rename from lib/CPAN/InfoObj.pm rename to ext/CPAN/lib/CPAN/InfoObj.pm diff --git a/lib/CPAN/Kwalify.pm b/ext/CPAN/lib/CPAN/Kwalify.pm similarity index 100% rename from lib/CPAN/Kwalify.pm rename to ext/CPAN/lib/CPAN/Kwalify.pm diff --git a/lib/CPAN/Kwalify/distroprefs.dd b/ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd similarity index 100% rename from lib/CPAN/Kwalify/distroprefs.dd rename to ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd diff --git a/lib/CPAN/Kwalify/distroprefs.yml b/ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml similarity index 100% rename from lib/CPAN/Kwalify/distroprefs.yml rename to ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml diff --git a/lib/CPAN/LWP/UserAgent.pm b/ext/CPAN/lib/CPAN/LWP/UserAgent.pm similarity index 100% rename from lib/CPAN/LWP/UserAgent.pm rename to ext/CPAN/lib/CPAN/LWP/UserAgent.pm diff --git a/lib/CPAN/Module.pm b/ext/CPAN/lib/CPAN/Module.pm similarity index 100% rename from lib/CPAN/Module.pm rename to ext/CPAN/lib/CPAN/Module.pm diff --git a/lib/CPAN/Nox.pm b/ext/CPAN/lib/CPAN/Nox.pm similarity index 100% rename from lib/CPAN/Nox.pm rename to ext/CPAN/lib/CPAN/Nox.pm diff --git a/lib/CPAN/PAUSE2003.pub b/ext/CPAN/lib/CPAN/PAUSE2003.pub similarity index 100% rename from lib/CPAN/PAUSE2003.pub rename to ext/CPAN/lib/CPAN/PAUSE2003.pub diff --git a/lib/CPAN/PAUSE2005.pub b/ext/CPAN/lib/CPAN/PAUSE2005.pub similarity index 100% rename from lib/CPAN/PAUSE2005.pub rename to ext/CPAN/lib/CPAN/PAUSE2005.pub diff --git a/lib/CPAN/PAUSE2007.pub b/ext/CPAN/lib/CPAN/PAUSE2007.pub similarity index 100% rename from lib/CPAN/PAUSE2007.pub rename to ext/CPAN/lib/CPAN/PAUSE2007.pub diff --git a/lib/CPAN/PAUSE2009.pub b/ext/CPAN/lib/CPAN/PAUSE2009.pub similarity index 100% rename from lib/CPAN/PAUSE2009.pub rename to ext/CPAN/lib/CPAN/PAUSE2009.pub diff --git a/lib/CPAN/Prompt.pm b/ext/CPAN/lib/CPAN/Prompt.pm similarity index 100% rename from lib/CPAN/Prompt.pm rename to ext/CPAN/lib/CPAN/Prompt.pm diff --git a/lib/CPAN/Queue.pm b/ext/CPAN/lib/CPAN/Queue.pm similarity index 100% rename from lib/CPAN/Queue.pm rename to ext/CPAN/lib/CPAN/Queue.pm diff --git a/lib/CPAN/SIGNATURE b/ext/CPAN/lib/CPAN/SIGNATURE similarity index 100% rename from lib/CPAN/SIGNATURE rename to ext/CPAN/lib/CPAN/SIGNATURE diff --git a/lib/CPAN/Shell.pm b/ext/CPAN/lib/CPAN/Shell.pm similarity index 100% rename from lib/CPAN/Shell.pm rename to ext/CPAN/lib/CPAN/Shell.pm diff --git a/lib/CPAN/Tarzip.pm b/ext/CPAN/lib/CPAN/Tarzip.pm similarity index 100% rename from lib/CPAN/Tarzip.pm rename to ext/CPAN/lib/CPAN/Tarzip.pm diff --git a/lib/CPAN/URL.pm b/ext/CPAN/lib/CPAN/URL.pm similarity index 100% rename from lib/CPAN/URL.pm rename to ext/CPAN/lib/CPAN/URL.pm diff --git a/lib/CPAN/Version.pm b/ext/CPAN/lib/CPAN/Version.pm similarity index 100% rename from lib/CPAN/Version.pm rename to ext/CPAN/lib/CPAN/Version.pm diff --git a/lib/CPAN/bin/cpan b/ext/CPAN/scripts/cpan similarity index 100% rename from lib/CPAN/bin/cpan rename to ext/CPAN/scripts/cpan diff --git a/lib/CPAN/t/01loadme.t b/ext/CPAN/t/01loadme.t similarity index 100% rename from lib/CPAN/t/01loadme.t rename to ext/CPAN/t/01loadme.t diff --git a/lib/CPAN/t/02nox.t b/ext/CPAN/t/02nox.t similarity index 100% rename from lib/CPAN/t/02nox.t rename to ext/CPAN/t/02nox.t diff --git a/lib/CPAN/t/03pkgs.t b/ext/CPAN/t/03pkgs.t similarity index 100% rename from lib/CPAN/t/03pkgs.t rename to ext/CPAN/t/03pkgs.t diff --git a/lib/CPAN/t/10version.t b/ext/CPAN/t/10version.t similarity index 100% rename from lib/CPAN/t/10version.t rename to ext/CPAN/t/10version.t diff --git a/lib/CPAN/t/11mirroredby.t b/ext/CPAN/t/11mirroredby.t similarity index 100% rename from lib/CPAN/t/11mirroredby.t rename to ext/CPAN/t/11mirroredby.t diff --git a/lib/.gitignore b/lib/.gitignore index 32377b6..85422de 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -15,6 +15,49 @@ /Config_git.pl /CGI /CGI.pm +/CPAN.pm +/CPAN +/CPAN/API +/CPAN/API/HOWTO.pod +/CPAN/Author.pm +/CPAN/Bundle.pm +/CPAN/CacheMgr.pm +/CPAN/Complete.pm +/CPAN/Debug.pm +/CPAN/DeferredCode.pm +/CPAN/Distribution.pm +/CPAN/Distroprefs.pm +/CPAN/Distrostatus.pm +/CPAN/Exception +/CPAN/Exception/RecursiveDependency.pm +/CPAN/Exception/blocked_urllist.pm +/CPAN/Exception/yaml_not_installed.pm +/CPAN/FTP.pm +/CPAN/FTP +/CPAN/FTP/netrc.pm +/CPAN/FirstTime.pm +/CPAN/HandleConfig.pm +/CPAN/Index.pm +/CPAN/InfoObj.pm +/CPAN/Kwalify.pm +/CPAN/Kwalify +/CPAN/Kwalify/distroprefs.dd +/CPAN/Kwalify/distroprefs.yml +/CPAN/LWP +/CPAN/LWP/UserAgent.pm +/CPAN/Module.pm +/CPAN/Nox.pm +/CPAN/PAUSE2003.pub +/CPAN/PAUSE2005.pub +/CPAN/PAUSE2007.pub +/CPAN/PAUSE2009.pub +/CPAN/Prompt.pm +/CPAN/Queue.pm +/CPAN/SIGNATURE +/CPAN/Shell.pm +/CPAN/Tarzip.pm +/CPAN/URL.pm +/CPAN/Version.pm /CPANPLUS.pm /CPANPLUS/Backend.pm /CPANPLUS/Backend diff --git a/utils/cpan.PL b/utils/cpan.PL index 5e12d78..4752843 100644 --- a/utils/cpan.PL +++ b/utils/cpan.PL @@ -33,7 +33,7 @@ $Config{startperl} use File::Spec; -my $cpan = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "lib", "CPAN", "bin"), "cpan"); +my $cpan = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "ext", "CPAN", "scripts"), "cpan"); if (open(CPAN, $cpan)) { print OUT ;