Silence a couple of warnings reported by gcc

[perl/modules/Scope-Upper.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 9534a4f34d28c5d6b62c519f9f8358a96cbe83c3..33d3290e19ffb7331aa76130b10c89c92d41df81 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,10 +4,24 @@ use strict;
 use warnings;
 use ExtUtils::MakeMaker;
 
+use Config;
+
+my $pl   = $Config{perl_patchlevel};
+my $desc = $Config{git_describe};
+for ($pl, $desc) {
+ $_ = undef unless defined and length;
+}
+
 my @DEFINES;
 
+print "Checking if this is an official release of perl... ";
+my $is_release = ("$]" < 5.011) ? (defined($pl) || defined($desc) ? 0 : 1)
+                                : (defined($desc)                 ? 0 : 1);
+push @DEFINES, "-DSU_RELEASE=$is_release";
+print $is_release  ? "yes\n" : "no\n";
+
 # Threads, Windows and 5.8.x don't seem to be best friends
-if ($^O eq 'MSWin32' && $^V lt v5.9.0) {
+if ($^O eq 'MSWin32' && "$]" < 5.009) {
  push @DEFINES, '-DSU_MULTIPLICITY=0';
 }
 
@@ -26,14 +40,19 @@ my %PREREQ_PM = (
  'base'     => 0,
 );
 
+my %BUILD_REQUIRES = (
+ 'ExtUtils::MakeMaker' => 0,
+ 'Test::More'          => 0,
+ %PREREQ_PM,
+);
+
 my %META = (
  configure_requires => {
+  'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
  },
  build_requires => {
-  'ExtUtils::MakeMaker' => 0,
-  'Test::More'          => 0,
-  %PREREQ_PM,
+  %BUILD_REQUIRES,
  },
  dynamic_config => 1,
  resources => {
@@ -45,23 +64,24 @@ my %META = (
 );
 
 WriteMakefile(
-    NAME             => $name,
-    AUTHOR           => 'Vincent Pit <perl@profvince.com>',
-    LICENSE          => 'perl',
-    VERSION_FROM     => $file,
-    ABSTRACT_FROM    => $file,
-    PL_FILES         => {},
-    @DEFINES,
-    PREREQ_PM        => \%PREREQ_PM,
-    MIN_PERL_VERSION => 5.006,
-    META_MERGE       => \%META,
-    dist             => {
-        PREOP    => "pod2text $file > \$(DISTVNAME)/README",
-        COMPRESS => 'gzip -9f', SUFFIX => 'gz'
-    },
-    clean            => {
-        FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt"
-    },
+ NAME             => $name,
+ AUTHOR           => 'Vincent Pit <perl@profvince.com>',
+ LICENSE          => 'perl',
+ VERSION_FROM     => $file,
+ ABSTRACT_FROM    => $file,
+ PL_FILES         => {},
+ @DEFINES,
+ BUILD_REQUIRES   => \%BUILD_REQUIRES,
+ PREREQ_PM        => \%PREREQ_PM,
+ MIN_PERL_VERSION => '5.006',
+ META_MERGE       => \%META,
+ dist             => {
+  PREOP    => "pod2text -u $file > \$(DISTVNAME)/README",
+  COMPRESS => 'gzip -9f', SUFFIX => 'gz'
+ },
+ clean            => {
+  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt*"
+ },
 );
 
 package MY;
@@ -69,6 +89,6 @@ package MY;
 sub postamble {
  return <<'POSTAMBLE';
 testdeb: all
-       PERL_DL_NONLAZY=1 PERLDB_OPTS="NonStop=1" prove --exec='$(PERL) -d -T -I$(INST_LIB) -I$(INST_ARCHLIB)' $(TEST_FILES)
+       PERL_DL_NONLAZY=1 PERLDB_OPTS="NonStop=1" $(FULLPERLRUN) -MTAP::Harness -e 'TAP::Harness->new({verbosity => q{$(VERBOSE)}, lib => [ q{$(INST_LIB)}, q{$(INST_ARCHLIB)} ], switches => [ q{-d} ]})->runtests(@ARGV)' $(TEST_FILES)
 POSTAMBLE
 }