From: Nicholas Clark Date: Thu, 10 Sep 2009 15:58:33 +0000 (+0100) Subject: Move ExtUtils::MakeMaker from lib to ext. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b78fd7160df924147ff968f6dc2796473af0c484;p=p5sagit%2Fp5-mst-13.2.git Move ExtUtils::MakeMaker from lib to ext. t/lib/TieOut.pm is now from Test::Simple. Only the tests needed changing. The exceptions to BEGIN/PERL_CORE/INC boilerplate removal were two instances of "../.." becoming "../../../..", and changing an %INC test from "strict.pm" to "less.pm", as TestInit causes strict to be loaded via a relative path, when it loads File::Spec to convert all paths from relative to absolute. --- diff --git a/MANIFEST b/MANIFEST index 7af5c96..e555b62 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1077,6 +1077,108 @@ ext/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm MakeMaker test utilities ext/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm MakeMaker test utilities ext/ExtUtils-Install/t/lib/TieOut.pm Testing library to capture prints ext/ExtUtils-Install/t/Packlist.t See if Packlist works +ext/ExtUtils-MakeMaker/bin/instmodsh Give information about installed extensions +ext/ExtUtils-MakeMaker/Changes MakeMaker change log +ext/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm Calling MM functions from the cmd line +ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm Does the real work of the above +ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm Locates libraries +ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm MakeMaker wrapper for Config +ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod MakeMaker FAQ +ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm Write Makefiles for extensions +ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod Writing a module with MakeMaker +ext/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm Writes a bootstrap file (see MakeMaker) +ext/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm Writes a linker options file for extensions +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm MakeMaker methods for AIX +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm MakeMaker methods for Any OS +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm MakeMaker methods for BeOS +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm MakeMaker methods for Cygwin +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm MakeMaker methods for Darwin +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm MakeMaker methods for DOS +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm MakeMaker methods for MacOS +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm MakeMaker methods for NetWare +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm MakeMaker methods for OS/2 +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm MakeMaker adaptor class +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm MakeMaker methods for QNX +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm MakeMaker methods for Unix +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm MakeMaker methods for U/WIN +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm MakeMaker methods for VMS +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm MakeMaker methods for VOS +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm MakeMaker methods for Win32 +ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm MakeMaker methods for Win95 +ext/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm MakeMaker user override class +ext/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm Fixes up @INC to use just-built extension +ext/ExtUtils-MakeMaker/MANIFEST ExtUtils::MakeMaker MANIFEST +ext/ExtUtils-MakeMaker/NOTES Notes about MakeMaker internals +ext/ExtUtils-MakeMaker/PATCHING Suggestions for patching MakeMaker +ext/ExtUtils-MakeMaker/README MakeMaker README +ext/ExtUtils-MakeMaker/t/00compile.t See if MakeMaker modules compile +ext/ExtUtils-MakeMaker/t/arch_check.t Test MakeMaker's arch_check() +ext/ExtUtils-MakeMaker/t/backwards.t Check MakeMaker's backwards compatibility +ext/ExtUtils-MakeMaker/t/basic.t See if MakeMaker can build a module +ext/ExtUtils-MakeMaker/t/build_man.t Set if MakeMaker builds manpages +ext/ExtUtils-MakeMaker/t/cd.t Test to see cd works +ext/ExtUtils-MakeMaker/t/config.t Test ExtUtils::MakeMaker::Config +ext/ExtUtils-MakeMaker/t/dir_target.t Verify if dir_target() is supported +ext/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t See if FIRST_MAKEFILE works +ext/ExtUtils-MakeMaker/t/fixin.t See if ExtUtils::MakeMaker works +ext/ExtUtils-MakeMaker/t/fix_libs.t Test for ExtUtils::MakeMaker +ext/ExtUtils-MakeMaker/t/hints.t See if hint files are honored. +ext/ExtUtils-MakeMaker/t/INSTALL_BASE.t Test INSTALL_BASE in MakeMaker +ext/ExtUtils-MakeMaker/t/installed_file.t Test for ExtUtils::MakeMaker +ext/ExtUtils-MakeMaker/t/INST_PREFIX.t See if MakeMaker can apply PREFIXs +ext/ExtUtils-MakeMaker/t/INST.t Check MakeMaker INST_* macros +ext/ExtUtils-MakeMaker/t/is_of_type.t Test for ExtUtils::MakeMaker +ext/ExtUtils-MakeMaker/t/Liblist.t See if ExtUtils::Liblist works +ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm MakeMaker test utilities +ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm MakeMaker test utilities +ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm MakeMaker test utilities +ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm MakeMaker test utilities +ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm MakeMaker test utilities +ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm MakeMaker test utilities +ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm MakeMaker test utilities +ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm MakeMaker test utilities +ext/ExtUtils-MakeMaker/t/lib/TieIn.pm Testing library for dummy input handles +ext/ExtUtils-MakeMaker/t/lib/TieOut.pm Testing library to capture prints +ext/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t test "MakeMaker Parameters" section +ext/ExtUtils-MakeMaker/t/make.t See if make detection works +ext/ExtUtils-MakeMaker/t/maketext_filter.t See if maketext_filter works +ext/ExtUtils-MakeMaker/t/metafile_data.t See if META.yml handling works +ext/ExtUtils-MakeMaker/t/metafile_file.t See if META.yml handling works +ext/ExtUtils-MakeMaker/t/miniperl.t Test MakeMaker with miniperl +ext/ExtUtils-MakeMaker/t/min_perl_version.t Test the MIN_PERL_VERSION argument to WriteMakefile. +ext/ExtUtils-MakeMaker/t/Mkbootstrap.t See if ExtUtils::Mkbootstrap works +ext/ExtUtils-MakeMaker/t/MM_Any.t See if ExtUtils::MM_Any works +ext/ExtUtils-MakeMaker/t/MM_BeOS.t See if ExtUtils::MM_BeOS works +ext/ExtUtils-MakeMaker/t/MM_Cygwin.t See if ExtUtils::MM_Cygwin works +ext/ExtUtils-MakeMaker/t/MM_NW5.t See if ExtUtils::MM_NW5 works +ext/ExtUtils-MakeMaker/t/MM_OS2.t See if ExtUtils::MM_OS2 works +ext/ExtUtils-MakeMaker/t/MM_Unix.t See if ExtUtils::MM_UNIX works +ext/ExtUtils-MakeMaker/t/MM_VMS.t See if ExtUtils::MM_VMS works +ext/ExtUtils-MakeMaker/t/MM_Win32.t See if ExtUtils::MM_Win32 works +ext/ExtUtils-MakeMaker/TODO Things TODO in MakeMaker +ext/ExtUtils-MakeMaker/t/oneliner.t See if MM can generate perl one-liners +ext/ExtUtils-MakeMaker/t/parse_version.t See if parse_version works +ext/ExtUtils-MakeMaker/t/PL_FILES.t Test PL_FILES in MakeMaker +ext/ExtUtils-MakeMaker/t/pm.t See if MakeMaker can handle PM +ext/ExtUtils-MakeMaker/t/pm_to_blib.t Test for ExtUtils::MakeMaker +ext/ExtUtils-MakeMaker/t/pod2man.t See if MakeMaker can handle no pod2man +ext/ExtUtils-MakeMaker/t/postamble.t See if postamble works +ext/ExtUtils-MakeMaker/t/prefixify.t See if MakeMaker can apply a PREFIX +ext/ExtUtils-MakeMaker/t/prereq_print.t See if PREREQ_PRINT works +ext/ExtUtils-MakeMaker/t/prereq.t See if MakeMaker works +ext/ExtUtils-MakeMaker/t/problems.t How MakeMaker reacts to build problems +ext/ExtUtils-MakeMaker/t/prompt.t See if E::MM::prompt() works +ext/ExtUtils-MakeMaker/t/recurs.t See if recursive builds work +ext/ExtUtils-MakeMaker/t/revision.t See if $Revision is correct +ext/ExtUtils-MakeMaker/t/split_command.t See if MM's xargs-like function works +ext/ExtUtils-MakeMaker/t/test_boilerplate.t MakeMaker test +ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm test data for MakeMaker +ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm test data for MakeMaker +ext/ExtUtils-MakeMaker/t/testlib.t See if ExtUtils::testlib works +ext/ExtUtils-MakeMaker/t/VERSION_FROM.t See if MakeMaker's VERSION_FROM works +ext/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t See if WriteEmptyMakefile works +ext/ExtUtils-MakeMaker/t/writemakefile_args.t See if WriteMakefile works +ext/ExtUtils-MakeMaker/t/xs.t Part of MakeMaker's test suite ext/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm Utilities to write MANIFEST files ext/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP The default MANIFEST.SKIP ext/ExtUtils-Manifest/t/Manifest.t See if ExtUtils::Manifest works @@ -2589,99 +2691,8 @@ lib/exceptions.pl catch and throw routines lib/Exporter/Heavy.pm Complicated routines for Exporter lib/Exporter.pm Exporter base class lib/Exporter.t See if Exporter works -lib/ExtUtils/Changes MakeMaker change log -lib/ExtUtils/Command/MM.pm Calling MM functions from the cmd line lib/ExtUtils/Embed.pm Utilities for embedding Perl in C programs -lib/ExtUtils/instmodsh Give information about installed extensions -lib/ExtUtils/Liblist/Kid.pm Does the real work of the above -lib/ExtUtils/Liblist.pm Locates libraries -lib/ExtUtils/MakeMaker/Config.pm MakeMaker wrapper for Config -lib/ExtUtils/MakeMaker/FAQ.pod MakeMaker FAQ -lib/ExtUtils/MakeMaker.pm Write Makefiles for extensions -lib/ExtUtils/MakeMaker/Tutorial.pod Writing a module with MakeMaker -lib/ExtUtils/Mkbootstrap.pm Writes a bootstrap file (see MakeMaker) -lib/ExtUtils/Mksymlists.pm Writes a linker options file for extensions -lib/ExtUtils/MM_AIX.pm MakeMaker methods for AIX -lib/ExtUtils/MM_Any.pm MakeMaker methods for Any OS -lib/ExtUtils/MM_BeOS.pm MakeMaker methods for BeOS -lib/ExtUtils/MM_Cygwin.pm MakeMaker methods for Cygwin -lib/ExtUtils/MM_Darwin.pm MakeMaker methods for Darwin -lib/ExtUtils/MM_DOS.pm MakeMaker methods for DOS -lib/ExtUtils/MM_MacOS.pm MakeMaker methods for MacOS -lib/ExtUtils/MM_NW5.pm MakeMaker methods for NetWare -lib/ExtUtils/MM_OS2.pm MakeMaker methods for OS/2 -lib/ExtUtils/MM.pm MakeMaker adaptor class -lib/ExtUtils/MM_QNX.pm MakeMaker methods for QNX -lib/ExtUtils/MM_Unix.pm MakeMaker methods for Unix -lib/ExtUtils/MM_UWIN.pm MakeMaker methods for U/WIN -lib/ExtUtils/MM_VMS.pm MakeMaker methods for VMS -lib/ExtUtils/MM_VOS.pm MakeMaker methods for VOS -lib/ExtUtils/MM_Win32.pm MakeMaker methods for Win32 -lib/ExtUtils/MM_Win95.pm MakeMaker methods for Win95 -lib/ExtUtils/MY.pm MakeMaker user override class -lib/ExtUtils/NOTES Notes about MakeMaker internals -lib/ExtUtils/PATCHING Suggestions for patching MakeMaker -lib/ExtUtils/README MakeMaker README -lib/ExtUtils/t/00compile.t See if MakeMaker modules compile -lib/ExtUtils/t/arch_check.t Test MakeMaker's arch_check() -lib/ExtUtils/t/backwards.t Check MakeMaker's backwards compatibility -lib/ExtUtils/t/basic.t See if MakeMaker can build a module -lib/ExtUtils/t/build_man.t Set if MakeMaker builds manpages -lib/ExtUtils/t/cd.t Test to see cd works -lib/ExtUtils/t/config.t Test ExtUtils::MakeMaker::Config -lib/ExtUtils/t/dir_target.t Verify if dir_target() is supported lib/ExtUtils/t/Embed.t See if ExtUtils::Embed and embedding works -lib/ExtUtils/testlib.pm Fixes up @INC to use just-built extension -lib/ExtUtils/t/FIRST_MAKEFILE.t See if FIRST_MAKEFILE works -lib/ExtUtils/t/fixin.t See if ExtUtils::MakeMaker works -lib/ExtUtils/t/fix_libs.t Test for ExtUtils::MakeMaker -lib/ExtUtils/t/hints.t See if hint files are honored. -lib/ExtUtils/t/INSTALL_BASE.t Test INSTALL_BASE in MakeMaker -lib/ExtUtils/t/installed_file.t Test for ExtUtils::MakeMaker -lib/ExtUtils/t/INST_PREFIX.t See if MakeMaker can apply PREFIXs -lib/ExtUtils/t/INST.t Check MakeMaker INST_* macros -lib/ExtUtils/t/is_of_type.t Test for ExtUtils::MakeMaker -lib/ExtUtils/t/Liblist.t See if ExtUtils::Liblist works -lib/ExtUtils/t/MakeMaker_Parameters.t test "MakeMaker Parameters" section -lib/ExtUtils/t/make.t See if make detection works -lib/ExtUtils/t/maketext_filter.t See if maketext_filter works -lib/ExtUtils/t/metafile_data.t See if META.yml handling works -lib/ExtUtils/t/metafile_file.t See if META.yml handling works -lib/ExtUtils/t/miniperl.t Test MakeMaker with miniperl -lib/ExtUtils/t/min_perl_version.t Test the MIN_PERL_VERSION argument to WriteMakefile. -lib/ExtUtils/t/Mkbootstrap.t See if ExtUtils::Mkbootstrap works -lib/ExtUtils/t/MM_Any.t See if ExtUtils::MM_Any works -lib/ExtUtils/t/MM_BeOS.t See if ExtUtils::MM_BeOS works -lib/ExtUtils/t/MM_Cygwin.t See if ExtUtils::MM_Cygwin works -lib/ExtUtils/t/MM_NW5.t See if ExtUtils::MM_NW5 works -lib/ExtUtils/t/MM_OS2.t See if ExtUtils::MM_OS2 works -lib/ExtUtils/t/MM_Unix.t See if ExtUtils::MM_UNIX works -lib/ExtUtils/t/MM_VMS.t See if ExtUtils::MM_VMS works -lib/ExtUtils/t/MM_Win32.t See if ExtUtils::MM_Win32 works -lib/ExtUtils/TODO Things TODO in MakeMaker -lib/ExtUtils/t/oneliner.t See if MM can generate perl one-liners -lib/ExtUtils/t/parse_version.t See if parse_version works -lib/ExtUtils/t/PL_FILES.t Test PL_FILES in MakeMaker -lib/ExtUtils/t/pm.t See if MakeMaker can handle PM -lib/ExtUtils/t/pm_to_blib.t Test for ExtUtils::MakeMaker -lib/ExtUtils/t/pod2man.t See if MakeMaker can handle no pod2man -lib/ExtUtils/t/postamble.t See if postamble works -lib/ExtUtils/t/prefixify.t See if MakeMaker can apply a PREFIX -lib/ExtUtils/t/prereq_print.t See if PREREQ_PRINT works -lib/ExtUtils/t/prereq.t See if MakeMaker works -lib/ExtUtils/t/problems.t How MakeMaker reacts to build problems -lib/ExtUtils/t/prompt.t See if E::MM::prompt() works -lib/ExtUtils/t/recurs.t See if recursive builds work -lib/ExtUtils/t/revision.t See if $Revision is correct -lib/ExtUtils/t/split_command.t See if MM's xargs-like function works -lib/ExtUtils/t/test_boilerplate.t MakeMaker test -lib/ExtUtils/t/testdata/reallylongdirectoryname/arch1/Config.pm test data for MakeMaker -lib/ExtUtils/t/testdata/reallylongdirectoryname/arch2/Config.pm test data for MakeMaker -lib/ExtUtils/t/testlib.t See if ExtUtils::testlib works -lib/ExtUtils/t/VERSION_FROM.t See if MakeMaker's VERSION_FROM works -lib/ExtUtils/t/WriteEmptyMakefile.t See if WriteEmptyMakefile works -lib/ExtUtils/t/writemakefile_args.t See if WriteMakefile works -lib/ExtUtils/t/xs.t Part of MakeMaker's test suite lib/ExtUtils/typemap Extension interface types lib/ExtUtils/XSSymSet.pm on VMS, manage linker symbols when building extensions lib/fastcwd.pl a faster but more dangerous getcwd @@ -4108,14 +4119,6 @@ t/lib/h2ph.pht Generated output from h2ph.h by h2ph, for comparison t/lib/locale/latin1 Part of locale.t in Latin 1 t/lib/locale/utf8 Part of locale.t in UTF8 t/lib/maintainers.t Test that Porting/Maintaners.pl is up to date -t/lib/MakeMaker/Test/NoXS.pm MakeMaker test utilities -t/lib/MakeMaker/Test/Setup/BFD.pm MakeMaker test utilities -t/lib/MakeMaker/Test/Setup/MPV.pm MakeMaker test utilities -t/lib/MakeMaker/Test/Setup/PL_FILES.pm MakeMaker test utilities -t/lib/MakeMaker/Test/Setup/Problem.pm MakeMaker test utilities -t/lib/MakeMaker/Test/Setup/Recurs.pm MakeMaker test utilities -t/lib/MakeMaker/Test/Setup/XS.pm MakeMaker test utilities -t/lib/MakeMaker/Test/Utils.pm MakeMaker test utilities t/lib/manifest.t Test that this MANIFEST file is well formed t/lib/Math/BigFloat/Subclass.pm Empty subclass of BigFloat for test t/lib/Math/BigInt/BareCalc.pm Bigint's simulation of Calc @@ -4146,7 +4149,6 @@ t/lib/Test/Simple/sample_tests/success.plx for exit.t t/lib/Test/Simple/sample_tests/too_few_fail.plx for exit.t t/lib/Test/Simple/sample_tests/too_few.plx for exit.t t/lib/Test/Simple/sample_tests/two_fail.plx for exit.t -t/lib/TieIn.pm Testing library for dummy input handles t/lib/TieOut.pm Testing library to capture prints t/lib/warnings/1global Tests of global warnings for warnings.t t/lib/warnings/2use Tests for "use warnings" for warnings.t diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 0f76466..0da12f1 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -618,28 +618,10 @@ use File::Glob qw(:case); { 'MAINTAINER' => 'mschwern', 'DISTRIBUTION' => 'MSCHWERN/ExtUtils-MakeMaker-6.55_02.tar.gz', - # note that t/lib/TieOut.pm is included in - # more than one distro - 'FILES' => q[lib/ExtUtils/{Liblist,MakeMaker,Mkbootstrap,Mksymlists,MM*,MY,testlib}.pm - lib/ExtUtils/{Command,Liblist,MakeMaker} - lib/ExtUtils/t/{[0-9FLV-Zabdf-z]*,IN*,Mkbootstrap,MM_*,PL_FILES,cd,config}.t - lib/ExtUtils/t/testdata/ - lib/ExtUtils/t/MakeMaker_Parameters.t - lib/ExtUtils/Changes - lib/ExtUtils/{NOTES,PATCHING,README,TODO} - lib/ExtUtils/instmodsh - t/lib/MakeMaker - t/lib/TieIn.pm - t/lib/TieOut.pm - ], + 'FILES' => q[ext/ExtUtils-MakeMaker], 'EXCLUDED' => [ qr{^t/lib/Test/}, qr{^inc/ExtUtils/}, ], - 'MAP' => { '' => 'lib/ExtUtils/', - 'lib/' => 'lib/', - 't/lib/' => 't/lib/', - 'bin/' => 'lib/ExtUtils/', - }, 'CPAN' => 1, 'UPSTREAM' => 'first-come', }, @@ -1601,8 +1583,6 @@ use File::Glob qw(:case); t/Builder/reset_outputs.t lib/Test/Builder/IO/Scalar.pm - - t/lib/TieOut.pm } ], 'MAP' => { diff --git a/ext/.gitignore b/ext/.gitignore index 82134c9..80a11c4 100644 --- a/ext/.gitignore +++ b/ext/.gitignore @@ -31,6 +31,7 @@ ppport.h /ExtUtils-Constant/Makefile.PL /ExtUtils-Install/Makefile.PL /ExtUtils-Manifest/Makefile.PL +/ExtUtils-MakeMaker/Makefile.PL /ExtUtils-ParseXS/Makefile.PL /FileCache/Makefile.PL /File-Fetch/Makefile.PL diff --git a/lib/ExtUtils/Changes b/ext/ExtUtils-MakeMaker/Changes similarity index 100% rename from lib/ExtUtils/Changes rename to ext/ExtUtils-MakeMaker/Changes diff --git a/lib/ExtUtils/NOTES b/ext/ExtUtils-MakeMaker/NOTES similarity index 100% rename from lib/ExtUtils/NOTES rename to ext/ExtUtils-MakeMaker/NOTES diff --git a/lib/ExtUtils/PATCHING b/ext/ExtUtils-MakeMaker/PATCHING similarity index 100% rename from lib/ExtUtils/PATCHING rename to ext/ExtUtils-MakeMaker/PATCHING diff --git a/lib/ExtUtils/README b/ext/ExtUtils-MakeMaker/README similarity index 100% rename from lib/ExtUtils/README rename to ext/ExtUtils-MakeMaker/README diff --git a/lib/ExtUtils/TODO b/ext/ExtUtils-MakeMaker/TODO similarity index 100% rename from lib/ExtUtils/TODO rename to ext/ExtUtils-MakeMaker/TODO diff --git a/lib/ExtUtils/instmodsh b/ext/ExtUtils-MakeMaker/bin/instmodsh similarity index 100% rename from lib/ExtUtils/instmodsh rename to ext/ExtUtils-MakeMaker/bin/instmodsh diff --git a/lib/ExtUtils/Command/MM.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm similarity index 100% rename from lib/ExtUtils/Command/MM.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm diff --git a/lib/ExtUtils/Liblist.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm similarity index 100% rename from lib/ExtUtils/Liblist.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm diff --git a/lib/ExtUtils/Liblist/Kid.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm similarity index 100% rename from lib/ExtUtils/Liblist/Kid.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm diff --git a/lib/ExtUtils/MM.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm similarity index 100% rename from lib/ExtUtils/MM.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm diff --git a/lib/ExtUtils/MM_AIX.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm similarity index 100% rename from lib/ExtUtils/MM_AIX.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm diff --git a/lib/ExtUtils/MM_Any.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm similarity index 100% rename from lib/ExtUtils/MM_Any.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm diff --git a/lib/ExtUtils/MM_BeOS.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm similarity index 100% rename from lib/ExtUtils/MM_BeOS.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm diff --git a/lib/ExtUtils/MM_Cygwin.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm similarity index 100% rename from lib/ExtUtils/MM_Cygwin.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm diff --git a/lib/ExtUtils/MM_DOS.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm similarity index 100% rename from lib/ExtUtils/MM_DOS.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm diff --git a/lib/ExtUtils/MM_Darwin.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm similarity index 100% rename from lib/ExtUtils/MM_Darwin.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm diff --git a/lib/ExtUtils/MM_MacOS.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm similarity index 100% rename from lib/ExtUtils/MM_MacOS.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm diff --git a/lib/ExtUtils/MM_NW5.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm similarity index 100% rename from lib/ExtUtils/MM_NW5.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm diff --git a/lib/ExtUtils/MM_OS2.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm similarity index 100% rename from lib/ExtUtils/MM_OS2.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm diff --git a/lib/ExtUtils/MM_QNX.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm similarity index 100% rename from lib/ExtUtils/MM_QNX.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm diff --git a/lib/ExtUtils/MM_UWIN.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm similarity index 100% rename from lib/ExtUtils/MM_UWIN.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm diff --git a/lib/ExtUtils/MM_Unix.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm similarity index 100% rename from lib/ExtUtils/MM_Unix.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm diff --git a/lib/ExtUtils/MM_VMS.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm similarity index 100% rename from lib/ExtUtils/MM_VMS.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm diff --git a/lib/ExtUtils/MM_VOS.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm similarity index 100% rename from lib/ExtUtils/MM_VOS.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm diff --git a/lib/ExtUtils/MM_Win32.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm similarity index 100% rename from lib/ExtUtils/MM_Win32.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm diff --git a/lib/ExtUtils/MM_Win95.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm similarity index 100% rename from lib/ExtUtils/MM_Win95.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm diff --git a/lib/ExtUtils/MY.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm similarity index 100% rename from lib/ExtUtils/MY.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm diff --git a/lib/ExtUtils/MakeMaker.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm similarity index 100% rename from lib/ExtUtils/MakeMaker.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm diff --git a/lib/ExtUtils/MakeMaker/Config.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm similarity index 100% rename from lib/ExtUtils/MakeMaker/Config.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm diff --git a/lib/ExtUtils/MakeMaker/FAQ.pod b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod similarity index 100% rename from lib/ExtUtils/MakeMaker/FAQ.pod rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod diff --git a/lib/ExtUtils/MakeMaker/Tutorial.pod b/ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod similarity index 100% rename from lib/ExtUtils/MakeMaker/Tutorial.pod rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod diff --git a/lib/ExtUtils/Mkbootstrap.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm similarity index 100% rename from lib/ExtUtils/Mkbootstrap.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm diff --git a/lib/ExtUtils/Mksymlists.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm similarity index 100% rename from lib/ExtUtils/Mksymlists.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm diff --git a/lib/ExtUtils/testlib.pm b/ext/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm similarity index 100% rename from lib/ExtUtils/testlib.pm rename to ext/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm diff --git a/lib/ExtUtils/t/00compile.t b/ext/ExtUtils-MakeMaker/t/00compile.t similarity index 78% rename from lib/ExtUtils/t/00compile.t rename to ext/ExtUtils-MakeMaker/t/00compile.t index 20f7ded..743bd99 100644 --- a/lib/ExtUtils/t/00compile.t +++ b/ext/ExtUtils-MakeMaker/t/00compile.t @@ -1,12 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; @@ -21,8 +16,8 @@ chdir ".."; my $manifest = "MANIFEST"; open(my $manifest_fh, "<", $manifest) or die "Can't open $manifest: $!"; my @modules = map { m{^lib/(\S+)}; $1 } - grep { m{^lib/ExtUtils/\S*\.pm} } - grep { !m{/t/} } <$manifest_fh>; + grep { m{^lib/\S+\.pm} } + <$manifest_fh>; chomp @modules; close $manifest_fh; diff --git a/lib/ExtUtils/t/FIRST_MAKEFILE.t b/ext/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t similarity index 82% rename from lib/ExtUtils/t/FIRST_MAKEFILE.t rename to ext/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t index 00e6082..6de5a73 100644 --- a/lib/ExtUtils/t/FIRST_MAKEFILE.t +++ b/ext/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/INST.t b/ext/ExtUtils-MakeMaker/t/INST.t similarity index 95% rename from lib/ExtUtils/t/INST.t rename to ext/ExtUtils-MakeMaker/t/INST.t index 49938cb..8a140eb 100644 --- a/lib/ExtUtils/t/INST.t +++ b/ext/ExtUtils-MakeMaker/t/INST.t @@ -6,13 +6,7 @@ # Essentially, this test is a Makefile.PL. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; @@ -73,7 +67,7 @@ is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' ); my($perl_src, $mm_perl_src); if( $ENV{PERL_CORE} ) { - $perl_src = File::Spec->catdir($Updir, $Updir); + $perl_src = File::Spec->catdir($Updir, $Updir, $Updir, $Updir); $perl_src = File::Spec->canonpath($perl_src); $mm_perl_src = File::Spec->canonpath($mm->{PERL_SRC}); } diff --git a/lib/ExtUtils/t/INSTALL_BASE.t b/ext/ExtUtils-MakeMaker/t/INSTALL_BASE.t similarity index 92% rename from lib/ExtUtils/t/INSTALL_BASE.t rename to ext/ExtUtils-MakeMaker/t/INSTALL_BASE.t index 95c62cc..d2f605e 100644 --- a/lib/ExtUtils/t/INSTALL_BASE.t +++ b/ext/ExtUtils-MakeMaker/t/INSTALL_BASE.t @@ -3,13 +3,7 @@ # Tests INSTALL_BASE BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/INST_PREFIX.t b/ext/ExtUtils-MakeMaker/t/INST_PREFIX.t similarity index 97% rename from lib/ExtUtils/t/INST_PREFIX.t rename to ext/ExtUtils-MakeMaker/t/INST_PREFIX.t index 57e7eb2..8bb9db8 100644 --- a/lib/ExtUtils/t/INST_PREFIX.t +++ b/ext/ExtUtils-MakeMaker/t/INST_PREFIX.t @@ -6,13 +6,7 @@ # Essentially, this test is a Makefile.PL. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; @@ -102,7 +96,7 @@ is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' ); my($perl_src, $mm_perl_src); if( $ENV{PERL_CORE} ) { - $perl_src = File::Spec->catdir($Updir, $Updir); + $perl_src = File::Spec->catdir($Updir, $Updir, $Updir, $Updir); $perl_src = File::Spec->canonpath($perl_src); $mm_perl_src = File::Spec->canonpath($mm->{PERL_SRC}); } diff --git a/lib/ExtUtils/t/Liblist.t b/ext/ExtUtils-MakeMaker/t/Liblist.t similarity index 100% rename from lib/ExtUtils/t/Liblist.t rename to ext/ExtUtils-MakeMaker/t/Liblist.t diff --git a/lib/ExtUtils/t/MM_Any.t b/ext/ExtUtils-MakeMaker/t/MM_Any.t similarity index 84% rename from lib/ExtUtils/t/MM_Any.t rename to ext/ExtUtils-MakeMaker/t/MM_Any.t index 0326274..672ff4d 100644 --- a/lib/ExtUtils/t/MM_Any.t +++ b/ext/ExtUtils-MakeMaker/t/MM_Any.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/MM_BeOS.t b/ext/ExtUtils-MakeMaker/t/MM_BeOS.t similarity index 88% rename from lib/ExtUtils/t/MM_BeOS.t rename to ext/ExtUtils-MakeMaker/t/MM_BeOS.t index bb9583d..be19058 100644 --- a/lib/ExtUtils/t/MM_BeOS.t +++ b/ext/ExtUtils-MakeMaker/t/MM_BeOS.t @@ -1,13 +1,7 @@ #!/usr/bin/perl BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/MM_Cygwin.t b/ext/ExtUtils-MakeMaker/t/MM_Cygwin.t similarity index 95% rename from lib/ExtUtils/t/MM_Cygwin.t rename to ext/ExtUtils-MakeMaker/t/MM_Cygwin.t index d952188..9640ac7 100644 --- a/lib/ExtUtils/t/MM_Cygwin.t +++ b/ext/ExtUtils-MakeMaker/t/MM_Cygwin.t @@ -1,13 +1,7 @@ #!/usr/bin/perl BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/MM_NW5.t b/ext/ExtUtils-MakeMaker/t/MM_NW5.t similarity index 98% rename from lib/ExtUtils/t/MM_NW5.t rename to ext/ExtUtils-MakeMaker/t/MM_NW5.t index f8a3635..3f6198f 100644 --- a/lib/ExtUtils/t/MM_NW5.t +++ b/ext/ExtUtils-MakeMaker/t/MM_NW5.t @@ -1,13 +1,7 @@ #!/usr/bin/perl BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - unshift @INC, '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/MM_OS2.t b/ext/ExtUtils-MakeMaker/t/MM_OS2.t similarity index 98% rename from lib/ExtUtils/t/MM_OS2.t rename to ext/ExtUtils-MakeMaker/t/MM_OS2.t index c09f68a..4d88e85 100644 --- a/lib/ExtUtils/t/MM_OS2.t +++ b/ext/ExtUtils-MakeMaker/t/MM_OS2.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/MM_Unix.t b/ext/ExtUtils-MakeMaker/t/MM_Unix.t similarity index 95% rename from lib/ExtUtils/t/MM_Unix.t rename to ext/ExtUtils-MakeMaker/t/MM_Unix.t index ed23d60..55c29e3 100644 --- a/lib/ExtUtils/t/MM_Unix.t +++ b/ext/ExtUtils-MakeMaker/t/MM_Unix.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; @@ -184,8 +178,7 @@ unlink "command"; ############################################################################### # perl_script (on unix any ordinary, readable file) -my $self_name = $ENV{PERL_CORE} ? '../lib/ExtUtils/t/MM_Unix.t' - : 'MM_Unix.t'; +my $self_name = 'MM_Unix.t'; is ($t->perl_script($self_name),$self_name, 'we pass as a perl_script()'); ############################################################################### diff --git a/lib/ExtUtils/t/MM_VMS.t b/ext/ExtUtils-MakeMaker/t/MM_VMS.t similarity index 92% rename from lib/ExtUtils/t/MM_VMS.t rename to ext/ExtUtils-MakeMaker/t/MM_VMS.t index 406b17f..39a5aad 100644 --- a/lib/ExtUtils/t/MM_VMS.t +++ b/ext/ExtUtils-MakeMaker/t/MM_VMS.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/MM_Win32.t b/ext/ExtUtils-MakeMaker/t/MM_Win32.t similarity index 98% rename from lib/ExtUtils/t/MM_Win32.t rename to ext/ExtUtils-MakeMaker/t/MM_Win32.t index c779da2..39475ae 100644 --- a/lib/ExtUtils/t/MM_Win32.t +++ b/ext/ExtUtils-MakeMaker/t/MM_Win32.t @@ -1,13 +1,7 @@ #!/usr/bin/perl BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/MakeMaker_Parameters.t b/ext/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t similarity index 91% rename from lib/ExtUtils/t/MakeMaker_Parameters.t rename to ext/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t index 3518d58..dd113a9 100644 --- a/lib/ExtUtils/t/MakeMaker_Parameters.t +++ b/ext/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t @@ -4,13 +4,7 @@ # Makefile to learn a module's dependencies so we'd damn well better test it. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/Mkbootstrap.t b/ext/ExtUtils-MakeMaker/t/Mkbootstrap.t similarity index 96% rename from lib/ExtUtils/t/Mkbootstrap.t rename to ext/ExtUtils-MakeMaker/t/Mkbootstrap.t index fe07ddf..17a3e45 100644 --- a/lib/ExtUtils/t/Mkbootstrap.t +++ b/ext/ExtUtils-MakeMaker/t/Mkbootstrap.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = ('../lib', 'lib/'); - } - else { - unshift @INC, 't/lib/'; - } + unshift @INC, 't/lib/'; } chdir 't'; diff --git a/lib/ExtUtils/t/PL_FILES.t b/ext/ExtUtils-MakeMaker/t/PL_FILES.t similarity index 79% rename from lib/ExtUtils/t/PL_FILES.t rename to ext/ExtUtils-MakeMaker/t/PL_FILES.t index 106fb08..2d22790 100644 --- a/lib/ExtUtils/t/PL_FILES.t +++ b/ext/ExtUtils-MakeMaker/t/PL_FILES.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/VERSION_FROM.t b/ext/ExtUtils-MakeMaker/t/VERSION_FROM.t similarity index 79% rename from lib/ExtUtils/t/VERSION_FROM.t rename to ext/ExtUtils-MakeMaker/t/VERSION_FROM.t index 332b723..56942c8 100644 --- a/lib/ExtUtils/t/VERSION_FROM.t +++ b/ext/ExtUtils-MakeMaker/t/VERSION_FROM.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/WriteEmptyMakefile.t b/ext/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t similarity index 79% rename from lib/ExtUtils/t/WriteEmptyMakefile.t rename to ext/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t index a5de6f1..8849675 100644 --- a/lib/ExtUtils/t/WriteEmptyMakefile.t +++ b/ext/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t @@ -3,13 +3,7 @@ # This is a test of WriteEmptyMakefile. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/arch_check.t b/ext/ExtUtils-MakeMaker/t/arch_check.t similarity index 94% rename from lib/ExtUtils/t/arch_check.t rename to ext/ExtUtils-MakeMaker/t/arch_check.t index deb289a..e4b3aef 100644 --- a/lib/ExtUtils/t/arch_check.t +++ b/ext/ExtUtils-MakeMaker/t/arch_check.t @@ -1,12 +1,5 @@ #!/usr/bin/perl -w -BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = qw(../lib lib); - } -} - use strict; use lib 't/lib'; diff --git a/lib/ExtUtils/t/backwards.t b/ext/ExtUtils-MakeMaker/t/backwards.t similarity index 69% rename from lib/ExtUtils/t/backwards.t rename to ext/ExtUtils-MakeMaker/t/backwards.t index 95b1e16..a9ecb82 100644 --- a/lib/ExtUtils/t/backwards.t +++ b/ext/ExtUtils-MakeMaker/t/backwards.t @@ -4,13 +4,7 @@ # MakeMaker has to support. And we do mean backwards. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/basic.t b/ext/ExtUtils-MakeMaker/t/basic.t similarity index 98% rename from lib/ExtUtils/t/basic.t rename to ext/ExtUtils-MakeMaker/t/basic.t index 67d39f5..0a51e49 100644 --- a/lib/ExtUtils/t/basic.t +++ b/ext/ExtUtils-MakeMaker/t/basic.t @@ -4,13 +4,7 @@ # build, test and installation of the Big::Fat::Dummy module. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/build_man.t b/ext/ExtUtils-MakeMaker/t/build_man.t similarity index 91% rename from lib/ExtUtils/t/build_man.t rename to ext/ExtUtils-MakeMaker/t/build_man.t index 9732c38..d4649e7 100644 --- a/lib/ExtUtils/t/build_man.t +++ b/ext/ExtUtils-MakeMaker/t/build_man.t @@ -3,13 +3,7 @@ # Test if MakeMaker declines to build man pages under the right conditions. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/cd.t b/ext/ExtUtils-MakeMaker/t/cd.t similarity index 88% rename from lib/ExtUtils/t/cd.t rename to ext/ExtUtils-MakeMaker/t/cd.t index dfd3ce4..2563bf0 100644 --- a/lib/ExtUtils/t/cd.t +++ b/ext/ExtUtils-MakeMaker/t/cd.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = ('../lib', 'lib/'); - } - else { - unshift @INC, 't/lib/'; - } + unshift @INC, 't/lib/'; } chdir 't'; diff --git a/lib/ExtUtils/t/config.t b/ext/ExtUtils-MakeMaker/t/config.t similarity index 62% rename from lib/ExtUtils/t/config.t rename to ext/ExtUtils-MakeMaker/t/config.t index 094fce0..aca3dc6 100644 --- a/lib/ExtUtils/t/config.t +++ b/ext/ExtUtils-MakeMaker/t/config.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = ('../lib', 'lib/'); - } - else { - unshift @INC, 't/lib/'; - } + unshift @INC, 't/lib/'; } use Test::More tests => 3; diff --git a/ext/ExtUtils-MakeMaker/t/dir_target.t b/ext/ExtUtils-MakeMaker/t/dir_target.t new file mode 100644 index 0000000..0485469 --- /dev/null +++ b/ext/ExtUtils-MakeMaker/t/dir_target.t @@ -0,0 +1,12 @@ +#!/usr/bin/perl -w + +BEGIN { + unshift @INC, 't/lib/'; +} +chdir 't'; + +use Test::More tests => 1; +use ExtUtils::MakeMaker; + +# dir_target() was typo'd as dir_targets() +can_ok('MM', 'dir_target'); diff --git a/lib/ExtUtils/t/fix_libs.t b/ext/ExtUtils-MakeMaker/t/fix_libs.t similarity index 92% rename from lib/ExtUtils/t/fix_libs.t rename to ext/ExtUtils-MakeMaker/t/fix_libs.t index 2a9bf0c..0ca8ffb 100644 --- a/lib/ExtUtils/t/fix_libs.t +++ b/ext/ExtUtils-MakeMaker/t/fix_libs.t @@ -4,10 +4,6 @@ BEGIN { chdir 't' if -d 't'; - - if( $ENV{PERL_CORE} ) { - @INC = '../lib'; - } } use strict; diff --git a/lib/ExtUtils/t/fixin.t b/ext/ExtUtils-MakeMaker/t/fixin.t similarity index 93% rename from lib/ExtUtils/t/fixin.t rename to ext/ExtUtils-MakeMaker/t/fixin.t index e0291e6..de5866a 100644 --- a/lib/ExtUtils/t/fixin.t +++ b/ext/ExtUtils-MakeMaker/t/fixin.t @@ -4,13 +4,7 @@ # is highly variable from system to system. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = ('../lib', 'lib/'); - } - else { - unshift @INC, 't/lib/'; - } + unshift @INC, 't/lib/'; } chdir 't'; diff --git a/lib/ExtUtils/t/hints.t b/ext/ExtUtils-MakeMaker/t/hints.t similarity index 88% rename from lib/ExtUtils/t/hints.t rename to ext/ExtUtils-MakeMaker/t/hints.t index 96bb09d..ab9d955 100644 --- a/lib/ExtUtils/t/hints.t +++ b/ext/ExtUtils-MakeMaker/t/hints.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = ('../lib', 'lib/'); - } - else { - unshift @INC, 't/lib/'; - } + unshift @INC, 't/lib/'; } chdir 't'; diff --git a/lib/ExtUtils/t/installed_file.t b/ext/ExtUtils-MakeMaker/t/installed_file.t similarity index 81% rename from lib/ExtUtils/t/installed_file.t rename to ext/ExtUtils-MakeMaker/t/installed_file.t index c2dfce7..58516bc 100644 --- a/lib/ExtUtils/t/installed_file.t +++ b/ext/ExtUtils-MakeMaker/t/installed_file.t @@ -4,14 +4,11 @@ BEGIN { chdir 't' if -d 't'; - - if( $ENV{PERL_CORE} ) { - @INC = '../lib'; - } } use strict; use warnings; +use less; use lib './lib'; use ExtUtils::MakeMaker; @@ -37,8 +34,8 @@ sub path_is { # Try a single name module { - my $want = $INC{'strict.pm'}; - path_is( MM->_installed_file_for_module("strict"), $want, "single name module" ); + my $want = $INC{'less.pm'}; + path_is( MM->_installed_file_for_module("less"), $want, "single name module" ); } # And a tuple diff --git a/lib/ExtUtils/t/is_of_type.t b/ext/ExtUtils-MakeMaker/t/is_of_type.t similarity index 93% rename from lib/ExtUtils/t/is_of_type.t rename to ext/ExtUtils-MakeMaker/t/is_of_type.t index 8a95d0d..07e300e 100644 --- a/lib/ExtUtils/t/is_of_type.t +++ b/ext/ExtUtils-MakeMaker/t/is_of_type.t @@ -4,10 +4,6 @@ BEGIN { chdir 't' if -d 't'; - - if( $ENV{PERL_CORE} ) { - @INC = '../lib'; - } } use lib './lib'; diff --git a/t/lib/MakeMaker/Test/NoXS.pm b/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm similarity index 100% rename from t/lib/MakeMaker/Test/NoXS.pm rename to ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm diff --git a/t/lib/MakeMaker/Test/Setup/BFD.pm b/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm similarity index 100% rename from t/lib/MakeMaker/Test/Setup/BFD.pm rename to ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm diff --git a/t/lib/MakeMaker/Test/Setup/MPV.pm b/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm similarity index 100% rename from t/lib/MakeMaker/Test/Setup/MPV.pm rename to ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm diff --git a/t/lib/MakeMaker/Test/Setup/PL_FILES.pm b/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm similarity index 100% rename from t/lib/MakeMaker/Test/Setup/PL_FILES.pm rename to ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm diff --git a/t/lib/MakeMaker/Test/Setup/Problem.pm b/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm similarity index 100% rename from t/lib/MakeMaker/Test/Setup/Problem.pm rename to ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm diff --git a/t/lib/MakeMaker/Test/Setup/Recurs.pm b/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm similarity index 100% rename from t/lib/MakeMaker/Test/Setup/Recurs.pm rename to ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm diff --git a/t/lib/MakeMaker/Test/Setup/XS.pm b/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm similarity index 100% rename from t/lib/MakeMaker/Test/Setup/XS.pm rename to ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm diff --git a/t/lib/MakeMaker/Test/Utils.pm b/ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm similarity index 100% rename from t/lib/MakeMaker/Test/Utils.pm rename to ext/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm diff --git a/t/lib/TieIn.pm b/ext/ExtUtils-MakeMaker/t/lib/TieIn.pm similarity index 100% rename from t/lib/TieIn.pm rename to ext/ExtUtils-MakeMaker/t/lib/TieIn.pm diff --git a/ext/ExtUtils-MakeMaker/t/lib/TieOut.pm b/ext/ExtUtils-MakeMaker/t/lib/TieOut.pm new file mode 100644 index 0000000..0a0f5f9 --- /dev/null +++ b/ext/ExtUtils-MakeMaker/t/lib/TieOut.pm @@ -0,0 +1,28 @@ +package TieOut; + +sub TIEHANDLE { + my $scalar = ''; + bless( \$scalar, $_[0]); +} + +sub PRINT { + my $self = shift; + $$self .= join('', @_); +} + +sub PRINTF { + my $self = shift; + my $fmt = shift; + $$self .= sprintf $fmt, @_; +} + +sub FILENO {} + +sub read { + my $self = shift; + my $data = $$self; + $$self = ''; + return $data; +} + +1; diff --git a/lib/ExtUtils/t/make.t b/ext/ExtUtils-MakeMaker/t/make.t similarity index 63% rename from lib/ExtUtils/t/make.t rename to ext/ExtUtils-MakeMaker/t/make.t index 3a16260..622dbd5 100644 --- a/lib/ExtUtils/t/make.t +++ b/ext/ExtUtils-MakeMaker/t/make.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = ('../lib', 'lib/'); - } - else { - unshift @INC, 't/lib/'; - } + unshift @INC, 't/lib/'; } use Test::More tests => 3; diff --git a/lib/ExtUtils/t/maketext_filter.t b/ext/ExtUtils-MakeMaker/t/maketext_filter.t similarity index 86% rename from lib/ExtUtils/t/maketext_filter.t rename to ext/ExtUtils-MakeMaker/t/maketext_filter.t index ed3a44d..404a91c 100644 --- a/lib/ExtUtils/t/maketext_filter.t +++ b/ext/ExtUtils-MakeMaker/t/maketext_filter.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/metafile_data.t b/ext/ExtUtils-MakeMaker/t/metafile_data.t similarity index 98% rename from lib/ExtUtils/t/metafile_data.t rename to ext/ExtUtils-MakeMaker/t/metafile_data.t index 29d271c..7e970ce 100644 --- a/lib/ExtUtils/t/metafile_data.t +++ b/ext/ExtUtils-MakeMaker/t/metafile_data.t @@ -1,11 +1,5 @@ BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/metafile_file.t b/ext/ExtUtils-MakeMaker/t/metafile_file.t similarity index 98% rename from lib/ExtUtils/t/metafile_file.t rename to ext/ExtUtils-MakeMaker/t/metafile_file.t index 842a249..ca8a412 100644 --- a/lib/ExtUtils/t/metafile_file.t +++ b/ext/ExtUtils-MakeMaker/t/metafile_file.t @@ -4,13 +4,7 @@ # ExtUtils::MM_Any::metafile_file BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/min_perl_version.t b/ext/ExtUtils-MakeMaker/t/min_perl_version.t similarity index 97% rename from lib/ExtUtils/t/min_perl_version.t rename to ext/ExtUtils-MakeMaker/t/min_perl_version.t index 9dc6088..b0eb506 100644 --- a/lib/ExtUtils/t/min_perl_version.t +++ b/ext/ExtUtils-MakeMaker/t/min_perl_version.t @@ -4,13 +4,7 @@ # MIN_PERL_VERSION to WriteMakefile. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/miniperl.t b/ext/ExtUtils-MakeMaker/t/miniperl.t similarity index 88% rename from lib/ExtUtils/t/miniperl.t rename to ext/ExtUtils-MakeMaker/t/miniperl.t index fbd801c..2334eb0 100644 --- a/lib/ExtUtils/t/miniperl.t +++ b/ext/ExtUtils-MakeMaker/t/miniperl.t @@ -3,13 +3,6 @@ # Test that we can build modules as miniperl. # This mostly means no XS modules. -BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = qw(../lib lib); - } -} - use strict; use lib 't/lib'; diff --git a/lib/ExtUtils/t/oneliner.t b/ext/ExtUtils-MakeMaker/t/oneliner.t similarity index 88% rename from lib/ExtUtils/t/oneliner.t rename to ext/ExtUtils-MakeMaker/t/oneliner.t index 84156f0..b040872 100644 --- a/lib/ExtUtils/t/oneliner.t +++ b/ext/ExtUtils-MakeMaker/t/oneliner.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/parse_version.t b/ext/ExtUtils-MakeMaker/t/parse_version.t similarity index 95% rename from lib/ExtUtils/t/parse_version.t rename to ext/ExtUtils-MakeMaker/t/parse_version.t index 840fdf2..ca1048c 100644 --- a/lib/ExtUtils/t/parse_version.t +++ b/ext/ExtUtils-MakeMaker/t/parse_version.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = '../lib'; - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/pm.t b/ext/ExtUtils-MakeMaker/t/pm.t similarity index 83% rename from lib/ExtUtils/t/pm.t rename to ext/ExtUtils-MakeMaker/t/pm.t index 1f69527..42f028f 100644 --- a/lib/ExtUtils/t/pm.t +++ b/ext/ExtUtils-MakeMaker/t/pm.t @@ -3,13 +3,7 @@ # Test that MakeMaker honors user's PM override. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/pm_to_blib.t b/ext/ExtUtils-MakeMaker/t/pm_to_blib.t similarity index 92% rename from lib/ExtUtils/t/pm_to_blib.t rename to ext/ExtUtils-MakeMaker/t/pm_to_blib.t index 7c28781..66ef879 100644 --- a/lib/ExtUtils/t/pm_to_blib.t +++ b/ext/ExtUtils-MakeMaker/t/pm_to_blib.t @@ -2,13 +2,6 @@ # Ensure pm_to_blib runs at the right times. -BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = qw(../lib lib); - } -} - use strict; use lib 't/lib'; diff --git a/lib/ExtUtils/t/pod2man.t b/ext/ExtUtils-MakeMaker/t/pod2man.t similarity index 89% rename from lib/ExtUtils/t/pod2man.t rename to ext/ExtUtils-MakeMaker/t/pod2man.t index c3dd2e2..1632234 100644 --- a/lib/ExtUtils/t/pod2man.t +++ b/ext/ExtUtils-MakeMaker/t/pod2man.t @@ -2,13 +2,6 @@ # Test our simulation of pod2man -BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = qw(../lib lib); - } -} - use strict; use lib 't/lib'; diff --git a/lib/ExtUtils/t/postamble.t b/ext/ExtUtils-MakeMaker/t/postamble.t similarity index 91% rename from lib/ExtUtils/t/postamble.t rename to ext/ExtUtils-MakeMaker/t/postamble.t index 0fbeabd..c83a1c8 100644 --- a/lib/ExtUtils/t/postamble.t +++ b/ext/ExtUtils-MakeMaker/t/postamble.t @@ -3,13 +3,7 @@ # Wherein we ensure that postamble works ok. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/prefixify.t b/ext/ExtUtils-MakeMaker/t/prefixify.t similarity index 89% rename from lib/ExtUtils/t/prefixify.t rename to ext/ExtUtils-MakeMaker/t/prefixify.t index 011b77c..b9e253a 100644 --- a/lib/ExtUtils/t/prefixify.t +++ b/ext/ExtUtils-MakeMaker/t/prefixify.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/prereq.t b/ext/ExtUtils-MakeMaker/t/prereq.t similarity index 95% rename from lib/ExtUtils/t/prereq.t rename to ext/ExtUtils-MakeMaker/t/prereq.t index e92e5a0..cd5d18d 100644 --- a/lib/ExtUtils/t/prereq.t +++ b/ext/ExtUtils-MakeMaker/t/prereq.t @@ -4,13 +4,7 @@ # WriteMakefile. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/prereq_print.t b/ext/ExtUtils-MakeMaker/t/prereq_print.t similarity index 92% rename from lib/ExtUtils/t/prereq_print.t rename to ext/ExtUtils-MakeMaker/t/prereq_print.t index 1dc0702..e93a2fd 100644 --- a/lib/ExtUtils/t/prereq_print.t +++ b/ext/ExtUtils-MakeMaker/t/prereq_print.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/problems.t b/ext/ExtUtils-MakeMaker/t/problems.t similarity index 86% rename from lib/ExtUtils/t/problems.t rename to ext/ExtUtils-MakeMaker/t/problems.t index 8708532..8956539 100644 --- a/lib/ExtUtils/t/problems.t +++ b/ext/ExtUtils-MakeMaker/t/problems.t @@ -1,13 +1,7 @@ # Test problems in Makefile.PL's and hint files. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/prompt.t b/ext/ExtUtils-MakeMaker/t/prompt.t similarity index 89% rename from lib/ExtUtils/t/prompt.t rename to ext/ExtUtils-MakeMaker/t/prompt.t index ec9aa10..d428aa8 100644 --- a/lib/ExtUtils/t/prompt.t +++ b/ext/ExtUtils-MakeMaker/t/prompt.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/recurs.t b/ext/ExtUtils-MakeMaker/t/recurs.t similarity index 94% rename from lib/ExtUtils/t/recurs.t rename to ext/ExtUtils-MakeMaker/t/recurs.t index 17da39e..746a09a 100644 --- a/lib/ExtUtils/t/recurs.t +++ b/ext/ExtUtils-MakeMaker/t/recurs.t @@ -3,13 +3,7 @@ # This tests MakeMaker against recursive builds BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; @@ -119,4 +113,4 @@ close MAKEFILE; my $test_out = run("$make test"); isnt $?, 0, 'test failure in a subdir causes make to fail'; -} \ No newline at end of file +} diff --git a/lib/ExtUtils/t/revision.t b/ext/ExtUtils-MakeMaker/t/revision.t similarity index 72% rename from lib/ExtUtils/t/revision.t rename to ext/ExtUtils-MakeMaker/t/revision.t index 896b191..ebfea1a 100644 --- a/lib/ExtUtils/t/revision.t +++ b/ext/ExtUtils-MakeMaker/t/revision.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use Test::More tests => 4; diff --git a/lib/ExtUtils/t/split_command.t b/ext/ExtUtils-MakeMaker/t/split_command.t similarity index 90% rename from lib/ExtUtils/t/split_command.t rename to ext/ExtUtils-MakeMaker/t/split_command.t index a92f1a5..e57a542 100644 --- a/lib/ExtUtils/t/split_command.t +++ b/ext/ExtUtils-MakeMaker/t/split_command.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/test_boilerplate.t b/ext/ExtUtils-MakeMaker/t/test_boilerplate.t similarity index 78% rename from lib/ExtUtils/t/test_boilerplate.t rename to ext/ExtUtils-MakeMaker/t/test_boilerplate.t index 899ad57..f48324f 100644 --- a/lib/ExtUtils/t/test_boilerplate.t +++ b/ext/ExtUtils-MakeMaker/t/test_boilerplate.t @@ -7,11 +7,6 @@ BEGIN { # Always run in t to unify behavor with core chdir 't' if -d 't'; - - # Only use the about to be installed modules - if( $ENV{PERL_CORE} ) { - @INC = '../lib'; - } } # Use things from t/lib/ diff --git a/lib/ExtUtils/t/testdata/reallylongdirectoryname/arch1/Config.pm b/ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm similarity index 100% rename from lib/ExtUtils/t/testdata/reallylongdirectoryname/arch1/Config.pm rename to ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm diff --git a/lib/ExtUtils/t/testdata/reallylongdirectoryname/arch2/Config.pm b/ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm similarity index 100% rename from lib/ExtUtils/t/testdata/reallylongdirectoryname/arch2/Config.pm rename to ext/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm diff --git a/lib/ExtUtils/t/testlib.t b/ext/ExtUtils-MakeMaker/t/testlib.t similarity index 76% rename from lib/ExtUtils/t/testlib.t rename to ext/ExtUtils-MakeMaker/t/testlib.t index 6f496a4..b2c8ddb 100644 --- a/lib/ExtUtils/t/testlib.t +++ b/ext/ExtUtils-MakeMaker/t/testlib.t @@ -1,14 +1,8 @@ #!/usr/bin/perl -Tw BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = '../lib'; - } - else { - # ./lib is there so t/lib can be seen even after we chdir. - unshift @INC, 't/lib', './lib'; - } + # ./lib is there so t/lib can be seen even after we chdir. + unshift @INC, 't/lib', './lib'; } chdir 't'; diff --git a/lib/ExtUtils/t/writemakefile_args.t b/ext/ExtUtils-MakeMaker/t/writemakefile_args.t similarity index 97% rename from lib/ExtUtils/t/writemakefile_args.t rename to ext/ExtUtils-MakeMaker/t/writemakefile_args.t index a0774a8..10913b9 100644 --- a/lib/ExtUtils/t/writemakefile_args.t +++ b/ext/ExtUtils-MakeMaker/t/writemakefile_args.t @@ -4,13 +4,7 @@ # WriteMakefile. BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't' if -d 't'; - @INC = ('../lib', 'lib'); - } - else { - unshift @INC, 't/lib'; - } + unshift @INC, 't/lib'; } use strict; diff --git a/lib/ExtUtils/t/xs.t b/ext/ExtUtils-MakeMaker/t/xs.t similarity index 88% rename from lib/ExtUtils/t/xs.t rename to ext/ExtUtils-MakeMaker/t/xs.t index 5a15190..efd682e 100644 --- a/lib/ExtUtils/t/xs.t +++ b/ext/ExtUtils-MakeMaker/t/xs.t @@ -1,13 +1,7 @@ #!/usr/bin/perl -w BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = ('../lib', 'lib/'); - } - else { - unshift @INC, 't/lib/'; - } + unshift @INC, 't/lib/'; } chdir 't'; diff --git a/lib/.gitignore b/lib/.gitignore index 43b8e75..fac0377 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -126,16 +126,43 @@ /Encode /Errno.pm /ExtUtils/Command.pm -/ExtUtils/Command +/ExtUtils/Command/MM.pm /ExtUtils/Constant.pm /ExtUtils/Constant /ExtUtils/Installed.pm /ExtUtils/Install.pm +/ExtUtils/Liblist/Kid.pm +/ExtUtils/Liblist.pm +/ExtUtils/MakeMaker/Config.pm +/ExtUtils/MakeMaker/FAQ.pod +/ExtUtils/MakeMaker.pm +/ExtUtils/MakeMaker/Tutorial.pod /ExtUtils/Manifest.pm /ExtUtils/MANIFEST.SKIP /ExtUtils/Miniperl.pm +/ExtUtils/Mkbootstrap.pm +/ExtUtils/Mksymlists.pm +/ExtUtils/MM_AIX.pm +/ExtUtils/MM_Any.pm +/ExtUtils/MM_BeOS.pm +/ExtUtils/MM_Cygwin.pm +/ExtUtils/MM_Darwin.pm +/ExtUtils/MM_DOS.pm +/ExtUtils/MM_MacOS.pm +/ExtUtils/MM_NW5.pm +/ExtUtils/MM_OS2.pm +/ExtUtils/MM.pm +/ExtUtils/MM_QNX.pm +/ExtUtils/MM_Unix.pm +/ExtUtils/MM_UWIN.pm +/ExtUtils/MM_VMS.pm +/ExtUtils/MM_VOS.pm +/ExtUtils/MM_Win32.pm +/ExtUtils/MM_Win95.pm /ExtUtils/Packlist.pm /ExtUtils/ParseXS.pm +/ExtUtils/MY.pm +/ExtUtils/testlib.pm /Fatal.pm /Fcntl.pm /FileCache.pm diff --git a/lib/ExtUtils/t/dir_target.t b/lib/ExtUtils/t/dir_target.t deleted file mode 100644 index 9b7dfe7..0000000 --- a/lib/ExtUtils/t/dir_target.t +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/perl -w - -BEGIN { - if( $ENV{PERL_CORE} ) { - chdir 't'; - @INC = ('../lib', 'lib/'); - } - else { - unshift @INC, 't/lib/'; - } -} -chdir 't'; - -use Test::More tests => 1; -use ExtUtils::MakeMaker; - -# dir_target() was typo'd as dir_targets() -can_ok('MM', 'dir_target'); diff --git a/make_ext.pl b/make_ext.pl index 7783688..3762d0a 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -12,8 +12,8 @@ use Cwd; # allow miniperl to build everything else. my @toolchain = qw(ext/constant/lib ext/ExtUtils-Command/lib - ext/ExtUtils-Install/lib ext/ExtUtils-Manifest/lib - ext/Text-ParseWords/lib); + ext/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib + ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib); # This script acts as a simple interface for building extensions. diff --git a/mkppport b/mkppport index 4636d3e..8cfc8e9 100644 --- a/mkppport +++ b/mkppport @@ -12,7 +12,7 @@ sub iterdirs(&); my $rootdir = dirname($0); -unshift @INC, File::Spec->catdir($rootdir, 't', 'lib'); +unshift @INC, File::Spec->catdir($rootdir, qw(ext ExtUtils-MakeMaker t lib)); eval q{ use MakeMaker::Test::Utils qw( which_perl ) }; $@ and die $@; diff --git a/t/lib/TieOut.pm b/t/lib/TieOut.pm index 0a0f5f9..a08a911 100644 --- a/t/lib/TieOut.pm +++ b/t/lib/TieOut.pm @@ -1,13 +1,15 @@ package TieOut; +use strict; + sub TIEHANDLE { my $scalar = ''; - bless( \$scalar, $_[0]); + bless( \$scalar, $_[0] ); } sub PRINT { my $self = shift; - $$self .= join('', @_); + $$self .= join( '', @_ ); } sub PRINTF { @@ -16,7 +18,7 @@ sub PRINTF { $$self .= sprintf $fmt, @_; } -sub FILENO {} +sub FILENO { } sub read { my $self = shift; diff --git a/utils/instmodsh.PL b/utils/instmodsh.PL index 3bc0359..36b8858 100644 --- a/utils/instmodsh.PL +++ b/utils/instmodsh.PL @@ -33,7 +33,10 @@ $Config{startperl} use File::Spec; -my $instmodsh = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "lib", "ExtUtils"), "instmodsh"); +my $instmodsh + = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, + qw(ext ExtUtils-MakeMaker bin + instmodsh))); if (open(INSTMODSH, $instmodsh)) { print OUT ;