SysConfig.nqp (rakudo-2020.08.2) | : | SysConfig.nqp (rakudo-2020.09) | ||
---|---|---|---|---|
class Perl6::SysConfig is HLL::SysConfig { | class Perl6::SysConfig is HLL::SysConfig { | |||
has %!rakudo-build-config; | has %!rakudo-build-config; | |||
has $!rakudo-home; | has $!rakudo-home; | |||
method BUILD() { | method new(%rakudo-build-config) { | |||
%!rakudo-build-config := nqp::hash(); | my $obj := nqp::create(self); | |||
$obj.BUILD(%rakudo-build-config); | ||||
$obj | ||||
} | ||||
method BUILD(%rakudo-build-config) { | ||||
self.build-hll-sysconfig(); | ||||
%!rakudo-build-config := %rakudo-build-config; | ||||
# Determine Rakudo home. | # Determine Rakudo home. | |||
#?if jvm | ||||
# TODO could be replaced by nqp::execname() after the next bootstrap for | ||||
JVM | ||||
my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname') // '' | ||||
; | ||||
#?endif | ||||
#?if !jvm | ||||
my $execname := nqp::execname(); | my $execname := nqp::execname(); | |||
#?endif | ||||
my $install-dir := $execname eq '' | my $install-dir := $execname eq '' | |||
?? %!rakudo-build-config<prefix> | ?? %!rakudo-build-config<prefix> | |||
!! nqp::substr($execname, 0, nqp::rindex($execname, self.path-sep, n qp::rindex($execname, self.path-sep) - 1)); | !! nqp::substr($execname, 0, nqp::rindex($execname, self.path-sep, n qp::rindex($execname, self.path-sep) - 1)); | |||
$!rakudo-home := nqp::getenvhash()<RAKUDO_HOME> | $!rakudo-home := nqp::getenvhash()<RAKUDO_HOME> | |||
// nqp::getenvhash()<PERL6_HOME> | // nqp::getenvhash()<PERL6_HOME> | |||
// %!rakudo-build-config<static-rakudo-home> | // %!rakudo-build-config<static-rakudo-home> | |||
|| $install-dir ~ '/share/perl6'; | || $install-dir ~ '/share/perl6'; | |||
if nqp::substr($!rakudo-home, nqp::chars($!rakudo-home) - 1) eq self.pat h-sep { | if nqp::substr($!rakudo-home, nqp::chars($!rakudo-home) - 1) eq self.pat h-sep { | |||
$!rakudo-home := nqp::substr($!rakudo-home, 0, nqp::chars($!rakudo-h ome) - 1); | $!rakudo-home := nqp::substr($!rakudo-home, 0, nqp::chars($!rakudo-h ome) - 1); | |||
End of changes. 3 change blocks. | ||||
10 lines changed or deleted | 10 lines changed or added |