diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-03-03 15:38:15 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-05 10:52:28 -0800 |
| commit | 382029fc003d400147339573ab5448a88c336f55 (patch) | |
| tree | 026082960f0defa8fe9060d1ae54d6f6fea7988d /perl | |
| parent | perl: generalize the Git::LoadCPAN facility (diff) | |
| download | tgif-382029fc003d400147339573ab5448a88c336f55.tar.xz | |
perl: move the perl/Git/FromCPAN tree to perl/FromCPAN
Move the CPAN modules that have lived under perl/Git/FromCPAN since my
20d2a30f8f ("Makefile: replace perl/Makefile.PL with simple make
rules", 2017-12-10) to perl/FromCPAN.
A subsequent change will teach the Makefile to only install these
copies of CPAN modules if a flag that distro packagers would like to
set isn't set. Due to how the wildcard globbing is being done it's
much easier to accomplish that if they're moved to their own
directory.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/FromCPAN/.gitattributes (renamed from perl/Git/FromCPAN/.gitattributes) | 0 | ||||
| -rw-r--r-- | perl/FromCPAN/Error.pm (renamed from perl/Git/FromCPAN/Error.pm) | 0 | ||||
| -rw-r--r-- | perl/FromCPAN/Mail/Address.pm (renamed from perl/Git/FromCPAN/Mail/Address.pm) | 0 | ||||
| -rw-r--r-- | perl/Git/LoadCPAN.pm | 5 |
4 files changed, 2 insertions, 3 deletions
diff --git a/perl/Git/FromCPAN/.gitattributes b/perl/FromCPAN/.gitattributes index 8b64fc5e22..8b64fc5e22 100644 --- a/perl/Git/FromCPAN/.gitattributes +++ b/perl/FromCPAN/.gitattributes diff --git a/perl/Git/FromCPAN/Error.pm b/perl/FromCPAN/Error.pm index 8b95e2d73d..8b95e2d73d 100644 --- a/perl/Git/FromCPAN/Error.pm +++ b/perl/FromCPAN/Error.pm diff --git a/perl/Git/FromCPAN/Mail/Address.pm b/perl/FromCPAN/Mail/Address.pm index 683d490b2b..683d490b2b 100644 --- a/perl/Git/FromCPAN/Mail/Address.pm +++ b/perl/FromCPAN/Mail/Address.pm diff --git a/perl/Git/LoadCPAN.pm b/perl/Git/LoadCPAN.pm index 1568c177fe..229c1ee87d 100644 --- a/perl/Git/LoadCPAN.pm +++ b/perl/Git/LoadCPAN.pm @@ -16,8 +16,7 @@ source. Therefore the L<Git::LoadCPAN> namespace shipped with Git contains wrapper modules like C<Git::LoadCPAN::Module::Name> that will first attempt to load C<Module::Name> from the OS, and if that doesn't work -will fall back on C<Git::FromCPAN::Module::Name> shipped with Git -itself. +will fall back on C<FromCPAN::Module::Name> shipped with Git itself. Usually distributors will not ship with Git's Git::FromCPAN tree at all, preferring to use their own packaging of CPAN modules instead. @@ -52,7 +51,7 @@ sub import { my $Git_LoadCPAN_pm_root = File::Basename::dirname($Git_LoadCPAN_pm_path) || die "BUG: Can't figure out lib/Git dirname from '$Git_LoadCPAN_pm_path'!"; require File::Spec; - my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_LoadCPAN_pm_root, 'FromCPAN'); + my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_LoadCPAN_pm_root, '..', 'FromCPAN'); die "BUG: '$Git_pm_FromCPAN_root' should be a directory!" unless -d $Git_pm_FromCPAN_root; local @INC = ($Git_pm_FromCPAN_root, @INC); |