From 356fec5cf5fd9078ae9544721d4624a9aa034088 Mon Sep 17 00:00:00 2001 From: Chris Fields Date: Tue, 12 Apr 2011 13:24:10 -0500 Subject: [PATCH] * git rid of post-install step (see what I did there?) * will refer anyone looking for the one symlinked bp_pg_bulk_load_gff to look at the regular bulk loader (per Scott Cain) --- Bio/Root/Build.pm | 15 +++++++-------- maintenance/symlink_script.pl | 8 ++++---- scripts/utilities/{bp_netinstall.pl => bp_netinstall.PLS} | 0 3 files changed, 11 insertions(+), 12 deletions(-) rename scripts/utilities/{bp_netinstall.pl => bp_netinstall.PLS} (100%) diff --git a/Bio/Root/Build.pm b/Bio/Root/Build.pm index b4280dc79..80a7fc63d 100644 --- a/Bio/Root/Build.pm +++ b/Bio/Root/Build.pm @@ -108,13 +108,10 @@ sub choose_scripts { opendir(my $scripts_dir, 'scripts') or die "Can't open directory 'scripts': $!\n"; my $int_ok = 0; my @group_dirs; + + # only retain top-level script directories (the 'categories') while (my $thing = readdir($scripts_dir)) { next if $thing =~ /^\./; - next if $thing eq 'CVS'; - if ($thing =~ /PLS$|pl$/) { - $int_ok = 0; - last; - } $thing = File::Spec->catfile('scripts', $thing); if (-d $thing) { $int_ok = 1; @@ -122,7 +119,9 @@ sub choose_scripts { } } closedir($scripts_dir); - my $question = $int_ok ? "Install [a]ll BioPerl scripts, [n]one, or choose groups [i]nteractively?" : "Install [a]ll BioPerl scripts or [n]one?"; + my $question = $int_ok ? "Install [a]ll BioPerl scripts, [n]one, ". + "or choose groups [i]nteractively?" : "Install [a]ll BioPerl scripts ". + "or [n]one?"; my $prompt = $accept ? 'a' : $self->prompt($question, 'a'); @@ -191,7 +190,7 @@ sub process_script_files { my $self = shift; my $files = $self->find_script_files; return unless keys %$files; - + my $script_dir = File::Spec->catdir($self->blib, 'script'); File::Path::mkpath( $script_dir ); @@ -848,7 +847,7 @@ sub ACTION_install { require ExtUtils::Install; $self->depends_on('build'); ExtUtils::Install::install($self->install_map, !$self->quiet, 0, $self->{args}{uninst}||0); - $self->run_post_install_scripts; + #$self->run_post_install_scripts; } #sub add_post_install_script { diff --git a/maintenance/symlink_script.pl b/maintenance/symlink_script.pl index 07c3d3bea..87caa4db8 100755 --- a/maintenance/symlink_script.pl +++ b/maintenance/symlink_script.pl @@ -50,13 +50,13 @@ Used during "./Build install". Only works if the script installation directory used during "perl Build.pl" matches that used for the actual installation during "./Build install". So if you install to a special place, do -perl Build.pl --install_base /home/me -./Build install + perl Build.pl --install_base /home/me + ./Build install not -perl Build.pl -./Build install --install_base /home/me + perl Build.pl + ./Build install --install_base /home/me This script will create a symlink to a script in that same directory. It was written to create a symlink with the name 'bp_pg_bulk_load_gff.pl' that targeted diff --git a/scripts/utilities/bp_netinstall.pl b/scripts/utilities/bp_netinstall.PLS similarity index 100% rename from scripts/utilities/bp_netinstall.pl rename to scripts/utilities/bp_netinstall.PLS -- 2.11.4.GIT