X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=Makefile.PL;h=c134ff92893db27a83d7b6e637f5272f0e369adc;hb=b60a4c5e4839bd358f285683b3e388d40e595cb8;hp=9e0c6e8fb5d53d31f8785283dfcc7e73fc50bc59;hpb=68a70c10fcf5bacc5ae6258177917ae45ab67365;p=public-inbox.git

diff --git a/Makefile.PL b/Makefile.PL
index 9e0c6e8f..c134ff92 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,15 +1,16 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use ExtUtils::MakeMaker;
-my @EXE_FILES = split("\n", `git ls-files 'script/*' 2>/dev/null`);
-my $PM_FILES = `git ls-files lib '*.pm' 2>/dev/null`;
-$PM_FILES =~ tr/\n/ /;
+open my $m, '<', 'MANIFEST' or die "open(MANIFEST): $!\n";
+chomp(my @manifest = (<$m>));
+my @EXE_FILES = grep(m!^script/!, @manifest);
+my $PM_FILES = join(' ', grep(m!^lib/.*\.pm$!, @manifest));
 
 WriteMakefile(
 	NAME => 'PublicInbox',
-	VERSION => '0.0.0',
+	VERSION => '1.1.0-pre1',
 	AUTHOR => 'Eric Wong <e@80x24.org>',
 	ABSTRACT => 'public-inbox server infrastructure',
 	EXE_FILES => \@EXE_FILES,
@@ -18,19 +19,17 @@ WriteMakefile(
 		# We also depend on git.
 		# Keep this sorted and synced to the INSTALL document
 		'Date::Parse' => 0,
-		'Email::Address' => 0,
-		'Email::Filter' => 0,
 		'Email::MIME' => 0,
 		'Email::MIME::ContentType' => 0,
 		'Email::Simple' => 0,
 		'Encode::MIME::Header' => 0,
-		'File::Path::Expand' => 0,
-		'IPC::Run' => 0,
-		'Mail::Thread' => '2.5', # 2.5+ needed for Email::Simple compat
+
+		# TODO: these should really be made optional...
 		'Plack' => 0,
 		'URI::Escape' => 0,
+
 		# We have more test dependencies, but do not force
-		# users to install them
+		# users to install them.  See INSTALL
 	},
 );
 
@@ -41,17 +40,20 @@ sub MY::postamble {
 EATMYDATA =
 -include config.mak
 -include Documentation/include.mk
+N ?= \$(shell echo \$\$(( \$\$(nproc 2>/dev/null || echo 2) + 1)))
 SCRIPTS := scripts/ssoma-replay
 my_syntax := \$(addsuffix .syntax, $PM_FILES \$(EXE_FILES) \$(SCRIPTS))
 
-N := \$(shell echo \$\$(( \$\$(nproc 2>/dev/null || echo 2) + 1)))
 
 %.syntax ::
 	@\$(PERL) -I lib -c \$(subst .syntax,,\$@)
 
 syntax:: \$(my_syntax)
 
-check:: pure_all
+check-manifest :: MANIFEST
+	if git ls-files >\$<.gen 2>&1; then diff -u \$< \$<.gen; fi
+
+check:: pure_all check-manifest
 	\$(EATMYDATA) prove -lv -j\$(N)
 
 EOF