Disable the Win32 AS Perl workaround for now, as it doesn't seem to be relevant for...

[perl/modules/Variable-Magic.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 18cf91c623b66975a8156c9ce7b1adb86c3b014a..9399f6922c00a924ccc21bb15814f3a13c074d38 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,20 +23,24 @@ if (defined $pl && length $pl) {
 }
 
 my $is_as = 0;
-print "Checking if this is Windows ActiveState 5.8.x... ";
-if ($^O eq 'MSWin32' && $^V ge v5.8.7 && $^V lt v5.9.0) {
+print "Checking if this is Windows ActiveState 5.8.[78]... ";
+if ($^O eq 'MSWin32' && $^V ge v5.8.7 && $^V lt v5.8.9) {
  eval {
   require Win32;
   1;
  } and do {
   if (defined &Win32::BuildNumber) {
    $is_as = 1;
-   push @DEFINES, '-DVMG_COMPAT_ARRAY_PUSH_NOLEN=1';
   }
  }
 }
 print $is_as ? "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) {
+ push @DEFINES, '-DVMG_MULTIPLICITY=0';
+}
+
 @DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;
 
 my $BUILD_REQUIRES = {
@@ -55,6 +59,21 @@ sub build_req {
  return $build_req;
 }
 
+my $RESOURCES = {
+ 'repository' => 'http://git.profvince.com/perl/modules/Variable-Magic.git',
+ 'bugtracker' => 'http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Variable-Magic',
+};
+
+sub resources {
+ my $tometa = ' >> $(DISTVNAME)/META.yml;';
+ my $build_req = 'echo "resources:" ' . $tometa;
+ foreach my $res ( sort { lc $a cmp lc $b } keys %$RESOURCES ) {
+  my $val = $RESOURCES->{$res};
+  $build_req .= sprintf 'echo "    %-15s %s" %s', "$res:", $val, $tometa;
+ }
+ return $build_req;
+}
+
 WriteMakefile(
     NAME          => 'Variable::Magic',
     AUTHOR        => 'Vincent Pit <perl@profvince.com>',
@@ -70,7 +89,7 @@ WriteMakefile(
     },
     dist          => { 
         PREOP      => 'pod2text lib/Variable/Magic.pm > $(DISTVNAME)/README; '
-                      . build_req,
+                      . build_req . resources,
         COMPRESS   => 'gzip -9f', SUFFIX => 'gz'
     },
     clean         => { FILES => 'Variable-Magic-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt' },