X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=Makefile.PL;h=d626aef45ecb1c2b60b1759cd000930957ad352e;hp=3020f25ac00807ac47c5fcddc2433742de8831f9;hb=e3e9ebdaaf2c2f8192fc003f1857979f933b9a8b;hpb=267f5358f9fdc8a3483749d398779d9bcf1de787

diff --git a/Makefile.PL b/Makefile.PL
index 3020f25a..d626aef4 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,12 +8,15 @@ chomp(my @manifest = (<$m>));
 my @EXE_FILES = grep(m!^script/!, @manifest);
 my $v = {};
 my $t = {};
+my @RELEASES = qw(v1.2.0 v1.1.0-pre1 v1.0.0); # do not sort
+$v->{news_deps} = [ map { "Documentation/RelNotes/$_.eml" } @RELEASES ];
 $v->{txt} = [ qw(INSTALL README COPYING TODO HACKING) ];
-my @dtxt = grep(m!\ADocumentation/.*\.txt\z!, @manifest);
+my @dtxt = grep(m!\ADocumentation/[^/]+\.txt\z!, @manifest);
 push @dtxt, 'Documentation/standards.txt';
+push @dtxt, @{$v->{txt}};
 for my $txt (@dtxt) {
 	my $html = $txt;
-	$html =~ s/\.txt\z/.html/;
+	$html =~ s/\.txt\z/.html/ or $html .= '.html';
 	$t->{"$html : $txt"} = [ "\$(txt2pre) <$txt" ];
 }
 $v->{t_slash_star_dot_t} = [ grep(m!\At/.*\.t\z!, @manifest) ];
@@ -71,7 +74,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/;
@@ -84,12 +88,13 @@ 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));
+$VARS .= "\nRELEASES = ".join(' ', @RELEASES)."\n";
 
 # Don't waste user's disk space by installing some pods from
 # imported code or internal use only
@@ -126,8 +131,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 +147,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...
@@ -166,10 +177,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 \$@ \$?