Skip to content
Permalink
Browse files

Rename the perl comp repo to core

  • Loading branch information...
patzim committed Jun 12, 2019
1 parent 80dff59 commit 4d5b254e654d3ec07f90128c4e07314d70b95402
Showing with 13 additions and 13 deletions.
  1. +8 −8 src/core/CompUnit/RepositoryRegistry.pm6
  2. +5 −5 tools/build/install-core-dist.p6
@@ -109,7 +109,7 @@ class CompUnit::RepositoryRegistry {
# set up custom libs
my str $site = "inst#{$prefix}{$sep}site";
my str $vendor = "inst#{$prefix}{$sep}vendor";
my str $perl = "inst#{$prefix}{$sep}core";
my str $core = "inst#{$prefix}{$sep}core";

# your basic repo chain
my CompUnit::Repository $next-repo :=
@@ -140,10 +140,10 @@ class CompUnit::RepositoryRegistry {
}

unless $precomp-specs {
nqp::bindkey($custom-lib, 'perl', $next-repo := self!register-repository(
$perl,
nqp::bindkey($custom-lib, 'core', $next-repo := self!register-repository(
$core,
CompUnit::Repository::Installation.new(:prefix("$prefix/core"), :$next-repo)
)) unless nqp::existskey($unique, $perl);
)) unless nqp::existskey($unique, $core);
nqp::bindkey($custom-lib, 'vendor', $next-repo := self!register-repository(
$vendor,
CompUnit::Repository::Installation.new(:prefix("$prefix/vendor"), :$next-repo)
@@ -169,13 +169,13 @@ class CompUnit::RepositoryRegistry {
}

# register manually set custom-lib repos
unless nqp::existskey($custom-lib, 'perl') {
my $repo := nqp::atkey($repos, $perl);
unless nqp::existskey($custom-lib, 'core') {
my $repo := nqp::atkey($repos, $core);
if nqp::isnull($repo) {
nqp::deletekey($custom-lib, 'perl');
nqp::deletekey($custom-lib, 'core');
}
else {
nqp::bindkey($custom-lib, 'perl', $repo);
nqp::bindkey($custom-lib, 'core', $repo);
}
}
unless nqp::existskey($custom-lib, 'vendor') {
@@ -22,16 +22,16 @@ PROCESS::<$REPO> := CompUnit::Repository::Staging.new(
# Make CompUnit::Repository::Staging available to precomp processes
CompUnit::Repository::Installation.new(
:prefix(@*ARGS[0]),
:next-repo(CompUnit::RepositoryRegistry.repository-for-name('perl')),
:next-repo(CompUnit::RepositoryRegistry.repository-for-name('core')),
)
),
:name('perl'),
:name('core'),
);
$*REPO.install(
Distribution::Hash.new(
{
name => "CORE",
auth => "perl",
name => 'CORE',
auth => 'perl',
ver => $*PERL.version.Str,
provides => %provides,
},
@@ -50,7 +50,7 @@ my $source-file = $source.relative($*REPO.prefix);
$*REPO.precomp-repository.precompile(
$source,
CompUnit::PrecompilationId.new($source-id),
:source-name("perl#$source-file (CompUnit::Repository::Staging)"),
:source-name("core#$source-file (CompUnit::Repository::Staging)"),
:force,
);

0 comments on commit 4d5b254

Please sign in to comment.
You can’t perform that action at this time.