From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 4FE5E1F934 for ; Thu, 1 Apr 2021 09:32:38 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] build: generate PublicInbox.pm with $VERSION Date: Thu, 1 Apr 2021 02:32:37 -0700 Message-Id: <20210401093238.23702-2-e@80x24.org> In-Reply-To: <20210401093238.23702-1-e@80x24.org> References: <20210401093238.23702-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Thanks to git-describe, we can generate and update this file to aid users in bug reporting. --- .gitignore | 1 + MANIFEST | 1 + Makefile.PL | 9 +++++++-- t/config.t | 7 ++++--- version-gen.perl | 29 +++++++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 version-gen.perl diff --git a/.gitignore b/.gitignore index f7e4c595..f0370cca 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /NEWS.atom /NEWS *.log +/lib/PublicInbox.pm diff --git a/MANIFEST b/MANIFEST index 49d273fc..5e3b4aec 100644 --- a/MANIFEST +++ b/MANIFEST @@ -482,6 +482,7 @@ t/www_listing.t t/www_static.t t/x-unknown-alpine.eml t/xcpdb-reshard.t +version-gen.perl xt/cmp-msgstr.t xt/cmp-msgview.t xt/create-many-inboxes.t diff --git a/Makefile.PL b/Makefile.PL index feb89ec1..129b082d 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -5,6 +5,7 @@ use strict; use ExtUtils::MakeMaker; open my $m, '<', 'MANIFEST' or die "open(MANIFEST): $!\n"; chomp(my @manifest = (<$m>)); +push @manifest, 'lib/PublicInbox.pm'; # generated my @EXE_FILES = grep(m!^script/!, @manifest); my $v = {}; my $t = {}; @@ -139,7 +140,7 @@ WriteMakefile( NAME => 'PublicInbox', # n.b. camel-case is not our choice # XXX drop "PENDING" in .pod before updating this! - VERSION => '1.6.1', + VERSION => '1.7.0.PENDING', AUTHOR => 'Eric Wong ', ABSTRACT => 'public-inbox server infrastructure', @@ -242,13 +243,17 @@ Makefile.PL : MANIFEST # prefix + bindir matches git.git Makefile: prefix = \$(HOME) bindir = \$(prefix)/bin -symlink-install : +symlink-install : lib/PublicInbox.pm mkdir -p \$(bindir) lei=\$\$(realpath lei.sh) && cd \$(bindir) && \\ for x in \$(EXE_FILES); do \\ ln -sf "\$\$lei" \$\$(basename "\$\$x"); \\ done +pure_all :: lib/PublicInbox.pm +lib/PublicInbox.pm : FORCE + VERSION=\$(VERSION) \$(PERL) -w ./version-gen.perl + update-copyrights : \@case '\$(GNULIB_PATH)' in '') echo >&2 GNULIB_PATH unset; false;; esac git ls-files | UPDATE_COPYRIGHT_HOLDER='all contributors' \\ diff --git a/t/config.t b/t/config.t index 73527ec2..877e5d5d 100644 --- a/t/config.t +++ b/t/config.t @@ -1,11 +1,12 @@ # Copyright (C) 2014-2021 all contributors # License: AGPL-3.0+ use strict; -use warnings; -use Test::More; -use PublicInbox::Config; +use v5.10.1; use PublicInbox::TestCommon; use PublicInbox::Import; +use_ok 'PublicInbox'; +ok(defined(eval('$PublicInbox::VERSION')), 'VERSION defined'); +use_ok 'PublicInbox::Config'; my ($tmpdir, $for_destroy) = tmpdir(); { diff --git a/version-gen.perl b/version-gen.perl new file mode 100644 index 00000000..e9964e30 --- /dev/null +++ b/version-gen.perl @@ -0,0 +1,29 @@ +#!perl -w +use v5.10.1; +my $v = $ENV{VERSION} // die 'VERSION unset'; +my $f = './lib/PublicInbox.pm'; +if (-d ($ENV{GIT_DIR} // '.git') || -f '.git') { + chomp(my $gv = `git describe --match "v[0-9]*" HEAD`); + if ($? == 0) { + substr($gv, 0, 1, ''); # remove "v" + system(qw(git update-index -q --refresh)); + if (my @n = `git diff-index --name-only HEAD --`) { + $gv .= '-dirty'; + } + $v = $gv; + } +} +$v =~ tr/-/./; +if (-f $f && do $f && (eval('$PublicInbox::VERSION') // 'undef') eq $v) { + exit +} +my $tmp = "$f.tmp.$$"; +open my $fh, '>', $tmp or die "open($tmp): $!"; +print $fh <