X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=Makefile.PL;h=94ec16c65fb16bc3c0433fe85e2b738e7c655a08;hb=a65ebdc3a1f064bab0cddf64b34caad49f1c4c9c;hp=c4495c4f9325bac163ad902ef8206a3d723bf827;hpb=73fe3421f1ecbdc83600d5acfc643c33dbb9a0f2;p=public-inbox.git

diff --git a/Makefile.PL b/Makefile.PL
index c4495c4f..94ec16c6 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -22,6 +22,7 @@ my @syn = (@EXE_FILES, grep(m!^lib/.*\.pm$!, @manifest), @scripts);
 @syn = grep(!/DSKQXS\.pm/, @syn) if !eval { require IO::KQueue };
 @syn = grep(!/Unsubscribe\.pm/, @syn) if !eval { require Crypt::CBC };
 @syn = grep(!/SaPlugin/, @syn) if !eval { require Mail::SpamAssasin };
+$v->{syn_files} = \@syn;
 $v->{my_syntax} = [map { "$_.syntax" } @syn];
 $v->{-m1} = [ map { (split('/'))[-1] } @EXE_FILES ];
 $v->{-m5} = [ qw(public-inbox-config public-inbox-v1-format
@@ -70,7 +71,8 @@ $v->{xdocs} = [ map { "Documentation/.x/.$_.txt" } @xman ];
 $v->{xdocs_html} = [ map { "Documentation/.x/.$_.html" } @xman ];
 for (@{$v->{xdocs}}) {
 	$t->{"$_ : | Documentation/.x"} = [
-		'$(PERL) -w Documentation/extman.perl >$@',
+		'$(PERL) -w Documentation/extman.perl $@ >$@+',
+		'mv $@+ $@'
 	];
 	my $html = $_;
 	$html =~ s/\.txt\z/.html/;
@@ -83,12 +85,12 @@ my $TGTS = join("\n", map {;
 	my $tgt_prereq = $_;
 	my $cmds = $t->{$_};
 	"$tgt_prereq\n".join('', map { "\t$_\n" } @$cmds);
-} keys %$t);
+} sort keys %$t);
 
 my $VARS = join("\n", map {;
 	my $varname = $_;
-	join('', map { "$varname += $_\n" } @{$v->{$varname}});
-} grep(!/^-/, keys %$v));
+	join('', map { "$varname += $_\n" } sort @{$v->{$varname}});
+} grep(!/^-/, sort keys %$v));
 
 # Don't waste user's disk space by installing some pods from
 # imported code or internal use only
@@ -110,7 +112,6 @@ WriteMakefile(
 		# note: we use spamc(1), NOT the Perl modules
 		# We also depend on git.
 		# Keep this sorted and synced to the INSTALL document
-		'Date::Parse' => 0,
 
 		# libperl$PERL_VERSION,
 		# `perl5' on FreeBSD
@@ -126,8 +127,14 @@ WriteMakefile(
 		# `perl5' on FreeBSD
 		'Encode' => 0,
 
-		# TODO: these should really be made optional...
-		'Plack' => 0,
+		# Plack is needed for public-inbox-httpd and PublicInbox::WWW
+		# 'Plack' => 0,
+
+		# Filesys::Notify::Simple is pulled in by Plack, but also
+		# needed by public-inbox-watch (for now)
+		# 'Filesys::Notify::Simple' => 0,
+
+		# TODO: this should really be made optional...
 		'URI::Escape' => 0,
 
 		# We have more test dependencies, but do not force
@@ -136,7 +143,7 @@ WriteMakefile(
 		# All Perl installs I know about have these, but RH-based
 		# distros make them separate even though 'perl' pulls them in
 		'File::Path' => 0,
-		'File::Temp' => '0.19',
+		'File::Temp' => '0.19', # for ->tmpdir support
 		'Getopt::Long' => 0,
 		'Exporter' => 0,
 		# ExtUtils::MakeMaker # this file won't run w/o it...
@@ -146,6 +153,7 @@ WriteMakefile(
 
 sub MY::postamble {
   <<EOF;
+PROVE = prove
 # support using eatmydata to speed up tests (apt-get install eatmydata):
 # https://www.flamingspork.com/projects/libeatmydata/
 EATMYDATA =
@@ -165,10 +173,19 @@ changed = \$(shell git ls-files -m)
 dsyn :: \$(addsuffix .syntax, \$(filter \$(changed), \$(syn_files)))
 
 check-manifest :: MANIFEST
-	if git ls-files >\$?.gen 2>&1; then diff -u \$? \$?.gen; fi
+	if test -e .git && git ls-files >\$?.gen 2>&1; then \\
+		diff -u \$? \$?.gen; fi
+
+# the traditional way running per-*.t processes:
+check-each :: pure_all check-manifest
+	\$(EATMYDATA) \$(PROVE) --state=save -bvw -j\$(N)
+
+# lightly-tested way to run tests, relies "--state=save" in check-each
+# for best performance
+check-run :: pure_all check-manifest
+	\$(EATMYDATA) \$(PROVE) -bvw t/run.perl :: -j\$(N)
 
-check:: pure_all check-manifest
-	\$(EATMYDATA) prove -bvw -j\$(N)
+check :: check-each
 
 lib/PublicInbox/UserContent.pm :: contrib/css/216dark.css
 	\$(PERL) -I lib \$@ \$?