Permalink
Browse files

Merge branch 'master' of github.com:tadzik/panda into eleven

  • Loading branch information...
2 parents 5e52ffd + d37c017 commit 35cc9029022eef8302e8f94da770820abd28e7b8 @FROGGS FROGGS committed Feb 28, 2014
Showing with 14 additions and 23 deletions.
  1. +1 −1 bin/panda-build
  2. +1 −1 bin/panda-fetch
  3. +1 −1 bin/panda-install
  4. +1 −1 bin/panda-test
  5. +1 −1 bin/redpanda
  6. +1 −1 lib/Panda.pm
  7. +5 −16 lib/Panda/Common.pm
  8. +3 −1 lib/Panda/Fetcher.pm
View
@@ -2,5 +2,5 @@
use Panda::Builder;
sub MAIN($where = '.') {
- Panda::Builder.build($where);
+ Panda::Builder.build($where.path.absolute);
}
View
@@ -6,5 +6,5 @@ sub MAIN($from, $to? is copy) {
note "Fetching to ./work";
$to = 'work';
}
- Panda::Fetcher.fetch($from, $to);
+ Panda::Fetcher.fetch($from.path.absolute, $to.path.absolute);
}
View
@@ -2,5 +2,5 @@
use Panda::Installer;
sub MAIN($from = '.', $to?) {
- Panda::Installer.new.install($from, $to);
+ Panda::Installer.new.install($from.path.absolute, $to);
}
View
@@ -2,5 +2,5 @@
use Panda::Tester;
sub MAIN($where = '.') {
- Panda::Tester.test($where);
+ Panda::Tester.test($where.path.absolute);
}
View
@@ -27,7 +27,7 @@ sub get-meta($module is copy) {
}
sub MAIN($url) {
- my $dir = '.work';
+ my $dir = '.work'.path.absolute;
rm_rf $dir;
try {
Panda::Fetcher::fetch($url, $dir);
View
@@ -9,7 +9,7 @@ use JSON::Tiny;
sub tmpdir {
state $i = 0;
- ".work/{time}_{$i++}"
+ ".work/{time}_{$i++}".path.absolute
}
class Panda {
View
@@ -5,9 +5,9 @@ sub dirname ($mod as Str) is export {
$mod.subst(':', '_', :g);
}
-sub indir (Str $where, Callable $what) is export {
+sub indir ($where, Callable $what) is export {
mkpath $where;
- temp $*CWD = IO::Spec.rel2abs($where);
+ temp $*CWD = $where.path.absolute;
$what()
}
@@ -30,20 +30,9 @@ sub withp6lib(&what) is export {
}
sub compsuffix is export {
- given $*VM<name> {
- when 'parrot' {
- return 'pir';
- }
- when 'jvm' {
- return 'jar';
- }
- when 'moar' {
- return 'moarvm';
- }
- default {
- die($_ ~ ' is an unsupported backend VM.');
- }
- }
+ $*VM<name> eq 'moar'
+ ?? 'moarvm'
+ !! comptarget
}
sub comptarget is export {
View
@@ -24,7 +24,9 @@ sub git-fetch($from, $to) {
}
sub local-fetch($from, $to) {
- for find(dir => $from).list {
+ # We need to eagerify this, as we'll sometimes
+ # copy files to a subdirectory of $from
+ for eager find(dir => $from).list {
my $d = IO::Spec.catpath($_.volume, $_.directory, '');
# We need to cleanup the path, because the returned elems are too.
my $cleanup = $from.IO.path.cleanup;

0 comments on commit 35cc902

Please sign in to comment.