Merge branch 'master' into offline-bootstrap

Conflicts: bootstrap.pl
tadzik · Jul 25, 2012 · b6104c9 · b6104c9
2 parents 2167d8b + 04b6755
commit b6104c9
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/bootstrap.pl b/bootstrap.pl
@@ -11,15 +11,23 @@
     .close;
 }
 
+my $oldenv  = %*ENV<PERL6LIB> // '';
+my $env_sep = $*VM<config><osname> eq 'MSWin32' ?? ';' !! ':';
+
+
 if %*ENV<DESTDIR> {
-    %*ENV<PERL6LIB> ~= ":{cwd}/{%*ENV<DESTDIR>}/lib"
+    %*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/{%*ENV<DESTDIR>}/lib"
 }
 
-%*ENV<PERL6LIB> ~= ":{cwd}/ext/File__Tools/lib";
-%*ENV<PERL6LIB> ~= ":{cwd}/ext/JSON__Tiny/lib";
-%*ENV<PERL6LIB> ~= ":{cwd}/ext/Test__Mock/lib";
-%*ENV<PERL6LIB> ~= ":{cwd}/lib";
+%*ENV<PERL6LIB> ~= "{$env_sep}{cwd}/ext/File__Tools/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 Test::Mock";
+
+%*ENV<PERL6LIB> = join $env_sep, $oldenv, cwd() ~ '/lib';
 
-shell "perl6 bin/panda install File::Tools JSON::Tiny Test::Mock .";
+shell "perl6 bin/panda install .";
 
 unlink "$home/.panda/projects.json";