Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix deps
  • Loading branch information
Tadeusz Sośnierz committed Aug 11, 2013
1 parent 059ae90 commit 55b85ce
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion META.info
Expand Up @@ -2,6 +2,6 @@
"name" : "panda",
"version" : "*",
"description" : "A module management solution",
"depends" : [ "File::Tools", "JSON::Tiny" ],
"depends" : [ "File::Find", "Shell::Command", "JSON::Tiny" ],
"source-url" : "git://github.com/tadzik/panda.git"
}
9 changes: 5 additions & 4 deletions bootstrap.pl
Expand Up @@ -4,7 +4,8 @@ BEGIN
shell 'git submodule init';
shell 'git submodule update';
}
use lib 'ext/File__Tools/lib/';
use lib 'ext/File__Find/lib/';
use lib 'ext/Shell__Command/lib/';
use Shell::Command;

say '==> Bootstrapping Panda';
Expand Down Expand Up @@ -38,12 +39,12 @@ BEGIN
my $env_sep = $is_win ?? ';' !! ':';

%*ENV<PERL6LIB> ~= "{$env_sep}$destdir/lib";
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/File__Tools/lib";
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/File__Find/lib";
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/Shell__Command/lib";
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/JSON__Tiny/lib";
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/Test__Mock/lib";
%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/lib";

shell "perl6 bin/panda install File::Tools JSON::Tiny {cwd}";
shell "perl6 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
Expand Down
14 changes: 11 additions & 3 deletions projects.json.bootstrap
@@ -1,12 +1,20 @@
[
{
"source-type" : "local",
"source-url" : "_BASEDIR_/File__Tools",
"source-url" : "_BASEDIR_/File__Find",
"version" : "*",
"name" : "File::Tools",
"description" : "Various modules for file operations",
"name" : "File::Find",
"description" : "Bla bla",
"depends" : []
},
{
"source-type" : "local",
"source-url" : "_BASEDIR_/Shell__Command",
"version" : "*",
"name" : "Shell::Command",
"description" : "Ble ble",
"depends" : ["File::Find"]
},
{
"source-type" : "local",
"source-url" : "_BASEDIR_/JSON__Tiny",
Expand Down
2 changes: 1 addition & 1 deletion rebootstrap.pl
Expand Up @@ -27,7 +27,7 @@
given open($state-file) {
for .lines() -> $line {
my ($name, $state) = split /\s/, $line;
next if $name eq any(<File::Tools JSON::Tiny Test::Mock panda>);
next if $name eq any(<File::Tools JSON::Tiny panda>);
if $state eq 'installed' {
@modules.push: $name;
}
Expand Down

0 comments on commit 55b85ce

Please sign in to comment.