- fix/simplify META.yml generation - we now generate META.yml at

  Makefile.PL time, since trying to work with EU::MM to generate a
  custom META.yml was a waste.

diff --git a/Changes b/Changes
index e9e7f5b5a680e3e5c8cce5469e4b941be23e8e84..1f3a29b1e348ae6473023eaff5e056c020ded128 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1361,6 +1361,9 @@ Revision history for Perl extension Imager.
 - make win32.c const happy
 - make raw.c C89 compliant
 - added version/level to the API function table structure
 - make win32.c const happy
 - make raw.c C89 compliant
 - added version/level to the API function table structure

+- fix/simplify META.yml generation - we now generate META.yml at
+  Makefile.PL time, since trying to work with EU::MM to generate a 
+  custom META.yml was a waste.

 
 =================================================================
 
 
 =================================================================
 

diff --git a/CountColor/Makefile.PL b/CountColor/Makefile.PL
index 908937a6f8c3f04df5f157b08b93dbb205fd56a2..6692103d1390ad0e996ea3d69e17cf971e9e8263 100644 (file)
--- a/CountColor/Makefile.PL
+++ b/CountColor/Makefile.PL
@@ -1,5 +1,4 @@
 use ExtUtils::MakeMaker;
 use ExtUtils::MakeMaker;

