use ExtUtils::MakeMaker ();
use ExtUtils::MM ();
use File::Spec ();
+use File::Basename ();
our $VERSION = '0.003000';
-$VERSION = eval $VERSION;
+$VERSION =~ tr/_//d;
my $MM_VER = eval $ExtUtils::MakeMaker::VERSION;
sub init_dist {
my $self = shift;
- my $pre_tar = $self->{TAR};
my $out = $self->SUPER::init_dist(@_);
+ my $dn = File::Spec->devnull;
my $tar = $self->{TAR};
- my $gtar;
- my $set_user;
- my $version = `$tar --version`;
- if ($version =~ /GNU tar/) {
- $gtar = 1;
- }
- elsif (!$pre_tar && `gtar --version`) {
- $tar = 'gtar';
- $gtar = 1;
- }
+
my $tarflags = $self->{TARFLAGS};
if (my ($flags) = $tarflags =~ /^-?([cvhlLf]+)$/) {
if ($flags =~ s/c// && $flags =~ s/f//) {
$tarflags = '--format=ustar -c'.$flags.'f';
- if ($gtar) {
- $tarflags = '--owner=0 --group=0 '.$tarflags;
- $set_user = 1;
+ my $me = __FILE__;
+ for my $options ('--owner=0 --group=0', '--uid=0 --gid=0') {
+ my $try = `$tar -c $options "$me" 2>$dn`;
+ if (length $try) {
+ $tarflags = "$options $tarflags";
+ last;
+ }
}
}
}
- if (!$set_user) {
- my $warn = '';
- if ($> >= 2**21) {
- $warn .= "uid ($>)";
- }
- if ($) >= 2**21) {
- $warn .= ($warn ? ' and ' : '').'gid('.(0+$)).')';
- }
- if ($warn) {
- warn "$warn too large! Max is ".(2**21-1).".\n"
- ."Dist creation will likely fail. Install GNU tar to work around.\n";
- }
- }
-
$self->{TAR} = $tar;
$self->{TARFLAGS} = $tarflags;
sub dist_test {
my $self = shift;
- my $include = '';
- if (open my $fh, '<', 'maint/Makefile.include') {
- $include = "\n# --- Makefile.include:\n\n" . do { local $/; <$fh> };
- $include =~ s/\n?\z/\n/;
- }
-
- 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 $distar_lib = File::Basename::dirname(__FILE__);
+ my $helpers = File::Spec->catdir($distar_lib, File::Spec->updir, 'helpers');
my $licenses = $self->{LICENSE} || $self->{META_ADD}{license} || $self->{META_MERGE}{license};
my $authors = $self->{AUTHOR};
for $licenses, $authors;
my %vars = (
- DISTAR => $self->quote_literal($distar),
+ DISTAR_LIB => $self->quote_literal($distar_lib),
HELPERS => $self->quote_literal($helpers),
- REMAKE => join(' ', '$(PERLRUN)', '-I$(DISTAR)/lib', '-mDistar', 'Makefile.PL', map { $self->quote_literal($_) } @ARGV),
+ 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 : ''),
DISTTEST_MAKEFILE_PARAMS => '',
AUTHORS => $self->quote_literal(join(', ', @$authors)),
LICENSES => join(' ', map $self->quote_literal($_), @$licenses),
+ GET_CHANGELOG => '$(ABSPERLRUN) $(HELPERS)/get-changelog $(VERSION) $(CHANGELOG)',
+ UPDATE_DISTAR => (
+ -e File::Spec->catdir($distar_lib, File::Spec->updir, '.git')
+ ? 'git -C $(DISTAR_LIB) pull'
+ : '$(ECHO) "Distar code is not in a git repo, unable to update!"'
+ ),
);
my $dist_test = $self->SUPER::dist_test(@_);
$dist_test =~ s/(\bMakefile\.PL\b)/$1 \$(DISTTEST_MAKEFILE_PARAMS)/;
- join('',
- $dist_test,
- "\n\n# --- Distar section:\n\n",
- (map "$_ = $vars{$_}\n", sort keys %vars),
- <<'END',
+ my $include = '';
+ if (open my $fh, '<', 'maint/Makefile.include') {
+ $include = do { local $/; <$fh> };
+ $include =~ s/\n?\z/\n/;
+ }
+
+ my @out;
+ push @out, <<'END';
preflight: check-version check-manifest check-cpan-upload
$(ABSPERLRUN) $(HELPERS)/preflight $(VERSION) --changelog=$(CHANGELOG) --branch=$(BRANCH)
check-version:
$(NOECHO) cpan-upload -h $(DEV_NULL_STDOUT)
releasetest:
$(MAKE) disttest RELEASE_TESTING=1 DISTTEST_MAKEFILE_PARAMS="PREREQ_FATAL=1" PASTHRU="$(PASTHRU) TEST_FILES=\"$(TEST_FILES)\""
+ $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(ECHO) "Failed to generate $(DISTVNAME)/LICENSE!" >&2
+ $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE
release: preflight
$(MAKE) releasetest
- git commit -a -m "Release commit for $(VERSION)"
- git tag v$(VERSION) -m "release v$(VERSION)"
+ $(GET_CHANGELOG) -p"Release commit for $(VERSION)" | git commit -a -F -
+ $(GET_CHANGELOG) -p"release v$(VERSION)" | git tag -a -F - "v$(VERSION)"
$(RM_RF) $(DISTVNAME)
$(MAKE) $(DISTVNAME).tar$(SUFFIX)
$(NOECHO) $(MAKE) pushrelease FAKE_RELEASE=$(FAKE_RELEASE)
$(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) README
distsignature: readmefile licensefile
licensefile: create_distdir
- $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(MAKE) $(DISTVNAME)/LICENSE
+ $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(MAKE) $(DISTVNAME)/LICENSE || $(TRUE)
$(DISTVNAME)/LICENSE: Makefile.PL
$(NOECHO) $(MKPATH) $(DISTVNAME)
- $(ABSPERLRUN) $(HELPERS)/generate-license $(AUTHORS) $(LICENSES) >$(DISTVNAME)/LICENSE
- $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) $(HELPERS)/add-to-manifest LICENSE
+ $(ABSPERLRUN) $(HELPERS)/generate-license -o $(DISTVNAME)/LICENSE $(AUTHORS) $(LICENSES)
$(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) LICENSE
disttest: distmanicheck
distmanicheck: create_distdir
nextrelease:
$(ABSPERLRUN) $(HELPERS)/add-changelog-heading --git $(VERSION) $(CHANGELOG)
refresh:
- cd $(DISTAR) && git pull || $(TRUE)
+ $(UPDATE_DISTAR)
$(RM_F) $(FIRST_MAKEFILE)
$(REMAKE)
END
- map(sprintf(<<'END', "bump$_", ($_ || '$(V)')), @bump_targets),
+ my @bump_targets =
+ grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major');
+
+ for my $target (@bump_targets) {
+ push @out, sprintf <<'END', "bump$target", ($target || '$(V)');
%s:
$(ABSPERLRUN) $(HELPERS)/bump-version --git $(VERSION) %s
$(RM_F) $(FIRST_MAKEFILE)
$(REMAKE)
END
- $include,
+ }
+
+ join('',
+ $dist_test,
+ "\n\n# --- Distar section:\n\n",
+ (map "$_ = $vars{$_}\n", sort keys %vars),
+ "\n",
+ @out,
+ ($include ? (
+ "\n",
+ "# --- Makefile.include:\n",
+ "\n",
+ $include,
+ "\n"
+ ) : ()),
"\n",
);
}
projects / p5sagit/Distar.git / blobdiff