X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=49634573263b087034e6f3267c0de3e31e9fa90e;hb=77ece1ed54853ca38779d99418f8e86100fec81b;hp=e8efb8a44e465b937517ab808134b157fc44e855;hpb=d0f7a4290a2794eaf6364baba054fac6384ccdba;p=p5sagit%2FDistar.git diff --git a/lib/Distar.pm b/lib/Distar.pm index e8efb8a..4963457 100644 --- a/lib/Distar.pm +++ b/lib/Distar.pm @@ -5,8 +5,9 @@ use base qw(Exporter); use ExtUtils::MakeMaker (); use ExtUtils::MM (); use File::Spec (); +use File::Basename (); -our $VERSION = '0.002000'; +our $VERSION = '0.003000'; $VERSION = eval $VERSION; my $MM_VER = eval $ExtUtils::MakeMaker::VERSION; @@ -18,7 +19,11 @@ our @EXPORT = qw( sub import { strict->import; warnings->import(FATAL => 'all'); - shift->export_to_level(1,@_); + if (!(@MM::ISA == 1 && $MM::ISA[0] eq 'Distar::MM')) { + @Distar::MM::ISA = @MM::ISA; + @MM::ISA = qw(Distar::MM); + } + goto &Exporter::import; } sub author { @@ -72,8 +77,6 @@ sub write_manifest_skip { { package Distar::MM; - our @ISA = @MM::ISA; - @MM::ISA = (__PACKAGE__); sub new { my ($class, $args) = @_; @@ -85,7 +88,7 @@ sub write_manifest_skip { return $class->SUPER::new({ LICENSE => 'perl_5', MIN_PERL_VERSION => '5.006', - ($Distar::AUTHOR ? ( + ($Distar::Author ? ( AUTHOR => ($MM_VER >= 6.5702 ? $Distar::Author : join(', ', @$Distar::Author)), ) : ()), (exists $args->{ABSTRACT} ? () : (ABSTRACT_FROM => $args->{VERSION_FROM})), @@ -135,16 +138,17 @@ sub write_manifest_skip { 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; + for my $maybe_tar ($tar, qw(gtar gnutar)) { + my $version = `$maybe_tar --version 2>$dn`; + if ($version =~ /GNU tar/) { + $tar = $maybe_tar; + $gtar = 1; + last; + } } my $tarflags = $self->{TARFLAGS}; if (my ($flags) = $tarflags =~ /^-?([cvhlLf]+)$/) { @@ -166,8 +170,23 @@ sub write_manifest_skip { $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"; + warn "Current $warn too large to create portable dist archives! Max is ".(2**21-1).".\n" + ."Dist creation will most likely fail. Install GNU tar and re-run Makefile.PL to fix this issue.\n"; + my @try; + my $brew = `which brew 2>$dn`; + chomp $brew; + if (-x $brew) { + push @try, 'brew install gnu-tar'; + } + my $ports = `which ports 2>$dn`; + chomp $ports; + if (-x $ports) { + push @try, 'sudo ports install gnutar'; + } + if (@try) { + warn "Try" . (@try > 1 ? ' one of' : '') . ":\n" + . join '', map " $_\n", @try; + } } } @@ -190,40 +209,44 @@ END_FRAG 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_lib = File::Basename::dirname(__FILE__); + my $helpers = File::Spec->catdir($distar_lib, File::Spec->updir, 'helpers'); - 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 $licenses = $self->{LICENSE} || $self->{META_ADD}{license} || $self->{META_MERGE}{license}; + my $authors = $self->{AUTHOR}; + $_ = ref $_ ? $_ : [$_ || ()] + 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: @@ -234,10 +257,12 @@ check-cpan-upload: $(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) @@ -246,31 +271,55 @@ pushrelease :: pushrelease$(FAKE_RELEASE) :: cpan-upload $(DISTVNAME).tar$(SUFFIX) git push origin v$(VERSION) HEAD -distdir: readmefile +distdir: readmefile licensefile readmefile: create_distdir $(NOECHO) $(TEST_F) $(DISTVNAME)/README || $(MAKE) $(DISTVNAME)/README $(DISTVNAME)/README: $(VERSION_FROM) $(NOECHO) $(MKPATH) $(DISTVNAME) pod2text $(VERSION_FROM) >$(DISTVNAME)/README $(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) README -distsignature: readmefile +distsignature: readmefile licensefile +licensefile: create_distdir + $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(MAKE) $(DISTVNAME)/LICENSE || $(TRUE) +$(DISTVNAME)/LICENSE: Makefile.PL + $(NOECHO) $(MKPATH) $(DISTVNAME) + $(ABSPERLRUN) $(HELPERS)/generate-license -o $(DISTVNAME)/LICENSE $(AUTHORS) $(LICENSES) + $(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) LICENSE disttest: distmanicheck distmanicheck: create_distdir cd $(DISTVNAME) && $(ABSPERLRUN) "-MExtUtils::Manifest=manicheck" -e "exit manicheck" 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", ); }