-require "../metafile.pl";

 
 my %opts = 
   (
 
 my %opts = 
   (

diff --git a/DynTest/Makefile.PL b/DynTest/Makefile.PL
index 1b2ec30fc487ebb57d9bc5bece512372feede026..70c871a83cc50d0f38b37fd5438944ebaeab479c 100644 (file)
--- a/DynTest/Makefile.PL
+++ b/DynTest/Makefile.PL
@@ -1,5 +1,4 @@
 use ExtUtils::MakeMaker;
 use ExtUtils::MakeMaker;

-require "../metafile.pl";

 
 my %opts = 
   (
 
 my %opts = 
   (

diff --git a/Flines/Makefile.PL b/Flines/Makefile.PL
index 5ca766f5317b48335d85518719abcfc78545b379..4eab1b26947faa9fc17cb7314a280ab430f9c073 100644 (file)
--- a/Flines/Makefile.PL
+++ b/Flines/Makefile.PL
@@ -1,5 +1,4 @@
 use ExtUtils::MakeMaker;
 use ExtUtils::MakeMaker;

-require "../metafile.pl";

 
 my %opts = 
   (
 
 my %opts = 
   (

diff --git a/MANIFEST b/MANIFEST
index fa5001c97a03435c108daaf7d777b4e01045a5a2..6e1b6b00e0463c154c3f46fa614e1d2e8b0576f4 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -125,7 +125,6 @@ log.c
 log.h
 map.c
 maskimg.c
 log.h
 map.c
 maskimg.c

-metafile.pl     Common META.yml generation

 palimg.c
 plug.h
 png.c
 palimg.c
 plug.h
 png.c

diff --git a/Makefile.PL b/Makefile.PL
index 3b4cd463c52a0e68d9766c5acecb0f02504616e1..5aace310926b31fa858f06de93921e059088b04c 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,7 +6,6 @@ use Config;
 use File::Spec;
 use Getopt::Long;
 use vars qw(%Recommends);
 use File::Spec;
 use Getopt::Long;
 use vars qw(%Recommends);

-require "metafile.pl";

 use ExtUtils::Manifest qw(maniread);
 use vars qw(%formats $VERBOSE $INCPATH $LIBPATH $NOLOG $DEBUG_MALLOC $MANUAL $CFLAGS $LFLAGS $DFLAGS);
 
 use ExtUtils::Manifest qw(maniread);
 use vars qw(%formats $VERBOSE $INCPATH $LIBPATH $NOLOG $DEBUG_MALLOC $MANUAL $CFLAGS $LFLAGS $DFLAGS);
 


@@ -168,11 +167,17 @@ if ($ExtUtils::MakeMaker::VERSION > 6.06) {
   $opts{AUTHOR} = 'Tony Cook <tony@imager.perl.org>, Arnar M. Hrafnkelsson';
   $opts{ABSTRACT} = 'Perl extension for Generating 24 bit Images';
 }
   $opts{AUTHOR} = 'Tony Cook <tony@imager.perl.org>, Arnar M. Hrafnkelsson';
   $opts{ABSTRACT} = 'Perl extension for Generating 24 bit Images';
 }

+if ($ExtUtils::MakeMaker::VERSION > 6.10) {
+  $opts{NO_META} = 1;
+}

 
 make_imconfig(\@defines);
 
 if ($VERBOSE) { print Dumper(\%opts); }
 mkdir('testout',0777); # since we cannot include it in the archive.
 
 make_imconfig(\@defines);
 
 if ($VERBOSE) { print Dumper(\%opts); }
 mkdir('testout',0777); # since we cannot include it in the archive.

+
+make_metafile(\%opts);
+

 WriteMakefile(%opts);
 
 exit;
 WriteMakefile(%opts);
 
 exit;


@@ -815,3 +820,49 @@ sub gen_PM {
 
   \%pm;
 }
 
   \%pm;
 }

+
+sub make_metafile {
+  my ($opts) = @_;
+
+  # extract the version
+  my $version = MM->parse_version($opts->{VERSION_FROM})
+    or die "Could not extract version number from $opts->{VERSION_FROM}\n";
+
+  my $meta = <<YAML;
+--- #YAML:1.0
+name: $opts->{NAME}
+version: $version
+version_from: $opts->{VERSION_FROM}
+author: $opts->{AUTHOR}
+abstract: $opts->{ABSTRACT}
+installdirs: site
+YAML
+  if (keys %{$Recommends{$opts->{NAME}}}) {
+    $meta .= "recommends:\n";
+    while (my ($module, $version) = each %{$Recommends{$opts->{NAME}}}) {
+      $meta .= "  $module: $version\n";
+    }
+  }
+  $meta .= <<YAML;
+license: perl
+dynamic_config: 1
+distribution_type: module
+generated_by: $opts->{NAME} version $version
+YAML
+  my $save_meta;
+  if (open META, "< META.yml") {
+    my $old_meta = do { local $/; <META> };
+    close META;
+
+    $save_meta = $old_meta ne $meta;
+  }
+  else {
+    ++$save_meta;
+  }
+  if ($save_meta) {
+    print "Updating META.yml\n";
+    open META, "> META.yml" or die "Cannot create META.yml: $!";
+    print META $meta;
+    close META;
+  }
+}

diff --git a/Mandelbrot/Makefile.PL b/Mandelbrot/Makefile.PL
index d0a60c4834ce3e2846039b583b51b48a871ec74f..ff5f4bddf15eb92d32d7cf8efff23b536480637d 100644 (file)
--- a/Mandelbrot/Makefile.PL
+++ b/Mandelbrot/Makefile.PL
@@ -1,5 +1,4 @@
 use ExtUtils::MakeMaker;
 use ExtUtils::MakeMaker;

-require "../metafile.pl";

 
 my %opts = 
   (
 
 my %opts = 
   (

diff --git a/TODO b/TODO
index f704a69fe21e3af5b2ff3b5c32357741dfc2cf66..9708b8a41a2774a2c03a78079073683eeb075c56 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,11 +8,11 @@ not commitments.
 
 BEFORE 0.48:
 
 
 BEFORE 0.48:
 

-scale() fixes/docs, Imager::Transformations going over.
+scale() fixes/docs, Imager::Transformations going over. (done)

 
 

-do some more malloc checks
+do some more malloc checks (done)

 
 

-scan $Config{libspath} for directories if we can.
+scan $Config{libspath} for directories if we can. (done)

 
 0.47:
 
 
 0.47:
 

diff --git a/metafile.pl b/metafile.pl
deleted file mode 100644 (file)
index ef24bdc..0000000
--- a/metafile.pl
+++ /dev/null
@@ -1,36 +0,0 @@
-# some versions of EU::MM have problems with recursive Makefile.PLs with
-# this method defined.
-undef &MY::metafile;
-
-sub MY::metafile {
-  my ($self) = @_;
-
-  my $meta = <<YAML;
---- #YAML:1.0
-name: $self->{NAME}
-version: $self->{VERSION}
-version_from: $self->{VERSION_FROM}
-author: $self->{AUTHOR}
-abstract: $self->{ABSTRACT}
-installdirs: $self->{INSTALLDIRS}
-YAML
-  if (keys %{$Recommends{$self->{NAME}}}) {
-    $meta .= "recommends:\n";
-    while (my ($module, $version) = each %{$Recommends{$self->{NAME}}}) {
-      $meta .= "$module: $version\n";
-    }
-  }
-  $meta .= <<YAML;
-license: perl
-dynamic_config: 1
-distribution_type: module
-generated_by: $self->{NAME} version $self->{VERSION}
-YAML
-  open META, "> meta.tmp" or die "Cannot create meta.tmp: $!";
-  print META $meta;
-  close META;
-  
-  return sprintf "metafile :\n\t\$(CP) meta.tmp META.yml\n";
-}
-
-1;