X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile.PL;h=88da5b45f88a73293278058f1dc4770f83033c7a;hb=6e2da35b9e9e5510e3156b07e91ebc835146758c;hp=c4495c4f9325bac163ad902ef8206a3d723bf827;hpb=73fe3421f1ecbdc83600d5acfc643c33dbb9a0f2;p=public-inbox.git
diff --git a/Makefile.PL b/Makefile.PL
index c4495c4f..88da5b45 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright (C) 2013-2019 all contributors
+# Copyright (C) 2013-2020 all contributors
# License: AGPL-3.0+
use strict;
use ExtUtils::MakeMaker;
@@ -8,12 +8,19 @@ chomp(my @manifest = (<$m>));
my @EXE_FILES = grep(m!^script/!, @manifest);
my $v = {};
my $t = {};
+
+# do not sort
+my @RELEASES = qw(v1.5.0 v1.4.0 v1.3.0 v1.2.0 v1.1.0-pre1 v1.0.0);
+
+$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, 'Documentation/flow.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) ];
@@ -22,11 +29,12 @@ 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
public-inbox-v2-format) ];
-$v->{-m7} = [ qw(public-inbox-overview) ];
+$v->{-m7} = [ qw(public-inbox-overview public-inbox-tuning) ];
$v->{-m8} = [ qw(public-inbox-daemon) ];
my @sections = (1, 5, 7, 8);
$v->{check_80} = [];
@@ -66,11 +74,12 @@ $v->{rsync_docs} = [ @{$v->{gz_docs}}, @{$v->{docs}},
# external manpages which we host ourselves, since some packages
# (currently just Xapian) doesn't host manpages themselves.
my @xman = qw(copydatabase.1 xapian-compact.1);
-$v->{xdocs} = [ map { "Documentation/.x/.$_.txt" } @xman ];
-$v->{xdocs_html} = [ map { "Documentation/.x/.$_.html" } @xman ];
+$v->{xdocs} = [ map { "Documentation/.$_.txt" } @xman ];
+$v->{xdocs_html} = [ map { "Documentation/.$_.html" } @xman ];
for (@{$v->{xdocs}}) {
- $t->{"$_ : | Documentation/.x"} = [
- '$(PERL) -w Documentation/extman.perl >$@',
+ $t->{"$_:"} = [
+ '$(PERL) -w Documentation/extman.perl $@ >$@+',
+ 'mv $@+ $@'
];
my $html = $_;
$html =~ s/\.txt\z/.html/;
@@ -83,12 +92,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
@@ -102,32 +112,33 @@ my %man3 = map {; # semi-colon tells Perl this is a BLOCK (and not EXPR)
WriteMakefile(
NAME => 'PublicInbox',
- VERSION => '1.2.0',
- AUTHOR => 'Eric Wong ',
+ VERSION => '1.5.0',
+ AUTHOR => 'Eric Wong ',
ABSTRACT => 'public-inbox server infrastructure',
EXE_FILES => \@EXE_FILES,
PREREQ_PM => {
# 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
# perl-Digest-SHA on RH-based
'Digest::SHA' => 0,
- 'Email::MIME' => 0,
-
- # the following should be pulled in by Email::MIME:
- 'Email::MIME::ContentType' => 0,
- 'Email::Simple' => 0,
# libperl$PERL_VERSION or libencode-perl on Debian,
# `perl5' on FreeBSD
- 'Encode' => 0,
+ 'Encode' => 2.35, # 2.35 shipped with 5.10.1
+
+ # libperl$PERL_VERSION + perl-modules-$PERL_VERSION
+ 'Compress::Raw::Zlib' => 0,
+ 'Compress::Zlib' => 0,
+ 'IO::Compress::Gzip' => 0,
- # TODO: these should really be made optional...
- 'Plack' => 0,
+ # Plack is needed for public-inbox-httpd and PublicInbox::WWW
+ # 'Plack' => 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...
@@ -145,11 +156,14 @@ WriteMakefile(
);
sub MY::postamble {
- </dev/null` || 1);
+ $N += 1; # account for sleeps in some tests (and makes an IV)
+ </dev/null || gnproc 2>/dev/null || echo 2) + 1 ))
+N = $N
-include config.mak
$VARS
-include Documentation/include.mk
@@ -164,11 +178,24 @@ syntax:: \$(my_syntax)
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
+check_manifest := if test -e .git && git ls-files >MANIFEST.gen 2>&1; then \\
+ diff -u MANIFEST MANIFEST.gen; fi
+
+check-manifest : MANIFEST
+ \$(check_manifest)
+
+# the traditional way running per-*.t processes:
+check-each :: pure_all
+ \$(EATMYDATA) \$(PROVE) --state=save -bvw -j\$(N)
+ -@\$(check_manifest)
+
+# lightly-tested way to run tests, relies "--state=save" in check-each
+# for best performance
+check-run :: pure_all
+ \$(EATMYDATA) \$(PROVE) -bvw t/run.perl :: -j\$(N)
+ -@\$(check_manifest)
-check:: pure_all check-manifest
- \$(EATMYDATA) prove -bvw -j\$(N)
+check :: check-each
lib/PublicInbox/UserContent.pm :: contrib/css/216dark.css
\$(PERL) -I lib \$@ \$?