[poe-commits] poe MANIFEST,1.122,1.123 Makefile.PL,1.37,1.38

[<rc...@us...>]

Update of /cvsroot/poe/poe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10359

Modified Files:
	MANIFEST Makefile.PL 
Log Message:
Remove ExtUtils::AutoInstall from the installer to support
ActiveState's PPD builder.  ActiveState's builder is still trivially
broken months (years?) after I reported that ExtUtils::AutoInstall
needs a configured CPAN.pm.  So I give up.

The questionnaire is replaced by a simple list of missing or outdated
dependancies.  ExtUtils::MakeMaker will still enforce our few hard
requirements.


Index: MANIFEST
===================================================================
RCS file: /cvsroot/poe/poe/MANIFEST,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** MANIFEST	10 Dec 2005 07:36:17 -0000	1.122
--- MANIFEST	7 Feb 2006 09:35:22 -0000	1.123
***************
*** 66,70 ****
  mylib/Devel/Null.pm
  mylib/events_per_second.pl
- mylib/ExtUtils/AutoInstall.pm
  mylib/gen-meta.perl
  mylib/gen-tests.perl
--- 66,69 ----

Index: Makefile.PL
===================================================================
RCS file: /cvsroot/poe/poe/Makefile.PL,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile.PL	29 Apr 2005 01:07:08 -0000	1.37
--- Makefile.PL	7 Feb 2006 09:35:22 -0000	1.38
***************
*** 5,49 ****
  use Config;
  
! # Skip reminders and prompting if we're being run in --checkdeps or
! # --installdeps batch modes.  These are part of # ExtUtils::AutoInstall's
! # automatic install process.
! 
! unless (grep /^--(check|install)deps/, @ARGV) {
! 
!   # Switch to default behavior if STDIN isn't a tty.
  
!   unless (-t STDIN) {
!     warn(
!       "\n",
!       "====================================================================\n",
!       "\n",
!       "Assuming --default because standard input is not a terminal.\n",
!       "\n",
!       "====================================================================\n",
!       "\n",
!     );
!     push @ARGV, "--default";
!   }
  
!   # Remind the user she can use --default.
  
!   unless (grep /^--default$/, @ARGV) {
!     warn(
!       "\n",
!       "====================================================================\n",
!       "\n",
!       "Prompts may be bypassed by running:\n",
!       "   $^X $0 --default\n",
!        "\n",
!       "Only necessary modules will be installed by default.\n",
!       "\n",
!       "====================================================================\n",
!       "\n",
!     );
!   }
  
!   # Should we skip the network tests?
  
!   my $prompt = qq|
  POE's test suite requires a functional network.
  However, we can skip those tests requiring network
--- 5,43 ----
  use Config;
  
! # Switch to default behavior if STDIN isn't a tty.
  
! unless (-t STDIN) {
!   warn(
!     "\n",
!     "====================================================================\n",
!     "\n",
!     "Assuming --default because standard input is not a terminal.\n",
!     "\n",
!     "====================================================================\n",
!     "\n",
!   );
!   push @ARGV, "--default";
! }
  
! # Remind the user she can use --default.
  
! unless (grep /^--default$/, @ARGV) {
!   warn(
!     "\n",
!     "====================================================================\n",
!     "\n",
!     "Prompts may be bypassed by running:\n",
!     "   $^X $0 --default\n",
!      "\n",
!     "Only necessary modules will be installed by default.\n",
!     "\n",
!     "====================================================================\n",
!     "\n",
!   );
! }
  
! # Should we skip the network tests?
  
! my $prompt = qq|
  POE's test suite requires a functional network.
  However, we can skip those tests requiring network
***************
*** 54,78 ****
  |;
  
!   $prompt .= "(Any text other than Y or y will be taken as a no)";
! 
!   my $ret = "n";
!   if (grep /^--default$/, @ARGV) {
!     print $prompt, " [n] n\n\n";
!   }
!   else {
!     $ret = prompt($prompt, "n");
!   }
  
!   my $marker = 'run_network_tests';
  
!   if($ret =~ /^Y$/i) {
!       unlink $marker if $marker;
!   } else {
!       open(TOUCH,"+>$marker") and close TOUCH;
!   }
  
!   print "\n";
  }
  
  # Which kind of makefile should we build?
  
--- 48,71 ----
  |;
  
! $prompt .= "(Any text other than Y or y will be taken as a no)";
  
! my $ret = "n";
! if (grep /^--default$/, @ARGV) {
!   print $prompt, " [n] n\n\n";
! }
! else {
!   $ret = prompt($prompt, "n");
! }
  
! my $marker = 'run_network_tests';
  
! if($ret =~ /^Y$/i) {
!     unlink $marker if $marker;
! } else {
!     open(TOUCH,"+>$marker") and close TOUCH;
  }
  
+ print "\n";
+ 
  # Which kind of makefile should we build?