public-inbox 1.6.0

[public-inbox.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 46ef99f9f5210a27b2b63568a34038e5b047ead8..3fe9acf80bc03321b70383d071adcfcf05035c1c 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use ExtUtils::MakeMaker;
@@ -8,11 +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
+
+# do not sort
+my @RELEASES = qw(v1.6.0 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;
@@ -30,7 +34,7 @@ $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} = [];
@@ -70,10 +74,10 @@ $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"} = [
+       $t->{"$_:"} = [
                '$(PERL) -w Documentation/extman.perl $@ >$@+',
                'mv $@+ $@'
        ];
@@ -108,7 +112,7 @@ my %man3 = map {; # semi-colon tells Perl this is a BLOCK (and not EXPR)
 
 WriteMakefile(
        NAME => 'PublicInbox',
-       VERSION => '1.2.0',
+       VERSION => '1.6.0',
        AUTHOR => 'Eric Wong <e@80x24.org>',
        ABSTRACT => 'public-inbox server infrastructure',
        EXE_FILES => \@EXE_FILES,
@@ -121,23 +125,19 @@ WriteMakefile(
                # `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,
 
                # 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,
 
@@ -156,12 +156,14 @@ WriteMakefile(
 );
 
 sub MY::postamble {
-  <<EOF;
+       my $N = (`{ getconf _NPROCESSORS_ONLN || nproc; } 2>/dev/null` || 1);
+       $N += 1; # account for sleeps in some tests (and makes an IV)
+       <<EOF;
 PROVE = prove
 # support using eatmydata to speed up tests (apt-get install eatmydata):
 # https://www.flamingspork.com/projects/libeatmydata/
 EATMYDATA =
-N = \$\$(( \$\$(nproc 2>/dev/null || gnproc 2>/dev/null || echo 2) + 1 ))
+N = $N
 -include config.mak
 $VARS
 -include Documentation/include.mk
@@ -176,18 +178,22 @@ syntax:: \$(my_syntax)
 changed = \$(shell git ls-files -m)
 dsyn :: \$(addsuffix .syntax, \$(filter \$(changed), \$(syn_files)))
 
-check-manifest :: MANIFEST
-       if test -e .git && 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 check-manifest
+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 check-manifest
+check-run :: pure_all check-man
        \$(EATMYDATA) \$(PROVE) -bvw t/run.perl :: -j\$(N)
+       -@\$(check_manifest)
 
 check :: check-each