Merge branch 'tim-20120929-d-m' of git.shadowcat.co.uk:Devel-Size into tim-20120929-d-m

diff --git a/.gitignore b/.gitignore
index 24599dc..1fbab34 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,10 @@
 *.db
 *.dot
 blib/
-pm_to_blib/
+pm_to_blib
 MYMETA.json
 MYMETA.yml
 Makefile
 Makefile.old
+Memory.[co]
+Memory.bs

diff --git a/Makefile.PL b/Makefile.PL
index 2fe9deb..843514f 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,7 +13,12 @@ WriteMakefile(
     NAME => 'Devel::Memory',
     VERSION_FROM => 'lib/Devel/Memory.pm',
     DEFINE => "-DALIGN_BITS=$ptr_bits",
-    PREREQ_PM => { 'Test::More' => 0, XSLoader => 0, },
+    PREREQ_PM => {
+        'Test::More' => 0,
+        'JSON::XS' => 0,
+        'HTML::Entities' => 0,
+        XSLoader => 0,
+    },
     EXE_FILES => [ 'bin/dmemtree.pl' ],
     (eval $ExtUtils::MakeMaker::VERSION >= 6.47 ? (MIN_PERL_VERSION => '5.005') : ()),
     (eval $ExtUtils::MakeMaker::VERSION >= 6.31 ? (LICENSE => 'perl') : ()),

diff --git a/bin/dmemtree.pl b/bin/dmemtree.pl
index 4796770..a529bbd 100755 (executable)
--- a/bin/dmemtree.pl
+++ b/bin/dmemtree.pl
@@ -300,7 +300,7 @@ if ($opt_verbose) {
 if ($dot_fh) {
     print $dot_fh "}\n";
     close $dot_fh;
-    system("open -a Graphviz $opt_dot");
+    system("open -a Graphviz $opt_dot") if $^O eq 'darwin'; # OSX
 }
 
 $dbh->commit if $dbh;