From b6980afc34ce37947fbf426996ebddd07b440e2a Mon Sep 17 00:00:00 2001 From: Keith James Date: Wed, 26 Nov 2014 22:39:17 +0000 Subject: [PATCH] Removed old Build.pm Fixed required version of Test::Perl::Critic --- Build.PL | 2 +- Build.pm | 79 -------------------------------------------------------- MANIFEST | 1 - 3 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 Build.pm diff --git a/Build.PL b/Build.PL index d6f0746..7e59ef0 100644 --- a/Build.PL +++ b/Build.PL @@ -26,7 +26,7 @@ my $build = WTSI::DNAP::Utilities::Build->new 'Test::Class' => '>= 0.41', 'Test::More' => '>= 0.98', 'Test::Exception' => '>= 0.32', - 'Test::Perl::Critic' => '>= 0.02' + 'Test::Perl::Critic' => '>= 1.02' }, requires => { 'Carp' => '>= 1.20', diff --git a/Build.pm b/Build.pm deleted file mode 100644 index e75b804..0000000 --- a/Build.pm +++ /dev/null @@ -1,79 +0,0 @@ - -package Build; - -use strict; -use warnings; - -use base 'Module::Build'; - -our $DEFAULT_VERSION = '0.0.0'; -our $BLIB_VERSION_FILE = 'blib/lib/WTSI/DNAP/Utilities.pm'; -our $DIST_VERSION_FILE = 'lib/WTSI/DNAP/Utilities.pm'; - -# Git version code courtesy of Marina Gourtovaia -sub git_tag { - my $version; - - unless (`which git`) { - warn "git command not found; cannot generate version string, " . - "defaulting to $DEFAULT_VERSION"; - $version = $DEFAULT_VERSION; - } - - if (!$version) { - $version = `git describe --dirty --always`; - chomp $version; - } - - unless ($version =~ /^\d+\.\d+\.\d+(-\S+)?/) { - warn "git version string $version not in canonical format, " . - "defaulting to $DEFAULT_VERSION"; - $version = $DEFAULT_VERSION; - } - - return $version; -} - -sub ACTION_code { - my ($self) = @_; - - $self->SUPER::ACTION_code; - $self->_write_version($BLIB_VERSION_FILE); -} - -sub ACTION_dist { - my ($self) = @_; - - $self->SUPER::ACTION_distdir; - - my $dist_dir = $self->dist_dir; - $self->_write_version(File::Spec->join($dist_dir, $DIST_VERSION_FILE)); - $self->make_tarball($dist_dir); - $self->delete_filetree($dist_dir); -} - -sub _write_version { - my ($self, $version_file) = @_; - - my $gitver = $self->git_tag; - - if (-e $version_file) { - warn "Changing version of '$version_file' to $gitver\n"; - - my $backup = '.original'; - local $^I = $backup; - local @ARGV = ($version_file); - - while (<>) { - s/(\$VERSION\s*=\s*)('?\S+'?)\s*;/${1}'$gitver';/; - print; - } - - unlink "$version_file$backup"; - } else { - warn "File '$version_file' not found\n"; - } -} - - -1; diff --git a/MANIFEST b/MANIFEST index 0230d23..4a3dc07 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,6 +1,5 @@ .travis.yml Build.PL -Build.pm COPYING etc/log4perl_tests.conf lib/WTSI/DNAP/Utilities.pm