use base qw(Exporter);
use ExtUtils::MakeMaker ();
use ExtUtils::MM ();
+use File::Spec ();
our $VERSION = '0.002000';
$VERSION = eval $VERSION;
sub new {
my ($class, $args) = @_;
+ my %test = %{$args->{test}||{}};
+ my $tests = $test{TESTS} || 't/*.t';
+ $tests !~ /\b\Q$_\E\b/ and $tests .= " $_"
+ for 'xt/*.t', 'xt/*/*.t';
+ $test{TESTS} = $tests;
return $class->SUPER::new({
LICENSE => 'perl_5',
MIN_PERL_VERSION => '5.006',
AUTHOR => ($MM_VER >= 6.5702 ? $Distar::Author : join(', ', @$Distar::Author)),
- ABSTRACT_FROM => $args->{VERSION_FROM},
+ (exists $args->{ABSTRACT} ? () : (ABSTRACT_FROM => $args->{VERSION_FROM})),
%$args,
- test => { TESTS => ($args->{test}{TESTS}||'t/*.t').' xt/*.t xt/*/*.t' },
+ test => \%test,
realclean => { FILES => (
($args->{realclean}{FILES}||'')
. ' Distar/ MANIFEST.SKIP MANIFEST MANIFEST.bak'
sub flush {
my $self = shift;
- Distar::write_manifest_skip($self);
+ `git ls-files --error-unmatch MANIFEST.SKIP 2>&1`;
+ my $maniskip_tracked = !$?;
+
+ Distar::write_manifest_skip($self)
+ unless $maniskip_tracked;
$self->SUPER::flush(@_);
}
preflight
check-version
check-manifest
+ check-cpan-upload
releasetest
release
readmefile
my @bump_targets =
grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major');
+ my $distar = File::Spec->catdir(
+ File::Spec->catpath((File::Spec->splitpath(__FILE__))[0,1], ''),
+ File::Spec->updir,
+ );
+ my $helpers = File::Spec->catdir($distar, 'helpers');
+
my %vars = (
- REMAKE => join(' ', '$(PERLRUN)', 'Makefile.PL', map { $self->quote_literal($_) } @ARGV),
+ DISTAR => $self->quote_literal($distar),
+ HELPERS => $self->quote_literal($helpers),
+ REMAKE => join(' ', '$(PERLRUN)', '-I$(DISTAR)/lib', '-mDistar', 'Makefile.PL', map { $self->quote_literal($_) } @ARGV),
BRANCH => $self->{BRANCH} ||= 'master',
CHANGELOG => $self->{CHANGELOG} ||= 'Changes',
+ DEV_NULL_STDOUT => ($self->{DEV_NULL} ? '>'.File::Spec->devnull : ''),
+ FAKE_RELEASE => '',
+ DISTTEST_MAKEFILE_PARAMS => '',
);
+ my $dist_test = $self->SUPER::dist_test(@_);
+ $dist_test =~ s/(\bMakefile\.PL\b)/$1 \$(DISTTEST_MAKEFILE_PARAMS)/;
+
join('',
- $self->SUPER::dist_test(@_),
+ $dist_test,
"\n\n# --- Distar section:\n\n",
(map "$_ = $vars{$_}\n", sort keys %vars),
<<'END',
-preflight: check-version check-manifest
- $(ABSPERLRUN) Distar/helpers/preflight $(VERSION) --changelog=$(CHANGELOG) --branch=$(BRANCH)
+preflight: check-version check-manifest check-cpan-upload
+ $(ABSPERLRUN) $(HELPERS)/preflight $(VERSION) --changelog=$(CHANGELOG) --branch=$(BRANCH)
check-version:
- $(ABSPERLRUN) Distar/helpers/check-version $(VERSION) $(TO_INST_PM) $(EXE_FILES)
+ $(ABSPERLRUN) $(HELPERS)/check-version $(VERSION) $(TO_INST_PM) $(EXE_FILES)
check-manifest:
- $(ABSPERLRUN) Distar/helpers/check-manifest
+ $(ABSPERLRUN) $(HELPERS)/check-manifest
+check-cpan-upload:
+ $(NOECHO) cpan-upload -h $(DEV_NULL_STDOUT)
releasetest:
- $(MAKE) disttest RELEASE_TESTING=1 PASTHRU="$(PASTHRU) TEST_FILES=\"$(TEST_FILES)\""
-release: preflight releasetest
- $(RM_RF) $(DISTVNAME)
- $(MAKE) $(DISTVNAME).tar$(SUFFIX)
+ $(MAKE) disttest RELEASE_TESTING=1 DISTTEST_MAKEFILE_PARAMS="PREREQ_FATAL=1" PASTHRU="$(PASTHRU) TEST_FILES=\"$(TEST_FILES)\""
+release: preflight
+ $(MAKE) releasetest
git commit -a -m "Release commit for $(VERSION)"
git tag v$(VERSION) -m "release v$(VERSION)"
+ $(RM_RF) $(DISTVNAME)
+ $(MAKE) $(DISTVNAME).tar$(SUFFIX)
+ $(NOECHO) $(MAKE) pushrelease FAKE_RELEASE=$(FAKE_RELEASE)
+pushrelease ::
+ $(NOECHO) $(NOOP)
+pushrelease$(FAKE_RELEASE) ::
cpan-upload $(DISTVNAME).tar$(SUFFIX)
git push origin v$(VERSION) HEAD
distdir: readmefile
readmefile: create_distdir
- $(NOECHO) $(MAKE) $(DISTVNAME)/README
+ $(NOECHO) $(TEST_F) $(DISTVNAME)/README || $(MAKE) $(DISTVNAME)/README
$(DISTVNAME)/README: $(VERSION_FROM)
$(NOECHO) $(MKPATH) $(DISTVNAME)
pod2text $(VERSION_FROM) >$(DISTVNAME)/README
- $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) ../Distar/helpers/add-to-manifest README
+ $(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) README
+distsignature: readmefile
disttest: distmanicheck
distmanicheck: create_distdir
cd $(DISTVNAME) && $(ABSPERLRUN) "-MExtUtils::Manifest=manicheck" -e "exit manicheck"
nextrelease:
- $(ABSPERLRUN) Distar/helpers/add-changelog-heading --git $(VERSION) $(CHANGELOG)
+ $(ABSPERLRUN) $(HELPERS)/add-changelog-heading --git $(VERSION) $(CHANGELOG)
refresh:
- cd Distar && git pull
+ cd $(DISTAR) && git pull || $(TRUE)
$(RM_F) $(FIRST_MAKEFILE)
$(REMAKE)
END
map(sprintf(<<'END', "bump$_", ($_ || '$(V)')), @bump_targets),
%s:
- $(ABSPERLRUN) Distar/helpers/bump-version --git $(VERSION) %s
+ $(ABSPERLRUN) $(HELPERS)/bump-version --git $(VERSION) %s
$(RM_F) $(FIRST_MAKEFILE)
$(REMAKE)
END
F<Makefile.PL>:
use ExtUtils::MakeMaker;
- (do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
+ (do './maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
WriteMakefile(...);
$ make nextrelease # add version heading to Changes file
$ make releasetest # build dist and test (with xt/ and RELEASE_TESTING=1)
$ make preflight # check that repo and file state is release ready
- $ make release # check releasetest and preflight, then build and
- # upload to CPAN, tag release, push tag and branch
+ $ make release # check releasetest and preflight, commits and tags,
+ # builds and uploads to CPAN, and pushes commits and
+ # tag
+ $ make release FAKE_RELEASE=1
+ # builds a release INCLUDING committing and tagging,
+ # but does not upload to cpan or push anything to git
=head1 DESCRIPTION
Releasing will generate a dist tarball and upload it to CPAN using cpan-upload.
It will also create a git tag for the release, and push the tag and branch.
+=head3 FAKE_RELEASE
+
+If release is run with FAKE_RELEASE=1 set, it will skip uploading to CPAN and
+pushing to git. A release commit will still be created and tagged locally.
+
=head2 preflight
Performs a number of checks on the files and repository, ensuring it is in a
=head2 bump
Bumps the version number. This will try to preserve the length and format of
-the version number. The least significant digit will be incremented.
+the version number. The least significant digit will be incremented. Versions
+with underscores will preserve the underscore in the same position.
Optionally accepts a C<V> option to set the version to a specific value.
The version changes will automatically be committed. Unstaged modifications to
the files will be left untouched.
+=head3 V
+
+The V option will be passed along to the version bumping script. It can accept
+a space separated list of options, including an explicit version number.
+
+Options:
+
+=over 4
+
+=item --force
+
+Updates version numbers even if they do not match the current expected version
+number.
+
+=item --stable
+
+Attempts to convert the updated version to a stable version, removing any
+underscore.
+
+=item --alpha
+
+Attempts to convert the updated version to an alpha version, adding an
+underscore in an appropriate place.
+
+=back
+
=head2 bumpminor
Like bump, but increments the minor segment of the version. This will treat
haarg - Graham Knop (cpan:HAARG) <haarg@cpan.org>
-ether = Karen Etheridge (cpan:ETHER) <ether@cpan.org>
+ether - Karen Etheridge (cpan:ETHER) <ether@cpan.org>
frew - Arthur Axel "fREW" Schmidt (cpan:FREW) <frioux@gmail.com>
projects / p5sagit/Distar.git / blobdiff