r69198 - in /trunk/perlbrew: Changes META.yml debian/changelog lib/App/perlbrew.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon Feb 21 03:42:45 UTC 2011
Author: jawnsy-guest
Date: Mon Feb 21 03:42:01 2011
New Revision: 69198
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=69198
Log:
upgraded to new version, only doc changes, dch -r
Modified:
trunk/perlbrew/Changes
trunk/perlbrew/META.yml
trunk/perlbrew/debian/changelog
trunk/perlbrew/lib/App/perlbrew.pm
Modified: trunk/perlbrew/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlbrew/Changes?rev=69198&op=diff
==============================================================================
--- trunk/perlbrew/Changes (original)
+++ trunk/perlbrew/Changes Mon Feb 21 03:42:01 2011
@@ -1,3 +1,8 @@
+0.16:
+- Use 'test_harness' for perl >= 5.7.3. avar++
+- Use gtar on Solaris - RT #61042. doherty++
+- Fix "perlbrew -f switch" by dalinaum++
+
0.15:
- DEPRECATE and REMOVE 'perlbrew installed' command.
- Intrudoce a 'perlbrew exec' command
Modified: trunk/perlbrew/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlbrew/META.yml?rev=69198&op=diff
==============================================================================
--- trunk/perlbrew/META.yml (original)
+++ trunk/perlbrew/META.yml Mon Feb 21 03:42:01 2011
@@ -24,4 +24,4 @@
resources:
license: http://opensource.org/licenses/mit-license.php
repository: git://github.com/gugod/App-perlbrew.git
-version: 0.15
+version: 0.16
Modified: trunk/perlbrew/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlbrew/debian/changelog?rev=69198&op=diff
==============================================================================
--- trunk/perlbrew/debian/changelog (original)
+++ trunk/perlbrew/debian/changelog Mon Feb 21 03:42:01 2011
@@ -1,4 +1,4 @@
-perlbrew (0.15-1) unstable; urgency=low
+perlbrew (0.16-1) unstable; urgency=low
* Initial Release. (Closes: #609424)
Modified: trunk/perlbrew/lib/App/perlbrew.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlbrew/lib/App/perlbrew.pm?rev=69198&op=diff
==============================================================================
--- trunk/perlbrew/lib/App/perlbrew.pm (original)
+++ trunk/perlbrew/lib/App/perlbrew.pm Mon Feb 21 03:42:01 2011
@@ -5,7 +5,7 @@
use Getopt::Long ();
use File::Spec::Functions qw( catfile );
-our $VERSION = "0.15";
+our $VERSION = "0.16";
our $CONF;
my $ROOT = $ENV{PERLBREW_ROOT} || "$ENV{HOME}/perl5/perlbrew";
@@ -20,9 +20,11 @@
source $HOME/.perlbrew/init
fi
+short_option=""
+
__perlbrew_reinit () {
echo '# DO NOT EDIT THIS FILE' > $HOME/.perlbrew/init
- command perlbrew env $1 >> $HOME/.perlbrew/init
+ command perlbrew $short_option env $1 >> $HOME/.perlbrew/init
source $HOME/.perlbrew/init
__perlbrew_set_path
}
@@ -36,14 +38,20 @@
perlbrew () {
local exit_status
+
+ if [[ `echo $1 | awk 'BEGIN{FS=""}{print $1}'` = '-' ]]; then
+ short_option=$1
+ shift
+ fi
+
case $1 in
(use)
if [[ -x "$PERLBREW_ROOT/perls/$2/bin/perl" ]]; then
- eval $(command perlbrew env $2)
+ eval $(command perlbrew $short_option env $2)
__perlbrew_set_path
elif [[ "$2" = "system" ]]; then
unset PERLBREW_PERL
- eval $(command perlbrew env)
+ eval $(command perlbrew $short_option env)
__perlbrew_set_path
else
echo "$2 is not installed" >&2
@@ -74,13 +82,13 @@
fi
unset PERLBREW_PERL
- command perlbrew off
+ command perlbrew $short_option off
__perlbrew_reinit
;;
(*)
- command perlbrew $*
+ command perlbrew $short_option $*
exit_status=$?
;;
esac
@@ -193,6 +201,8 @@
'D=s@',
'U=s@',
'A=s@',
+
+ 'j=i'
)
or run_command_help(1);
@@ -438,12 +448,25 @@
} else {
$dist_extracted_dir = "$ROOT/build/${dist}";
- my $tarx = "tar " . ( $dist_tarball =~ /bz2/ ? "xjf" : "xzf" );
+ # Was broken on Solaris, where GNU tar is probably
+ # installed as 'gtar' - RT #61042
+ my $tarx = ($^O eq 'solaris' ? 'gtar ' : 'tar ') . ( $dist_tarball =~ /bz2/ ? 'xjf' : 'xzf' );
$extract_command = "cd $ROOT/build; $tarx $ROOT/dists/${dist_tarball}";
$configure_flags = '-de';
}
- my @install = $self->{notest} ? "make install" : ("make test", "make install");
+ # Test via "make test_harness" if available so we'll get
+ # automatic parallel testing via $HARNESS_OPTIONS. The
+ # "test_harness" target was added in 5.7.3, which was the last
+ # development release before 5.8.0.
+ my $test_target = "test";
+ if ($dist_version =~ /^5\.(\d+)\.(\d+)/
+ && ($1 >= 8 || $1 == 7 && $2 == 3)) {
+ $test_target = "test_harness";
+ }
+
+ my $make = "make " . ($self->{j} ? "-j$self->{j}" : "");
+ my @install = $self->{notest} ? "make install" : ("make $test_target", "make install");
@install = join " && ", @install unless($self->{force});
my $cmd = join ";",
@@ -461,7 +484,8 @@
&& ($1 < 8 || $1 == 8 && $2 < 9)
? ("$^X -i -nle 'print unless /command-line/' makefile x2p/makefile")
: (),
- "make", @install
+ $make,
+ @install
);
$cmd = "($cmd) >> '$self->{log_file}' 2>&1 "
if ( $self->{quiet} && !$self->{verbose} );
@@ -657,7 +681,7 @@
my %env = $self->perlbrew_env($perl);
- if ($self->env('SHELL') =~ /(ba|z)sh$/) {
+ if ($self->env('SHELL') =~ /(ba|z|\/)sh$/) {
while (my ($k, $v) = each(%env)) {
print "export $k=$v\n";
}
@@ -753,6 +777,8 @@
1;
__END__
+
+=encoding utf8
=head1 NAME
@@ -872,11 +898,11 @@
=head1 PROJECT DEVELOPMENT
-perlbrew project uses PivotalTracker for task tracking:
-L<http://www.pivotaltracker.com/projects/129997>. You may also report
-bugs to github L<http://github.com/gugod/App-perlbrew/issues> or RT
-<https://rt.cpan.org/Dist/Display.html?Queue=App-perlbrew>. They will
-be definitely reviewed and handled.
+perlbrew project uses github
+L<http://github.com/gugod/App-perlbrew/issues> and RT
+<https://rt.cpan.org/Dist/Display.html?Queue=App-perlbrew> for issue
+tracking. Issues sent to these two systems will eventually be reviewed
+and handled.
=head1 AUTHOR
@@ -897,7 +923,7 @@
Tatsuhiko Miyagawa, Chris Prather, Yanick Champoux, aero, Jason May,
Jesse Leuhrs, Andrew Rodland, Justin Davis, Masayoshi Sekimura,
castaway, jrockway, chromatic, Goro Fuji, Sawyer X, Danijel Tasov,
-polettix, and tokuhirom.
+polettix, tokuhirom, Ævar Arnfjörð Bjarmason.
=head1 DISCLAIMER OF WARRANTY
More information about the Pkg-perl-cvs-commits
mailing list