X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=Makefile.PL;h=f6b7abb65647164193f576a78fb688f9593212e5;hb=c39ed01a3a4c6c4634642eb875a16538aceacfc3;hp=598741706041302a7b887df28441d3603809a81e;hpb=6864cdba2bb65069d15d26e0b9af6ade8edd0ec3;p=public-inbox.git
diff --git a/Makefile.PL b/Makefile.PL
index 59874170..f6b7abb6 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,7 +8,10 @@ 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);
@@ -31,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} = [];
@@ -71,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,8 +111,11 @@ my %man3 = map {; # semi-colon tells Perl this is a BLOCK (and not EXPR)
} qw(Git.pm Import.pm WWW.pod SaPlugin/ListMirror.pod);
WriteMakefile(
- NAME => 'PublicInbox',
- VERSION => '1.2.0',
+ NAME => 'PublicInbox', # n.b. camel-case is not our choice
+
+ # XXX drop "PENDING" in .pod before updating this!
+ VERSION => '1.6.0',
+
AUTHOR => 'Eric Wong ',
ABSTRACT => 'public-inbox server infrastructure',
EXE_FILES => \@EXE_FILES,
@@ -122,23 +128,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,
@@ -157,12 +159,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
@@ -177,18 +181,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