r2320 - in
packages/libmodule-install-perl/branches/upstream/current: .
inc/Module inc/Module/Install lib/Module lib/Module/Install
lib/Module/Install/Admin lib/Module/Install/Makefile
lib/inc/Module t
Krzysztof Krzyzaniak
eloy at costa.debian.org
Sat Mar 11 17:36:20 UTC 2006
Author: eloy
Date: 2006-03-11 17:34:09 +0000 (Sat, 11 Mar 2006)
New Revision: 2320
Removed:
packages/libmodule-install-perl/branches/upstream/current/SIGNATURE
Modified:
packages/libmodule-install-perl/branches/upstream/current/Changes
packages/libmodule-install-perl/branches/upstream/current/MANIFEST
packages/libmodule-install-perl/branches/upstream/current/META.yml
packages/libmodule-install-perl/branches/upstream/current/Makefile.PL
packages/libmodule-install-perl/branches/upstream/current/inc/Module/AutoInstall.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Base.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Can.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Fetch.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Include.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Makefile.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Metadata.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Win32.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Bundle.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Find.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Include.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Makefile.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Manifest.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Metadata.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/ScanDeps.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/WriteAll.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/AutoInstall.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Base.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Build.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Bundle.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Can.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Compiler.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Deprecated.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/External.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Fetch.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Include.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Inline.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/MakeMaker.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Name.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Version.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Metadata.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/PAR.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Run.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Scripts.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Win32.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/WriteAll.pm
packages/libmodule-install-perl/branches/upstream/current/lib/inc/Module/Install.pm
packages/libmodule-install-perl/branches/upstream/current/t/01_compile.t
Log:
Load /tmp/tmp.33RR10/libmodule-install-perl-0.60 into
packages/libmodule-install-perl/branches/upstream/current.
Modified: packages/libmodule-install-perl/branches/upstream/current/Changes
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/Changes 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/Changes 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,3 +1,16 @@
+[Changes for 0.60 - 2006-03-11]
+
+* Cleaned up the 0.59 fix a bit and added a bunch of comments explaining
+ the bootup mechanism. A misunderstanding of this on my part led to
+ the 0.58 bug. Sorry folks (ADAMK)
+
+* Resolved #18040: bundled Module::Install leaks private information
+ Debugging information in Module::Install::Admin was leaking potentially
+ sensitive information. Removed just the files, left the lines (TELS)
+
+* Fixed a smaller part of the problem with 0.58 that still hurts people if
+ that are an installer AND an author as well. (Reported by dha)
+
[Changes for 0.59 - 2006-03-07]
* Resolved #18020: 0.58 was broken; inc::Module::Install's @ISA
Modified: packages/libmodule-install-perl/branches/upstream/current/MANIFEST
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/MANIFEST 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/MANIFEST 2006-03-11 17:34:09 UTC (rev 2320)
@@ -55,4 +55,3 @@
t/02_basic.t
t/03_audotinstall.t
t/99_pod.t
-SIGNATURE Public-key signature (added by MakeMaker)
Modified: packages/libmodule-install-perl/branches/upstream/current/META.yml
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/META.yml 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/META.yml 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,131 +1,131 @@
-abstract: Standalone, extensible Perl module installer
-author: Audrey Tang <autrijus at autrijus.org>
-build_requires:
- File::Spec: 0
- Test::Harness: 2.03
- Test::More: 0.42
-distribution_type: module
-generated_by: Module::Install version 0.59
-license: perl
-name: Module-Install
+
no_index:
directory:
- example
- inc
- t
+generated_by: Module::Install version 0.60
+distribution_type: module
+version: 0.60
+name: Module-Install
+author: Audrey Tang <autrijus at autrijus.org>
+license: perl
+build_requires:
+ Test::More: 0.42
+ Test::Harness: 2.03
+ File::Spec: 0
provides:
- Module::AutoInstall:
- file: lib/Module/AutoInstall.pm
- version: 1.02
- Module::Install:
- file: lib/Module/Install.pm
- version: 0.59
+ Module::Install::Fetch:
+ version: 0.60
+ file: lib/Module/Install/Fetch.pm
+ Module::Install::Deprecated:
+ version: 0.60
+ file: lib/Module/Install/Deprecated.pm
+ Module::Install::Bundle:
+ version: 0.60
+ file: lib/Module/Install/Bundle.pm
+ Module::Install::Admin::Bundle:
+ version: 0.60
+ file: lib/Module/Install/Admin/Bundle.pm
+ Module::Install::MakeMaker:
+ version: 0.60
+ file: lib/Module/Install/MakeMaker.pm
+ Module::Install::Inline:
+ version: 0.60
+ file: lib/Module/Install/Inline.pm
+ Module::Install::External:
+ version: 0.60
+ file: lib/Module/Install/External.pm
+ Module::Install::PAR:
+ version: 0.60
+ file: lib/Module/Install/PAR.pm
+ Module::Install::Include:
+ version: 0.60
+ file: lib/Module/Install/Include.pm
+ Module::Install::Build:
+ version: 0.60
+ file: lib/Module/Install/Build.pm
+ Module::Install::Admin::ScanDeps:
+ version: 0.60
+ file: lib/Module/Install/Admin/ScanDeps.pm
+ Module::Install::Admin::Manifest:
+ version: 0.60
+ file: lib/Module/Install/Admin/Manifest.pm
Module::Install::Admin:
+ version: 0.60
file: lib/Module/Install/Admin.pm
- version: 0.59
- Module::Install::Admin::Bundle:
- file: lib/Module/Install/Admin/Bundle.pm
- version: 0.59
+ Module::Install::Base::FakeAdmin:
+ version: 0.60
+ file: lib/Module/Install/Base.pm
+ Module::Install::Metadata:
+ version: 0.60
+ file: lib/Module/Install/Metadata.pm
+ Module::Install::Makefile:
+ version: 0.60
+ file: lib/Module/Install/Makefile.pm
+ inc::Module::Install:
+ file: lib/inc/Module/Install.pm
+ Module::Install::Admin::WriteAll:
+ version: 0.60
+ file: lib/Module/Install/Admin/WriteAll.pm
+ Module::Install::Base:
+ version: 0.60
+ file: lib/Module/Install/Base.pm
Module::Install::Admin::Find:
+ version: 0.60
file: lib/Module/Install/Admin/Find.pm
- version: 0.59
- Module::Install::Admin::Include:
- file: lib/Module/Install/Admin/Include.pm
- version: 0.59
+ Module::Install::Makefile::Version:
+ version: 0.60
+ file: lib/Module/Install/Makefile/Version.pm
+ Module::Install:
+ version: 0.60
+ file: lib/Module/Install.pm
+ Module::Install::Win32:
+ version: 0.60
+ file: lib/Module/Install/Win32.pm
Module::Install::Admin::Makefile:
+ version: 0.60
file: lib/Module/Install/Admin/Makefile.pm
- version: 0.59
- Module::Install::Admin::Manifest:
- file: lib/Module/Install/Admin/Manifest.pm
- version: 0.59
Module::Install::Admin::Metadata:
+ version: 0.60
file: lib/Module/Install/Admin/Metadata.pm
- version: 0.59
- Module::Install::Admin::ScanDeps:
- file: lib/Module/Install/Admin/ScanDeps.pm
- version: 0.59
- Module::Install::Admin::WriteAll:
- file: lib/Module/Install/Admin/WriteAll.pm
- version: 0.59
+ Module::Install::Makefile::Name:
+ version: 0.60
+ file: lib/Module/Install/Makefile/Name.pm
+ Module::AutoInstall:
+ version: 1.02
+ file: lib/Module/AutoInstall.pm
+ Module::Install::Can:
+ version: 0.60
+ file: lib/Module/Install/Can.pm
Module::Install::AutoInstall:
+ version: 0.60
file: lib/Module/Install/AutoInstall.pm
- version: 0.59
- Module::Install::Base:
- file: lib/Module/Install/Base.pm
- version: 0.59
- Module::Install::Base::FakeAdmin:
- file: lib/Module/Install/Base.pm
- version: 0.59
- Module::Install::Build:
- file: lib/Module/Install/Build.pm
- version: 0.59
- Module::Install::Bundle:
- file: lib/Module/Install/Bundle.pm
- version: 0.59
- Module::Install::Can:
- file: lib/Module/Install/Can.pm
- version: 0.59
- Module::Install::Compiler:
- file: lib/Module/Install/Compiler.pm
- version: 0.59
- Module::Install::Deprecated:
- file: lib/Module/Install/Deprecated.pm
- version: 0.59
- Module::Install::External:
- file: lib/Module/Install/External.pm
- version: 0.59
- Module::Install::Fetch:
- file: lib/Module/Install/Fetch.pm
- version: 0.59
- Module::Install::Include:
- file: lib/Module/Install/Include.pm
- version: 0.59
- Module::Install::Inline:
- file: lib/Module/Install/Inline.pm
- version: 0.59
- Module::Install::MakeMaker:
- file: lib/Module/Install/MakeMaker.pm
- version: 0.59
- Module::Install::Makefile:
- file: lib/Module/Install/Makefile.pm
- version: 0.59
- Module::Install::Makefile::Name:
- file: lib/Module/Install/Makefile/Name.pm
- version: 0.59
- Module::Install::Makefile::Version:
- file: lib/Module/Install/Makefile/Version.pm
- version: 0.59
- Module::Install::Metadata:
- file: lib/Module/Install/Metadata.pm
- version: 0.59
- Module::Install::PAR:
- file: lib/Module/Install/PAR.pm
- version: 0.59
Module::Install::Run:
+ version: 0.60
file: lib/Module/Install/Run.pm
- version: 0.59
+ Module::Install::Admin::Include:
+ version: 0.60
+ file: lib/Module/Install/Admin/Include.pm
Module::Install::Scripts:
+ version: 0.60
file: lib/Module/Install/Scripts.pm
- version: 0.59
+ Module::Install::WriteAll:
+ version: 0.60
+ file: lib/Module/Install/WriteAll.pm
+ Module::Install::Compiler:
+ version: 0.60
+ file: lib/Module/Install/Compiler.pm
Module::Install::Share:
+ version: 0.60
file: lib/Module/Install/Share.pm
- version: 0.59
- Module::Install::Win32:
- file: lib/Module/Install/Win32.pm
- version: 0.59
- Module::Install::WriteAll:
- file: lib/Module/Install/WriteAll.pm
- version: 0.59
- inc::Module::Install:
- file: lib/inc/Module/Install.pm
- version: 0.59
+requires:
+ perl: 5.004
+ YAML: 0.35
recommends:
- CPANPLUS: 0.04
+ PAR::Dist: 0.03
+ Module::ScanDeps: 0.28
Module::Build: 0
Module::CoreList: 0
- Module::ScanDeps: 0.28
- PAR::Dist: 0.03
-requires:
- YAML: 0.35
- perl: 5.004
-version: 0.59
+ CPANPLUS: 0.04
+abstract: Standalone, extensible Perl module installer
Modified: packages/libmodule-install-perl/branches/upstream/current/Makefile.PL
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/Makefile.PL 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/Makefile.PL 2006-03-11 17:34:09 UTC (rev 2320)
@@ -61,6 +61,6 @@
auto_provides;
# Disabled until someone who can sign is doing the releasing
-sign;
+# sign;
WriteAll;
Deleted: packages/libmodule-install-perl/branches/upstream/current/SIGNATURE
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/SIGNATURE 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/SIGNATURE 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,80 +0,0 @@
-This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.53.
-
-To verify the content in this distribution, first make sure you have
-Module::Signature installed, then type:
-
- % cpansign -v
-
-It will check each file's integrity, as well as the signature's
-validity. If "==> Signature verified OK! <==" is not displayed,
-the distribution may already have been compromised, and you should
-not run its Makefile.PL or Build.PL.
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-SHA1 9d6a58fd7d69b721c4b9fc1ae33ce6a3328eae93 Changes
-SHA1 980baef1e2df88a5ccd34b40f1dfe9b6357e0138 MANIFEST
-SHA1 d8504618f3e772137facea61a59906d77fffc412 MANIFEST.SKIP
-SHA1 d3a2575bb825498b4c375ded1ff92a214576df1f META.yml
-SHA1 60ff8ced914026559ae7e6523d645c533d7bc3b5 Makefile.PL
-SHA1 d131a0c2e81eeed474b809095878a9aa819badcb README
-SHA1 7890fd061fb9018651c6a4d7ac6d030c8846a6c5 inc/Module/AutoInstall.pm
-SHA1 92af34a4a447c27d4c01ff94dc8b17969358745b inc/Module/Install.pm
-SHA1 447f8bb4307b2233bb636bb748f2bc538ce452ec inc/Module/Install/AutoInstall.pm
-SHA1 523685028b27268037b91af68492ddb6a6bf246e inc/Module/Install/Base.pm
-SHA1 9f3e5cdea9b152b0729251328065d916fe6ef6c1 inc/Module/Install/Can.pm
-SHA1 1f36bfedaa8546ca26bb9a858ac8391abc00dedf inc/Module/Install/Fetch.pm
-SHA1 cdc34f60bf22fd5692786dba5a4464b4713a37e8 inc/Module/Install/Include.pm
-SHA1 b5eba70aef1c8ea37e9bc0d859a3563bba53ed3a inc/Module/Install/Makefile.pm
-SHA1 74588add83821fbf317c34955edc4ebd352e8beb inc/Module/Install/Metadata.pm
-SHA1 ff9a719ec08503537766119d57a22337e459e094 inc/Module/Install/Win32.pm
-SHA1 4a3e342aa0b43de4db2eb8d3576e8d178fa16454 inc/Module/Install/WriteAll.pm
-SHA1 62ba8aa1f7a8a8ab9476b78fdcf30b175bfecf44 lib/Module/AutoInstall.pm
-SHA1 9f966403b9b8aad7a1352cada7411490730e2bfe lib/Module/Install.pm
-SHA1 f6b47213eefc4831ff4227273615e04993532d47 lib/Module/Install.pod
-SHA1 3b97fff0b06bc75709e0e4678886bf62ad3a9a36 lib/Module/Install/Admin.pm
-SHA1 122e4e403a08f022a5507b5586b60f8deb8e125b lib/Module/Install/Admin/Bundle.pm
-SHA1 459448eeb4b01913276302be5c84a868e126a493 lib/Module/Install/Admin/Find.pm
-SHA1 baf225959defd034cb3a59ba02b0e38bd76349fa lib/Module/Install/Admin/Include.pm
-SHA1 efb6316bb3c2c27b9f0bf6e2685737703f89bf62 lib/Module/Install/Admin/Makefile.pm
-SHA1 26298688fbef968bb6f5d25399d7567ed5818729 lib/Module/Install/Admin/Manifest.pm
-SHA1 02489cfc310a550ec2a10d38d5ab36402145f972 lib/Module/Install/Admin/Metadata.pm
-SHA1 661e7cfdb03f864ca0ee87818bd3634d5aa607d5 lib/Module/Install/Admin/ScanDeps.pm
-SHA1 98b874a1ea1d96b1f75651ff11eed24c4f86fc88 lib/Module/Install/Admin/WriteAll.pm
-SHA1 1d29813649ad4aae39b4e74716c529a02fa534c0 lib/Module/Install/AutoInstall.pm
-SHA1 e9de98118a0a8a43f8851348a5c8f33fe9684dd0 lib/Module/Install/Base.pm
-SHA1 fde6bc5ad4ff947f5d2a6808d2c2a2728a52243d lib/Module/Install/Build.pm
-SHA1 b33df54751d7b8e1b28f6cfda106654917e7224a lib/Module/Install/Bundle.pm
-SHA1 c0a19c8e5299ee70c79523dacc990a39f39ba486 lib/Module/Install/Can.pm
-SHA1 49e7c0cc8d85fefee1db3495ac79ef0032a984bf lib/Module/Install/Compiler.pm
-SHA1 ee80eb7889fa95bd36c5630a70ee3cca36038b6e lib/Module/Install/Deprecated.pm
-SHA1 bfc86238617a376ebd888b4c0863a25ba8b9713e lib/Module/Install/External.pm
-SHA1 6b84c57dd08da266003a2ae91cdead974f7cf7e2 lib/Module/Install/Fetch.pm
-SHA1 dd16cbde4539ca2307956e4435bcec02a01115ad lib/Module/Install/Include.pm
-SHA1 9e4ff310d02e46ff6ba10d44ec4a40a673d1f2a2 lib/Module/Install/Inline.pm
-SHA1 9b0a500b860c9db38740cb9c4867eb03784af0e3 lib/Module/Install/MakeMaker.pm
-SHA1 af1b5e6da637d154cadbda9c8d18b26fb98c4862 lib/Module/Install/Makefile.pm
-SHA1 e55c6c183eee719b80ecb70829e7c1fc511ab89c lib/Module/Install/Makefile/Name.pm
-SHA1 156e9b610443949c6e271b6ad1cd1d17d15ea9ff lib/Module/Install/Makefile/Version.pm
-SHA1 432a870da46d6e58262be056a0d5028c2b80a8f7 lib/Module/Install/Metadata.pm
-SHA1 c3d45684f5663c95d4e725ebce1405636009eadb lib/Module/Install/PAR.pm
-SHA1 fb90dfa7f457c1eff1310cb605c84f75fc29f001 lib/Module/Install/Philosophy.pod
-SHA1 89abaae87366cfec6bac17c4c05ea903ad30c457 lib/Module/Install/Run.pm
-SHA1 926d8509630cabd0db84a459aaea0e9aa2909b2c lib/Module/Install/Scripts.pm
-SHA1 f580f5ea1be887a516cadd87f9439108d970318c lib/Module/Install/Share.pm
-SHA1 d2fa8148aa081d748e2ba83e2a562fec9c2652ad lib/Module/Install/Win32.pm
-SHA1 441d5eb0e20ea707ea4c2c9aea67d5a8d77df20e lib/Module/Install/WriteAll.pm
-SHA1 4ba605096e13fb1d87348fa0068500a59050a797 lib/inc/Module/Install.pm
-SHA1 479cf857a2d48fe6163a12de5ed5576a8f9b0ca6 t/01_compile.t
-SHA1 bbfef996865e3e389a1584d130cf7145132d4ee2 t/02_basic.t
-SHA1 8e657783b767e2577c985b50fff8919f60e67a98 t/03_audotinstall.t
-SHA1 7867cff04a8429890fa473fcd8ea51a66d0f6772 t/99_pod.t
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (FreeBSD)
-
-iD8DBQFEDMWHtLPdNzw1AaARAmQyAKCac2kFQM1CTEECyWSVpBuHANkh5QCgtqMx
-pEaOi2rg/qOUrxLzBuqF3XE=
-=5d+e
------END PGP SIGNATURE-----
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/AutoInstall.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/AutoInstall.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/AutoInstall.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/AutoInstall.pm - lib/Module/AutoInstall.pm"
+#line 1
package Module::AutoInstall;
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,10 +1,10 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - lib/Module/Install/AutoInstall.pm"
+#line 1
package Module::Install::AutoInstall;
use Module::Install::Base;
@ISA = qw{Module::Install::Base};
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Base.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Base.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Base.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,7 +1,7 @@
-#line 1 "inc/Module/Install/Base.pm - lib/Module/Install/Base.pm"
+#line 1
package Module::Install::Base;
-$VERSION = '0.59';
+$VERSION = '0.60';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Can.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Can.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Can.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,75 +1,82 @@
-#line 1 "inc/Module/Install/Can.pm - lib/Module/Install/Can.pm"
+#line 1
package Module::Install::Can;
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-
-$VERSION = '0.59';
-
-use strict;
use Config ();
+### This adds a 5.005 Perl version dependency.
+### This is a bug and will be fixed.
+use File::Spec ();
use ExtUtils::MakeMaker ();
-# This may introduce a 5.005 dependency, or at the very least it may
-# not bootstrap properly under 5.004.
-use File::Spec ();
-
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.60';
+ @ISA = qw{Module::Install::Base};
+}
+
+
# check if we can load some module
+### Upgrade this to not have to load the module if possible
sub can_use {
- my ($self, $mod, $ver) = @_;
- $mod =~ s{::|\\}{/}g;
- $mod .= ".pm" unless $mod =~ /\.pm$/i;
+ my ($self, $mod, $ver) = @_;
+ $mod =~ s{::|\\}{/}g;
+ $mod .= '.pm' unless $mod =~ /\.pm$/i;
- my $pkg = $mod;
- $pkg =~ s{/}{::}g;
- $pkg =~ s{\.pm$}{}i;
+ my $pkg = $mod;
+ $pkg =~ s{/}{::}g;
+ $pkg =~ s{\.pm$}{}i;
- local $@;
- eval { require $mod; $pkg->VERSION($ver || 0); 1 };
+ local $@;
+ eval { require $mod; $pkg->VERSION($ver || 0); 1 };
}
# check if we can run some command
sub can_run {
- my ($self, $cmd) = @_;
+ my ($self, $cmd) = @_;
- my $_cmd = $cmd;
- return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
+ my $_cmd = $cmd;
+ return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
- for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
- my $abs = File::Spec->catfile($dir, $_[1]);
- return $abs if (-x $abs or $abs = MM->maybe_command($abs));
- }
+ for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+ my $abs = File::Spec->catfile($dir, $_[1]);
+ return $abs if (-x $abs or $abs = MM->maybe_command($abs));
+ }
- return;
+ return;
}
+# can we locate a (the) C compiler
sub can_cc {
- my $self = shift;
- my @chunks = split(/ /, $Config::Config{cc}) or return;
+ my $self = shift;
+ my @chunks = split(/ /, $Config::Config{cc}) or return;
- # $Config{cc} may contain args; try to find out the program part
- while (@chunks) {
- return $self->can_run("@chunks") || (pop(@chunks), next);
- }
+ # $Config{cc} may contain args; try to find out the program part
+ while (@chunks) {
+ return $self->can_run("@chunks") || (pop(@chunks), next);
+ }
- return;
+ return;
}
# Fix Cygwin bug on maybe_command();
-if ($^O eq 'cygwin') {
- require ExtUtils::MM_Cygwin;
- require ExtUtils::MM_Win32;
- if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
- *ExtUtils::MM_Cygwin::maybe_command = sub {
- my ($self, $file) = @_;
- if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
- ExtUtils::MM_Win32->maybe_command($file);
- }
- else {
- ExtUtils::MM_Unix->maybe_command($file);
- }
- }
- }
+if ( $^O eq 'cygwin' ) {
+ require ExtUtils::MM_Cygwin;
+ require ExtUtils::MM_Win32;
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
+ *ExtUtils::MM_Cygwin::maybe_command = sub {
+ my ($self, $file) = @_;
+ if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
+ ExtUtils::MM_Win32->maybe_command($file);
+ } else {
+ ExtUtils::MM_Unix->maybe_command($file);
+ }
+ }
+ }
}
1;
+
+__END__
+
+#line 157
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Fetch.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Fetch.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Fetch.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Fetch.pm - lib/Module/Install/Fetch.pm"
+#line 1
package Module::Install::Fetch;
use strict;
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.59';
+ $VERSION = '0.60';
@ISA = qw{Module::Install::Base};
}
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Include.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Include.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Include.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,10 +1,10 @@
-#line 1 "inc/Module/Install/Include.pm - lib/Module/Install/Include.pm"
+#line 1
package Module::Install::Include;
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Makefile.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Makefile.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Makefile.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Makefile.pm - lib/Module/Install/Makefile.pm"
+#line 1
package Module::Install::Makefile;
use strict 'vars';
@@ -7,7 +7,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.59';
+ $VERSION = '0.60';
@ISA = qw{Module::Install::Base};
}
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Metadata.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Metadata.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Metadata.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,10 +1,10 @@
-#line 1 "inc/Module/Install/Metadata.pm - lib/Module/Install/Metadata.pm"
+#line 1
package Module::Install::Metadata;
use Module::Install::Base;
@ISA = qw{Module::Install::Base};
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict 'vars';
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Win32.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Win32.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Win32.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,43 +1,45 @@
-#line 1 "inc/Module/Install/Win32.pm - lib/Module/Install/Win32.pm"
+#line 1
package Module::Install::Win32;
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.60';
+ @ISA = qw{Module::Install::Base};
+}
-use strict;
-
# determine if the user needs nmake, and download it if needed
sub check_nmake {
- my $self = shift;
- $self->load('can_run');
- $self->load('get_file');
+ my $self = shift;
+ $self->load('can_run');
+ $self->load('get_file');
+
+ require Config;
+ return unless (
+ $^O eq 'MSWin32' and
+ $Config::Config{make} and
+ $Config::Config{make} =~ /^nmake\b/i and
+ ! $self->can_run('nmake')
+ );
- require Config;
- return unless (
- $Config::Config{make} and
- $Config::Config{make} =~ /^nmake\b/i and
- $^O eq 'MSWin32' and
- !$self->can_run('nmake')
- );
+ print "The required 'nmake' executable not found, fetching it...\n";
- print "The required 'nmake' executable not found, fetching it...\n";
+ require File::Basename;
+ my $rv = $self->get_file(
+ url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
+ ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
+ local_dir => File::Basename::dirname($^X),
+ size => 51928,
+ run => 'Nmake15.exe /o > nul',
+ check_for => 'Nmake.exe',
+ remove => 1,
+ );
- require File::Basename;
- my $rv = $self->get_file(
- url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
- ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
- local_dir => File::Basename::dirname($^X),
- size => 51928,
- run => 'Nmake15.exe /o > nul',
- check_for => 'Nmake.exe',
- remove => 1,
- );
+ if (!$rv) {
+ die <<'END_MESSAGE';
- if (!$rv) {
- die << '.';
-
-------------------------------------------------------------------------------
Since you are using Microsoft Windows, you will need the 'nmake' utility
@@ -55,11 +57,8 @@
You may then resume the installation process described in README.
-------------------------------------------------------------------------------
-.
- }
+END_MESSAGE
+ }
}
1;
-
-__END__
-
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,10 +1,10 @@
-#line 1 "inc/Module/Install/WriteAll.pm - lib/Module/Install/WriteAll.pm"
+#line 1
package Module::Install::WriteAll;
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,6 +1,22 @@
-#line 1 "/home/autrijus/work/modinstall/trunk/Module-Install/inc/Module/Install.pm - lib/Module/Install.pm"
+#line 1
package Module::Install;
+# For any maintainers:
+# The load order for Module::Install is a bit magic.
+# It goes something like this...
+#
+# IF ( host has Module::Install installed, creating author mode ) {
+# 1. Makefile.PL calls "use inc::Module::Install"
+# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
+# 3. The installed version of inc::Module::Install loads
+# 4. inc::Module::Install calls "require Module::Install"
+# 5. The ./inc/ version of Module::Install loads
+# } ELSE {
+# 1. Makefile.PL calls "use inc::Module::Install"
+# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
+# 3. The ./inc/ version of Module::Install loads
+# }
+
use 5.004;
use strict 'vars';
@@ -12,10 +28,15 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.59';
+ $VERSION = '0.60';
}
-# inc::Module::Install must be loaded first
+# Whether or not inc::Module::Install is actually loaded, the
+# $INC{inc/Module/Install.pm} is what will still get set as long as
+# the caller loaded module this in the documented manner.
+# If not set, the caller may NOT have loaded the bundled version, and thus
+# they may not have a MI version that works with the Makefile.PL. This would
+# result in false errors or unexpected behaviour. And we don't want that.
my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
unless ( $INC{$file} ) {
die <<"END_DIE";
@@ -136,7 +157,7 @@
}
$args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm";
- bless \%args, $class;
+ bless( \%args, $class );
}
sub call {
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Bundle.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Bundle.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Bundle.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,12 +1,14 @@
package Module::Install::Admin::Bundle;
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.60';
+ @ISA = qw{Module::Install::Base};
+}
-use strict;
-
sub bundle {
my $self = shift;
my $bundle_dir = $self->_top->{bundle};
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Find.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Find.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Find.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
use File::Find ();
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Include.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Include.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Include.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
sub include {
my ( $self, $pattern ) = @_;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Makefile.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Makefile.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Makefile.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict 'vars';
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Manifest.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Manifest.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Manifest.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
use Cwd;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Metadata.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Metadata.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Metadata.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = 'Module::Install::Base';
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/ScanDeps.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/ScanDeps.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/ScanDeps.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/WriteAll.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/WriteAll.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/WriteAll.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
sub WriteAll {
my ($self, %args) = @_;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,12 +1,15 @@
package Module::Install::Admin;
-$VERSION = '0.59';
- at ISA = 'Module::Install';
-
use strict 'vars';
use File::Path ();
use inc::Module::Install ();
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.60';
+ @ISA = qw{Module::Install};
+}
+
=pod
=head1 NAME
@@ -133,8 +136,8 @@
local (*FROM, *TO, $_);
open FROM, "< $from" or die "Can't open $from for input:\n$!";
- open TO, "> $to" or die "Can't open $to for output:\n$!";
- print TO "#line 1 \"$to - $from\"\n";
+ open TO, "> $to" or die "Can't open $to for output:\n$!";
+ print TO "#line 1\n";
my $content;
my $in_pod;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/AutoInstall.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/AutoInstall.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/AutoInstall.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw{Module::Install::Base};
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Base.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Base.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Base.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,6 +1,6 @@
package Module::Install::Base;
-$VERSION = '0.59';
+$VERSION = '0.60';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Build.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Build.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Build.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Bundle.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Bundle.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Bundle.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
use Cwd ();
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Can.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Can.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Can.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,74 +1,157 @@
package Module::Install::Can;
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-
-$VERSION = '0.59';
-
-use strict;
use Config ();
+### This adds a 5.005 Perl version dependency.
+### This is a bug and will be fixed.
+use File::Spec ();
use ExtUtils::MakeMaker ();
-# This may introduce a 5.005 dependency, or at the very least it may
-# not bootstrap properly under 5.004.
-use File::Spec ();
-
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.60';
+ @ISA = qw{Module::Install::Base};
+}
+
+
# check if we can load some module
+### Upgrade this to not have to load the module if possible
sub can_use {
- my ($self, $mod, $ver) = @_;
- $mod =~ s{::|\\}{/}g;
- $mod .= ".pm" unless $mod =~ /\.pm$/i;
+ my ($self, $mod, $ver) = @_;
+ $mod =~ s{::|\\}{/}g;
+ $mod .= '.pm' unless $mod =~ /\.pm$/i;
- my $pkg = $mod;
- $pkg =~ s{/}{::}g;
- $pkg =~ s{\.pm$}{}i;
+ my $pkg = $mod;
+ $pkg =~ s{/}{::}g;
+ $pkg =~ s{\.pm$}{}i;
- local $@;
- eval { require $mod; $pkg->VERSION($ver || 0); 1 };
+ local $@;
+ eval { require $mod; $pkg->VERSION($ver || 0); 1 };
}
# check if we can run some command
sub can_run {
- my ($self, $cmd) = @_;
+ my ($self, $cmd) = @_;
- my $_cmd = $cmd;
- return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
+ my $_cmd = $cmd;
+ return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
- for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
- my $abs = File::Spec->catfile($dir, $_[1]);
- return $abs if (-x $abs or $abs = MM->maybe_command($abs));
- }
+ for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+ my $abs = File::Spec->catfile($dir, $_[1]);
+ return $abs if (-x $abs or $abs = MM->maybe_command($abs));
+ }
- return;
+ return;
}
+# can we locate a (the) C compiler
sub can_cc {
- my $self = shift;
- my @chunks = split(/ /, $Config::Config{cc}) or return;
+ my $self = shift;
+ my @chunks = split(/ /, $Config::Config{cc}) or return;
- # $Config{cc} may contain args; try to find out the program part
- while (@chunks) {
- return $self->can_run("@chunks") || (pop(@chunks), next);
- }
+ # $Config{cc} may contain args; try to find out the program part
+ while (@chunks) {
+ return $self->can_run("@chunks") || (pop(@chunks), next);
+ }
- return;
+ return;
}
# Fix Cygwin bug on maybe_command();
-if ($^O eq 'cygwin') {
- require ExtUtils::MM_Cygwin;
- require ExtUtils::MM_Win32;
- if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
- *ExtUtils::MM_Cygwin::maybe_command = sub {
- my ($self, $file) = @_;
- if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
- ExtUtils::MM_Win32->maybe_command($file);
- }
- else {
- ExtUtils::MM_Unix->maybe_command($file);
- }
- }
- }
+if ( $^O eq 'cygwin' ) {
+ require ExtUtils::MM_Cygwin;
+ require ExtUtils::MM_Win32;
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
+ *ExtUtils::MM_Cygwin::maybe_command = sub {
+ my ($self, $file) = @_;
+ if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
+ ExtUtils::MM_Win32->maybe_command($file);
+ } else {
+ ExtUtils::MM_Unix->maybe_command($file);
+ }
+ }
+ }
}
1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+Module::Install::Can - Utility functions for capability detection
+
+=head1 DESCRIPTION
+
+C<Module::Install::Can> contains a number of functions for authors to use
+when creating customised smarter installers. The functions simplify
+standard tests so that you can express your dependencies and conditions
+much more simply, and make your installer much easier to maintain.
+
+=head1 COMMANDS
+
+=head2 can_use
+
+ can_use('Module::Name');
+ can_use('Module::Name', 1.23);
+
+The C<can_use> function tests the ability to load a specific named
+module. Currently it will also actually load the module in the
+process, although this may change in the future.
+
+Takes an optional second param of a version number. The currently
+installed version of the module will be tested to make sure it is
+equal to or greater than the specified version.
+
+Returns true if the module can be loaded, or false (in both scalar or
+list context) if not.
+
+=head2 can_run
+
+ can_run('cvs');
+
+The C<can_run> function tests the ability to run a named command or
+program on the local system.
+
+Returns true if so, or false (both in scalar and list context) if not.
+
+=head2 can_cc
+
+ can_cc();
+
+The C<can_cc> function test the ability to locate a C compiler on the
+local system. Returns true if the C compiler can be found, or false
+(both in scalar and list context) if not.
+
+=head1 TO DO
+
+Currently, the use of a C<can_foo> command in a single problem domain
+(for example C<can_use>) results in the inclusion of additional
+functionality from different problem domains (for example C<can_run>).
+
+This module should ultimately be broken up, and the individual
+functions redestributed to different domain-specific extensions.
+
+=head1 AUTHORS
+
+Audrey Tang E<lt>autrijus at autrijus.orgE<gt>
+
+Adam Kennedy E<lt>cpan at ali.asE<gt>
+
+=head1 SEE ALSO
+
+L<Module::Install>, L<Class::Inspector>
+
+=head1 COPYRIGHT
+
+Copyright 2006 Audrey Tang, Adam Kennedy. All rights reserved.
+
+This program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+See L<http://www.perl.com/perl/misc/Artistic.html>
+
+=cut
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Compiler.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Compiler.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Compiler.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.59';
+ $VERSION = '0.60';
@ISA = qw{Module::Install::Base};
}
@@ -54,7 +54,7 @@
=head1 NAME
-Module::Install::Compiler - Module::Install commands for interacting with the C compiler
+Module::Install::Compiler - Commands for interacting with the C compiler
=head1 SYNOPSIS
@@ -74,24 +74,32 @@
To be completed
+=head1 TO DO
+
+The current implementation is relatively fragile and minimalistic.
+
+It only handles some very basic wrapper around L<ExtUtils::MakeMaker>.
+
+It is currently undergoing extensive refactoring to provide a more
+generic compiler flag generation capability. This may take some time,
+and if anyone who maintains a Perl module that makes use of the compiler
+would like to help out, your assistance would be greatly appreciated.
+
=head1 SEE ALSO
L<Module::Install>, L<ExtUtils::MakeMaker>
=head1 AUTHORS
-Audrey Tang E<lt>autrijus at autrijus.orgE<gt>
+Refactored by Adam Kennedy E<lt>adamk at cpan.orgE<gt>
+Mostly by Audrey Tang E<lt>autrijus at autrijus.orgE<gt>
+
Based on original works by Brian Ingerson E<lt>ingy at cpan.orgE<gt>
-Documentated and refactored by Adam Kennedy E<lt>adamk at cpan.orgE<gt>
-
=head1 COPYRIGHT
-Copyright 2002, 2003, 2004, 2006 by
-Audrey Tang E<lt>autrijus at autrijus.orgE<gt>,
-Brian Ingerson E<lt>ingy at cpan.orgE<gt>,
-Adam Kennedy E<lt>adamk at cpan.orgE<gt>
+Copyright 2002, 2003, 2004, 2006 by Adam Kennedy, Audrey Tang, Brian Ingerson.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Deprecated.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Deprecated.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Deprecated.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,20 +1,14 @@
package Module::Install::Deprecated;
-# Although it should never be included with a release, this module
-# is used to contain all the deprecated or renamed commands, so authors
-# can have them reported fully without bloating releases.
-
use strict;
use Module::Install::Base;
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.59';
+ $VERSION = '0.60';
@ISA = qw{Module::Install::Base};
}
-# Deprecations
-
sub c_files {
warn "c_files has been changed to cc_files to reduce confusion and keep all compiler commands as cc_";
shift()->cc_files(@_);
@@ -41,3 +35,73 @@
}
1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+Module::Install::Deprecated - Warnings and help for deprecated commands
+
+=head1 DESCRIPTION
+
+One of the nicest features of L<Module::Install> is that as it improves,
+there is no need to take into account user compatibility, because users do
+not need to install L<Module::Install> itself.
+
+As a result, the L<Module::Install> API changes at a faster rate than usual,
+and this results in deprecated commands.
+
+C<Module::Install::Deprecated> provides implementations of the deprecated
+commands, so that when an author is upgrading their L<Module::Install> and
+they are using a deprecated command they will be told that the command has
+been deprecated, and what the author should use instead.
+
+This extension should NEVER end up bundled into the distribution tarball.
+
+=head1 COMMANDS
+
+=head2 c_files
+
+The C<c_files> command has been changed to C<cc_files> to reduce confusion
+and keep all compiler commands within a consistent C<ff_foo> naming scheme.
+
+=head2 inc_paths
+
+The C<inc_paths> command has been changed to C<cc_inc_paths> due to
+confusion between Perl and C.
+
+=head2 lib_paths
+
+The C<lib_paths> command has been changed to C<cc_lib_paths> due to confusion
+between Perl and C.
+
+=head2 lib_links
+
+The C<lib_links> command has been changed to C<cc_lib_links> due to confusion
+between Perl and C.
+
+=head2 optimize_flags
+
+The C<optimize_flags> command has been changed to C<cc_optimize_flags> for
+consistency reasons.
+
+=head1 AUTHORS
+
+Adam Kennedy E<lt>cpan at ali.asE<gt>
+
+=head1 SEE ALSO
+
+L<Module::Install>
+
+=head1 COPYRIGHT
+
+Copyright 2006 Adam Kennedy. All rights reserved.
+
+This program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+See L<http://www.perl.com/perl/misc/Artistic.html>
+
+=cut
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/External.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/External.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/External.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -2,13 +2,15 @@
# Provides dependency declarations for external non-Perl things
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.60';
+ @ISA = qw{Module::Install::Base};
+}
-use strict;
-
sub requires_external_cc {
my $self = shift;
@@ -56,3 +58,80 @@
}
1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+Module::Install::External - Specify dependencies on external non-Perl things
+
+=head1 DESCRIPTION
+
+C<Module::Install::External> provides command that allow you to
+declaratively specify a dependency on a program or system that is not
+Perl.
+
+The commands it provides are similar to those in L<Module::Install::Can>,
+except that they implement an explicit dependency, in addition to just
+working out if the particular thing is available.
+
+=head1 COMMANDS
+
+=head2 requires_external_cc
+
+ requires_external_cc;
+
+The C<requires_external_cc> command explicitly specifies that a C compiler
+is required in order to build (at F<make>-time) the distribution.
+
+It does not take any params, and aborts the F<Makefile.PL> execution
+in a way that an automated installation or testing system will interpret
+as a C<NA> ("not applicable to this platform") result.
+
+This maybe be changed to an alternative abort result at a later time.
+
+Returns true as a convenience.
+
+=head2 requires_external_bin
+
+ requires_external_bin 'cvs';
+
+The C<requires_external_bin> command takes the name of a system command
+or program, similar to the C<can_run> command, except that
+C<requires_external_bin> checks in a way that is a declarative explicit
+dependency.
+
+The takes a single param of the command/program name, and aborts the
+C<Makefile.PL> execution in a way that an automated installation or
+testing system will interpret as a C<NA> ("not applicable to this
+platform") result.
+
+Returns true as a convenience.
+
+=head1 TO DO
+
+Work out how to save the external dependency metadata, in agreement with
+the larger Perl community.
+
+Implement the agreed external dependency metadata solution.
+
+=head1 AUTHORS
+
+Adam Kennedy E<lt>cpan at ali.asE<gt>
+
+=head1 SEE ALSO
+
+L<Module::Install>
+
+=head1 COPYRIGHT
+
+Copyright 2006 Adam Kennedy. All rights reserved.
+
+This program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+See L<http://www.perl.com/perl/misc/Artistic.html>
+
+=cut
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Fetch.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Fetch.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Fetch.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -5,7 +5,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.59';
+ $VERSION = '0.60';
@ISA = qw{Module::Install::Base};
}
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Include.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Include.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Include.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Inline.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Inline.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Inline.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/MakeMaker.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/MakeMaker.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/MakeMaker.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use ExtUtils::MakeMaker ();
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Name.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Name.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Name.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Version.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Version.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Version.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA};
BEGIN {
- $VERSION = '0.59';
+ $VERSION = '0.60';
@ISA = qw{Module::Install::Base};
}
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Metadata.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Metadata.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Metadata.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw{Module::Install::Base};
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict 'vars';
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/PAR.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/PAR.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/PAR.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Run.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Run.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Run.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
# eventually move the ipc::run / open3 stuff here.
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Scripts.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Scripts.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Scripts.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,17 +1,19 @@
package Module::Install::Scripts;
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
+use File::Basename ();
-$VERSION = '0.59';
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.60';
+ @ISA = qw(Module::Install::Base);
+}
-use strict;
-use File::Basename ();
-
sub prompt_script {
my ($self, $script_file) = @_;
+
my ($prompt, $abstract, $default);
-
foreach my $line ( $self->_read_script($script_file) ) {
last unless $line =~ /^#/;
$prompt = $1 if $line =~ /^#\s*prompt:\s+(.*)/;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,7 +1,7 @@
package Module::Install::Share;
BEGIN {
- $VERSION = '0.59';
+ $VERSION = '0.60';
@ISA = qw{Module::Install::Base};
}
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Win32.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Win32.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Win32.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,42 +1,44 @@
package Module::Install::Win32;
+use strict;
use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.60';
+ @ISA = qw{Module::Install::Base};
+}
-use strict;
-
# determine if the user needs nmake, and download it if needed
sub check_nmake {
- my $self = shift;
- $self->load('can_run');
- $self->load('get_file');
+ my $self = shift;
+ $self->load('can_run');
+ $self->load('get_file');
+
+ require Config;
+ return unless (
+ $^O eq 'MSWin32' and
+ $Config::Config{make} and
+ $Config::Config{make} =~ /^nmake\b/i and
+ ! $self->can_run('nmake')
+ );
- require Config;
- return unless (
- $Config::Config{make} and
- $Config::Config{make} =~ /^nmake\b/i and
- $^O eq 'MSWin32' and
- !$self->can_run('nmake')
- );
+ print "The required 'nmake' executable not found, fetching it...\n";
- print "The required 'nmake' executable not found, fetching it...\n";
+ require File::Basename;
+ my $rv = $self->get_file(
+ url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
+ ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
+ local_dir => File::Basename::dirname($^X),
+ size => 51928,
+ run => 'Nmake15.exe /o > nul',
+ check_for => 'Nmake.exe',
+ remove => 1,
+ );
- require File::Basename;
- my $rv = $self->get_file(
- url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
- ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
- local_dir => File::Basename::dirname($^X),
- size => 51928,
- run => 'Nmake15.exe /o > nul',
- check_for => 'Nmake.exe',
- remove => 1,
- );
+ if (!$rv) {
+ die <<'END_MESSAGE';
- if (!$rv) {
- die << '.';
-
-------------------------------------------------------------------------------
Since you are using Microsoft Windows, you will need the 'nmake' utility
@@ -54,11 +56,8 @@
You may then resume the installation process described in README.
-------------------------------------------------------------------------------
-.
- }
+END_MESSAGE
+ }
}
1;
-
-__END__
-
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/WriteAll.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/WriteAll.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/WriteAll.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -3,7 +3,7 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.59';
+$VERSION = '0.60';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,5 +1,21 @@
package Module::Install;
+# For any maintainers:
+# The load order for Module::Install is a bit magic.
+# It goes something like this...
+#
+# IF ( host has Module::Install installed, creating author mode ) {
+# 1. Makefile.PL calls "use inc::Module::Install"
+# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
+# 3. The installed version of inc::Module::Install loads
+# 4. inc::Module::Install calls "require Module::Install"
+# 5. The ./inc/ version of Module::Install loads
+# } ELSE {
+# 1. Makefile.PL calls "use inc::Module::Install"
+# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
+# 3. The ./inc/ version of Module::Install loads
+# }
+
use 5.004;
use strict 'vars';
@@ -11,10 +27,15 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.59';
+ $VERSION = '0.60';
}
-# inc::Module::Install must be loaded first
+# Whether or not inc::Module::Install is actually loaded, the
+# $INC{inc/Module/Install.pm} is what will still get set as long as
+# the caller loaded module this in the documented manner.
+# If not set, the caller may NOT have loaded the bundled version, and thus
+# they may not have a MI version that works with the Makefile.PL. This would
+# result in false errors or unexpected behaviour. And we don't want that.
my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
unless ( $INC{$file} ) {
die <<"END_DIE";
@@ -135,7 +156,7 @@
}
$args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm";
- bless \%args, $class;
+ bless( \%args, $class );
}
sub call {
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/inc/Module/Install.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/inc/Module/Install.pm 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/inc/Module/Install.pm 2006-03-11 17:34:09 UTC (rev 2320)
@@ -1,15 +1,17 @@
package inc::Module::Install;
+# This module ONLY loads if the user has manually install their own
+# installation of Module::Install, and are some form of MI author.
+#
+# It runs from the installed location, and is never bundled
+# along with the other bundled modules.
+#
+# So because the version of this differs from the version that will
+# be bundled almost every time, it doesn't have it's own version and
+# isn't part of the synchronisation-checking.
+
use strict;
-use vars qw{$VERSION @ISA};
-BEGIN {
- $VERSION = '0.59';
-
- # Pass ->import to Module::Install
- @ISA = qw{Module::Install};
-}
-
my $author = $^O eq 'VMS' ? './inc/_author' : './inc/.author';
if ( -d $author ) {
require File::Path;
@@ -19,11 +21,6 @@
unshift @INC, 'inc';
require Module::Install;
-# Check the versions match
-unless ( $Module::Install::VERSION and $Module::Install::VERSION eq $VERSION ) {
- die "inc::Module::Install $VERSION loaded Module::Install $Module::Install::VERSION. Version mismatch";
-}
-
1;
__END__
Property changes on: packages/libmodule-install-perl/branches/upstream/current/lib/inc/Module/Install.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libmodule-install-perl/branches/upstream/current/t/01_compile.t
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/t/01_compile.t 2006-03-11 17:10:07 UTC (rev 2319)
+++ packages/libmodule-install-perl/branches/upstream/current/t/01_compile.t 2006-03-11 17:34:09 UTC (rev 2320)
@@ -20,7 +20,7 @@
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.59';
+ $VERSION = '0.60';
}
use Test::More tests =>4;
More information about the Pkg-perl-cvs-commits
mailing list