Added new tests, fixed a bug, and cleaned up more code: Intermediate check-in

[p5sagit/Excel-Template.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 27fe9f8..559544e 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,42 +1,44 @@
+use strict;
+
 use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
+{
+    no strict 'refs';
 
-use strict;
+    my $libscan = \&{"ExtUtils::MM_Any::libscan"};
+    *{"ExtUtils::MM_Any::libscan"} = sub {
+        return '' unless $libscan->(@_);
+        return '' if $_[1] =~ /\.swp$/;
+        return $_[1];
+    };
+}
 
 my $prereqs = {
-    'Test::Simple'            => 0.44,
-    'Spreadsheet::WriteExcel' => 0.42,
+    'Test::More'              => 0.01,
     'XML::Parser'             => 0.01,
     'IO::Scalar'              => 0.01,
     'File::Basename'          => 0.01,
+    'Spreadsheet::WriteExcel' => 0.42,
+    'Spreadsheet::WriteExcel::Utility' => 0.01,
 };
 
 # The assumption is Perl 5.8.0 and greater doesn't need Unicode::String.
 
-my $use_unicode = 0;
 if ($] < 5.008)
 {
-    print "Do you want Unicode support? ";
-    my $answer = <STDIN>;
-    my $need_unicode = $answer =~ /^[Yy]/;
-
-    if ($need_unicode)
+    eval { require Unicode::String; };
+    if ($@)
     {
-            $prereqs->{'Unicode::String'} = '0.01';
-            $use_unicode = 1;
+        print "Note: If you want to work with Unicode, you will need to install";
+        print "the optional module Unicode::String and set USE_UNICODE to true.";
     }
 }
 
-my $pm_filter = $use_unicode
-    ? 'perl -p -e "s!UNI_YES ! !g;s!UNI_NO  !\\#!g"'
-    : 'perl -p -e "s!UNI_NO  ! !g;s!UNI_YES !\\#!g"';
-
 WriteMakefile(
     NAME         => 'Excel::Template',
     VERSION_FROM => 'lib/Excel/Template.pm', # finds $VERSION
-    AUTHOR       => 'Rob Kinyon (rob.kinyon@gmail.com)',
     ABSTRACT     => 'Excel::Template',
     PREREQ_PM    => $prereqs,
-    PM_FILTER    => $pm_filter,
+    ($] >= 5.005 ?
+       (ABSTRACT_FROM => 'lib/Excel/Template.pm',
+        AUTHOR       => 'Rob Kinyon (rob.kinyon@gmail.com)') : ()),
 );