summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MANIFEST6
-rw-r--r--META.json4
-rw-r--r--META.yml4
-rwxr-xr-xMakefile.SH8
-rwxr-xr-xPorting/Maintainers.pl9
-rw-r--r--dist/Exporter/lib/Exporter.pm (renamed from lib/Exporter.pm)0
-rw-r--r--dist/Exporter/lib/Exporter/Heavy.pm (renamed from lib/Exporter/Heavy.pm)0
-rw-r--r--dist/Exporter/t/Exporter.t (renamed from lib/Exporter.t)7
-rw-r--r--write_buildcustomize.pl1
9 files changed, 11 insertions, 28 deletions
diff --git a/MANIFEST b/MANIFEST
index 434c9ef2a4..63c88e425d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2958,6 +2958,9 @@ dist/Dumpvalue/t/Dumpvalue.t See if Dumpvalue works
dist/Env/lib/Env.pm Map environment into ordinary variables
dist/Env/t/array.t See if Env works for arrays
dist/Env/t/env.t See if Env works
+dist/Exporter/lib/Exporter/Heavy.pm Complicated routines for Exporter
+dist/Exporter/lib/Exporter.pm Exporter base class
+dist/Exporter/t/Exporter.t See if Exporter works
dist/ExtUtils-CBuilder/Changes EU-CB change log
dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm Base class for ExtUtils::CBuilder methods
dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/aix.pm CBuilder methods for AIX
@@ -4099,9 +4102,6 @@ lib/dumpvar.pl A variable dumper
lib/dumpvar.t A variable dumper tester
lib/English.pm Readable aliases for short variables
lib/English.t See if English works
-lib/Exporter/Heavy.pm Complicated routines for Exporter
-lib/Exporter.pm Exporter base class
-lib/Exporter.t See if Exporter works
lib/ExtUtils/Embed.pm Utilities for embedding Perl in C programs
lib/ExtUtils/t/Embed.t See if ExtUtils::Embed and embedding works
lib/ExtUtils/typemap Extension interface types
diff --git a/META.json b/META.json
index ad9866c4bf..810aeee966 100644
--- a/META.json
+++ b/META.json
@@ -26,6 +26,7 @@
"dist/Devel-SelfStubber",
"dist/Dumpvalue",
"dist/Env",
+ "dist/Exporter",
"dist/ExtUtils-CBuilder",
"dist/ExtUtils-Command",
"dist/ExtUtils-Install",
@@ -105,9 +106,6 @@
"dist/lib/lib_pm.PL",
"dist/lib/Makefile.PL",
"dist/lib/t/01lib.t",
- "lib/Exporter.pm",
- "lib/Exporter.t",
- "lib/Exporter/Heavy.pm",
"lib/unicore/mktables",
"lib/version.pm",
"lib/version.pod",
diff --git a/META.yml b/META.yml
index 46a3bb1b5a..6268d5b3b7 100644
--- a/META.yml
+++ b/META.yml
@@ -24,6 +24,7 @@ no_index:
- dist/Devel-SelfStubber
- dist/Dumpvalue
- dist/Env
+ - dist/Exporter
- dist/ExtUtils-CBuilder
- dist/ExtUtils-Command
- dist/ExtUtils-Install
@@ -102,9 +103,6 @@ no_index:
- dist/lib/lib_pm.PL
- dist/lib/Makefile.PL
- dist/lib/t/01lib.t
- - lib/Exporter.pm
- - lib/Exporter.t
- - lib/Exporter/Heavy.pm
- lib/unicore/mktables
- lib/version.pm
- lib/version.pod
diff --git a/Makefile.SH b/Makefile.SH
index 3f023b005f..7d4ff0c4d0 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -859,7 +859,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
$spitshell >>$Makefile <<'!NO!SUBS!'
lib/buildcustomize.pl: $& $(mini_obj)
$(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs)
- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
;;
@@ -867,7 +867,7 @@ lib/buildcustomize.pl: $& $(mini_obj)
$spitshell >>$Makefile <<'!NO!SUBS!'
lib/buildcustomize.pl: $& $(mini_obj) write ldcustomize.pl
$(CC) -o $(MINIPERL_EXE) $(mini_obj libs)
- $(LDLIBPTH) $(RUN) ./miniperl$(HOST _EXT) -w -Ilib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
;;
@@ -889,7 +889,7 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
-@rm -f miniperl.xok
$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
$(mini_obj) $(libs)
- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
;;
@@ -899,7 +899,7 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
-@rm -f miniperl.xok
$(LDLIBPTH) $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
$(mini_obj) $(libs)
- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
+ $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
;;
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 22cd06a9b6..4b55d0c02b 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -634,19 +634,12 @@ use File::Glob qw(:case);
'Exporter' => {
'MAINTAINER' => 'ferreira',
'DISTRIBUTION' => 'TODDR/Exporter-5.68.tar.gz',
- 'FILES' => q[lib/Exporter.pm
- lib/Exporter.t
- lib/Exporter/Heavy.pm
- ],
+ 'FILES' => q[dist/Exporter],
'EXCLUDED' => [
qw( t/pod.t
t/use.t
),
],
- 'MAP' => {
- 't/' => 'lib/',
- 'lib/' => 'lib/',
- },
'UPSTREAM' => 'blead',
},
diff --git a/lib/Exporter.pm b/dist/Exporter/lib/Exporter.pm
index f7564f7c73..f7564f7c73 100644
--- a/lib/Exporter.pm
+++ b/dist/Exporter/lib/Exporter.pm
diff --git a/lib/Exporter/Heavy.pm b/dist/Exporter/lib/Exporter/Heavy.pm
index 724028a2b1..724028a2b1 100644
--- a/lib/Exporter/Heavy.pm
+++ b/dist/Exporter/lib/Exporter/Heavy.pm
diff --git a/lib/Exporter.t b/dist/Exporter/t/Exporter.t
index 06c4b05652..d6ac63f2e3 100644
--- a/lib/Exporter.t
+++ b/dist/Exporter/t/Exporter.t
@@ -1,12 +1,5 @@
#!perl -w
-BEGIN {
- if( $ENV{PERL_CORE} ) {
- chdir 't' if -d 't';
- @INC = '../lib';
- }
-}
-
# Can't use Test::Simple/More, they depend on Exporter.
my $test;
sub ok ($;$) {
diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
index 576fe5cfec..4916945d82 100644
--- a/write_buildcustomize.pl
+++ b/write_buildcustomize.pl
@@ -28,6 +28,7 @@ my @toolchain = qw(cpan/AutoLoader/lib
cpan/File-Path/lib
ext/re
dist/Term-ReadLine/lib
+ dist/Exporter/lib
);
# Used only in ExtUtils::Liblist::Kid::_win32_ext()
View Lorry Controller Status