Permalink
Browse files

Merge pull request #78 from retupmoca/master

s/EXECUTABLE_NAME/EXECUTABLE/ (for GH #73)
  • Loading branch information...
tadzik committed Apr 12, 2014
2 parents 2693bbc + 78bb1e0 commit abafd49eaa033893a93185a6cf803ad5b890e692
Showing with 6 additions and 6 deletions.
  1. +1 −1 bootstrap.pl
  2. +1 −1 lib/Panda/Builder.pm
  3. +1 −1 lib/Panda/Tester.pm
  4. +3 −3 rebootstrap.pl
View
@@ -44,7 +44,7 @@ BEGIN
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/JSON__Tiny/lib";
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/lib";
-shell "$*EXECUTABLE_NAME bin/panda install File::Find Shell::Command JSON::Tiny {cwd}";
+shell "$*EXECUTABLE bin/panda install File::Find Shell::Command JSON::Tiny {cwd}";
if "$destdir/panda/src".IO ~~ :d {
rm_rf "$destdir/panda/src"; # XXX This shouldn't be necessary, I think
# that src should not be kept at all, but
View
@@ -86,7 +86,7 @@ method build($where) {
# next;
#}
say "Compiling $file to {comptarget}";
- shell("$*EXECUTABLE_NAME --target={comptarget} "
+ shell("$*EXECUTABLE --target={comptarget} "
~ "--output=$dest $file")
or fail "Failed building $file";
}
View
@@ -5,7 +5,7 @@ method test($where, :$prove-command = 'prove') {
indir $where, {
if 't'.IO ~~ :d {
withp6lib {
- my $c = "$prove-command -e $*EXECUTABLE_NAME -r t/";
+ my $c = "$prove-command -e $*EXECUTABLE -r t/";
shell $c or fail "Tests failed";
}
}
View
@@ -19,7 +19,7 @@ BEGIN
if not $state-file.defined {
say "No need to rebootstrap, running normal bootstrap";
- shell "$*EXECUTABLE_NAME bootstrap.pl";
+ shell "$*EXECUTABLE bootstrap.pl";
exit 0;
}
@@ -44,9 +44,9 @@ BEGIN
# and reinstall all manually-installed modules
rm_rf "$prefix/lib";
rm_rf "$prefix/panda";
-shell "$*EXECUTABLE_NAME bootstrap.pl";
+shell "$*EXECUTABLE bootstrap.pl";
say "==> Reinstalling @modules[]";
-shell "$*EXECUTABLE_NAME bin/panda install @modules[]";
+shell "$*EXECUTABLE bin/panda install @modules[]";
# Save the backup state file back to $prefix/panda/
spurt "$state-file.bak", $old-state if $old-state;

0 comments on commit abafd49

Please sign in to comment.