Skip to content

Commit

Permalink
Merge pull request #3321 from patzim/perl6-to-rakudo-home
Browse files Browse the repository at this point in the history 
Rename PERL6_HOME to RAKUDO_HOME
  • Loading branch information
@patrickbkr
patrickbkr committed Dec 1, 2019
2 parents 55b3ed5 + 7cfdd59 commit ab2ba1a
Show file tree
Hide file tree
Showing 18 changed files with 104 additions and 93 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/nqp-configure
Submodule nqp-configure updated from ff0bad to 03b093
2 changes: 1 addition & 1 deletion Configure.pl
View file
Expand Up @@ -64,7 +64,7 @@ BEGIN

GetOptions(
$cfg->options, 'help!',
'prefix=s', 'perl6-home|rakudo-home=s',
'prefix=s', 'rakudo-home|perl6-home=s',
'nqp-home=s', 'sysroot=s',
'sdkroot=s', 'relocatable!',
'backends=s', 'no-clean',
Expand Down
3 changes: 2 additions & 1 deletion src/Perl6/Compiler.nqp
View file
Expand Up @@ -174,7 +174,8 @@ Note that only boolean single-letter options may be bundled.
The following environment variables are respected:
PERL6LIB Modify the module search path
PERL6_HOME Override the path of the Perl6 runtime files
RAKUDO_HOME Override the path of the Raku runtime files
PERL6_HOME Override the path of the Raku runtime files
NQP_HOME Override the path of the NQP runtime files
♥); # end of usage statement
Expand Down
2 changes: 1 addition & 1 deletion src/core.c/CompUnit/RepositoryRegistry.pm6
View file
Expand Up @@ -88,7 +88,7 @@ class CompUnit::RepositoryRegistry {

my str $prefix = nqp::existskey($ENV,'RAKUDO_PREFIX')
?? nqp::atkey($ENV,'RAKUDO_PREFIX')
!! nqp::getcurhllsym('$PERL6_HOME');
!! nqp::getcurhllsym('$RAKUDO_HOME');

# XXX Various issues with this stuff on JVM , TEMPORARY
my str $home;
Expand Down
10 changes: 5 additions & 5 deletions src/main.nqp
View file
Expand Up @@ -31,12 +31,12 @@ my $install-dir := $execname eq ''
?? $comp.config<prefix>
!! nqp::substr($execname, 0, nqp::rindex($execname, $sep, nqp::rindex($execname, $sep) - 1));

my $perl6-home := $comp.config<static_perl6_home>
my $rakudo-home := $comp.config<static_rakudo_home>
// nqp::getenvhash()<PERL6_HOME>
// nqp::getenvhash<RAKUDO_HOME>
// nqp::getenvhash()<RAKUDO_HOME>
// $install-dir ~ '/share/perl6';
if nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep {
$perl6-home := nqp::substr($perl6-home, 0, nqp::chars($perl6-home) - 1);
if nqp::substr($rakudo-home, nqp::chars($rakudo-home) - 1) eq $sep {
$rakudo-home := nqp::substr($rakudo-home, 0, nqp::chars($rakudo-home) - 1);
}

my $nqp-home := $comp.config<static_nqp_home>
Expand All @@ -46,7 +46,7 @@ if nqp::substr($nqp-home, nqp::chars($nqp-home) - 1) eq $sep {
$nqp-home := nqp::substr($nqp-home, 0, nqp::chars($nqp-home) - 1);
}

nqp::bindhllsym('perl6', '$PERL6_HOME', $perl6-home);
nqp::bindhllsym('perl6', '$RAKUDO_HOME', $rakudo-home);
nqp::bindhllsym('perl6', '$NQP_HOME', $nqp-home);


Expand Down
10 changes: 5 additions & 5 deletions src/perl6-debug.nqp
View file
Expand Up @@ -479,12 +479,12 @@ sub MAIN(*@ARGS) {
?? $comp.config<prefix>
!! nqp::substr($execname, 0, nqp::rindex($execname, $sep, nqp::rindex($execname, $sep) - 1));

my $perl6-home := $comp.config<static_perl6_home>
my $rakudo-home := $comp.config<static_rakudo_home>
// nqp::getenvhash()<PERL6_HOME>
// nqp::getenvhash<RAKUDO_HOME>
// nqp::getenvhash()<RAKUDO_HOME>
// $install-dir ~ '/share/perl6';
if nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep {
$perl6-home := nqp::substr($perl6-home, 0, nqp::chars($perl6-home) - 1);
if nqp::substr($rakudo-home, nqp::chars($rakudo-home) - 1) eq $sep {
$rakudo-home := nqp::substr($rakudo-home, 0, nqp::chars($rakudo-home) - 1);
}

my $nqp-home := $comp.config<static_nqp_home>
Expand All @@ -494,7 +494,7 @@ sub MAIN(*@ARGS) {
$nqp-home := nqp::substr($nqp-home, 0, nqp::chars($nqp-home) - 1);
}

nqp::bindhllsym('perl6', '$PERL6_HOME', $perl6-home);
nqp::bindhllsym('perl6', '$RAKUDO_HOME', $rakudo-home);
nqp::bindhllsym('perl6', '$NQP_HOME', $nqp-home);


Expand Down
2 changes: 1 addition & 1 deletion src/vm/moar/ModuleLoaderVMConfig.nqp
View file
@@ -1,7 +1,7 @@
role Perl6::ModuleLoaderVMConfig {
method vm_search_paths() {
my @search_paths;
@search_paths.push(nqp::getcurhllsym('$PERL6_HOME') ~ '/lib');
@search_paths.push(nqp::getcurhllsym('$RAKUDO_HOME') ~ '/lib');
# XXX CHEAT: Goes away when we implement :from<nqp>.
@search_paths.push(nqp::getcurhllsym('$NQP_HOME') ~ '/lib');
@search_paths
Expand Down
61 changes: 35 additions & 26 deletions src/vm/moar/runner/main.c
View file
Expand Up @@ -161,8 +161,8 @@ int wmain(int argc, wchar_t *wargv[])
const char nqp_check_path[28] = "/lib/NQPCORE.setting.moarvm";
const size_t nqp_check_path_size = 27;

char *perl6_home;
size_t perl6_home_size;
char *rakudo_home;
size_t rakudo_home_size;
const char perl6_rel_path[16] = "/../share/perl6";
const size_t perl6_rel_path_size = 15;
const char perl6_check_path[22] = "/runtime/perl6.moarvm";
Expand Down Expand Up @@ -286,7 +286,7 @@ int wmain(int argc, wchar_t *wargv[])
exec_dir_path_size = strlen(exec_dir_path);
#endif

/* Retrieve PERL6_HOME and NQP_HOME. */
/* Retrieve RAKUDO_HOME and NQP_HOME. */

#ifdef STATIC_NQP_HOME
nqp_home = STRINGIFY(STATIC_NQP_HOME);
Expand All @@ -299,46 +299,55 @@ int wmain(int argc, wchar_t *wargv[])
#endif
nqp_home_size = strlen(nqp_home);

#ifdef STATIC_PERL6_HOME
perl6_home = STRINGIFY(STATIC_PERL6_HOME);
#ifdef STATIC_RAKUDO_HOME
rakudo_home = STRINGIFY(STATIC_RAKUDO_HOME);
#else
if (!retrieve_home(&perl6_home, perl6_rel_path, perl6_rel_path_size, "PERL6_HOME",
exec_dir_path, exec_dir_path_size, perl6_check_path, perl6_check_path_size)) {
fprintf(stderr, "ERROR: PERL6_HOME is invalid: %s\n", perl6_home);
return EXIT_FAILURE;
if (getenv("PERL6_HOME")) {
if (!retrieve_home(&rakudo_home, perl6_rel_path, perl6_rel_path_size, "PERL6_HOME",
exec_dir_path, exec_dir_path_size, perl6_check_path, perl6_check_path_size)) {
fprintf(stderr, "ERROR: PERL6_HOME is invalid: %s\n", rakudo_home);
return EXIT_FAILURE;
}
}
else {
if (!retrieve_home(&rakudo_home, perl6_rel_path, perl6_rel_path_size, "RAKUDO_HOME",
exec_dir_path, exec_dir_path_size, perl6_check_path, perl6_check_path_size)) {
fprintf(stderr, "ERROR: RAKUDO_HOME is invalid: %s\n", rakudo_home);
return EXIT_FAILURE;
}
}
#endif
perl6_home_size = strlen(perl6_home);
rakudo_home_size = strlen(rakudo_home);

/* Put together the lib paths and perl6_file path. */

lib_path[0] = (char*)malloc(nqp_home_size + 50);
lib_path[1] = (char*)malloc(perl6_home_size + 50);
lib_path[2] = (char*)malloc(perl6_home_size + 50);
perl6_file = (char*)malloc(perl6_home_size + 50);
lib_path[1] = (char*)malloc(rakudo_home_size + 50);
lib_path[2] = (char*)malloc(rakudo_home_size + 50);
perl6_file = (char*)malloc(rakudo_home_size + 50);

memcpy(lib_path[0], nqp_home, nqp_home_size);
memcpy(lib_path[1], perl6_home, perl6_home_size);
memcpy(lib_path[2], perl6_home, perl6_home_size);
memcpy(perl6_file, perl6_home, perl6_home_size);
memcpy(lib_path[1], rakudo_home, rakudo_home_size);
memcpy(lib_path[2], rakudo_home, rakudo_home_size);
memcpy(perl6_file, rakudo_home, rakudo_home_size);

#ifdef _WIN32
strcpy(lib_path[0] + nqp_home_size, "\\lib");
strcpy(lib_path[1] + perl6_home_size, "\\lib");
strcpy(lib_path[2] + perl6_home_size, "\\runtime");
strcpy(lib_path[1] + rakudo_home_size, "\\lib");
strcpy(lib_path[2] + rakudo_home_size, "\\runtime");
#ifdef MOAR_PERL6_RUNNER_DEBUG
strcpy(perl6_file + perl6_home_size, "\\runtime\\perl6-debug.moarvm");
strcpy(perl6_file + rakudo_home_size, "\\runtime\\perl6-debug.moarvm");
#else
strcpy(perl6_file + perl6_home_size, "\\runtime\\perl6.moarvm");
strcpy(perl6_file + rakudo_home_size, "\\runtime\\perl6.moarvm");
#endif
#else
strcpy(lib_path[0] + nqp_home_size, "/lib");
strcpy(lib_path[1] + perl6_home_size, "/lib");
strcpy(lib_path[2] + perl6_home_size, "/runtime");
strcpy(lib_path[1] + rakudo_home_size, "/lib");
strcpy(lib_path[2] + rakudo_home_size, "/runtime");
#ifdef MOAR_PERL6_RUNNER_DEBUG
strcpy(perl6_file + perl6_home_size, "/runtime/perl6-debug.moarvm");
strcpy(perl6_file + rakudo_home_size, "/runtime/perl6-debug.moarvm");
#else
strcpy(perl6_file + perl6_home_size, "/runtime/perl6.moarvm");
strcpy(perl6_file + rakudo_home_size, "/runtime/perl6.moarvm");
#endif
#endif

Expand Down Expand Up @@ -389,8 +398,8 @@ int wmain(int argc, wchar_t *wargv[])
free(exec_dir_path);
#endif
free(exec_dir_path_temp);
#ifndef STATIC_PERL6_HOME
free(perl6_home);
#ifndef STATIC_RAKUDO_HOME
free(rakudo_home);
#endif
#ifndef STATIC_NQP_HOME
free(nqp_home);
Expand Down
14 changes: 7 additions & 7 deletions tools/build/create-jvm-runner.pl
View file
Expand Up @@ -7,9 +7,9 @@
use File::Spec;
use File::Copy 'cp';

my $USAGE = "Usage: $0 <type> <destdir> <prefix> <nqp-home> <perl6-home> <blib> <third party jars>\n";
my $USAGE = "Usage: $0 <type> <destdir> <prefix> <nqp-home> <rakudo-home> <blib> <third party jars>\n";

my ($type, $destdir, $prefix, $nqp_home, $perl6_home, $blib, $thirdpartyjars) = @ARGV
my ($type, $destdir, $prefix, $nqp_home, $rakudo_home, $blib, $thirdpartyjars) = @ARGV
or die $USAGE;

my $debugger = 0;
Expand All @@ -26,10 +26,10 @@
my $nqplibdir = $^O eq 'MSWin32' ? File::Spec->catfile($nqp_home, 'lib') : File::Spec->catfile('${NQP_HOME}', 'lib');
my $nqpjars = $^O eq 'MSWin32' ? $thirdpartyjars : join( $cpsep, map { $_ =~ s,$nqp_home,\${NQP_HOME},g; $_ } split($cpsep, $thirdpartyjars) );
my $bindir = $type eq 'install' ? File::Spec->catfile($prefix, 'bin') : $prefix;
my $jardir = $type eq 'install' ? File::Spec->catfile($^O eq 'MSWin32' ? $perl6_home : '${PERL6_HOME}', 'runtime') : $prefix;
my $libdir = $type eq 'install' ? File::Spec->catfile($^O eq 'MSWin32' ? $perl6_home : '${PERL6_HOME}', 'lib') : 'blib';
my $jardir = $type eq 'install' ? File::Spec->catfile($^O eq 'MSWin32' ? $rakudo_home : '${RAKUDO_HOME}', 'runtime') : $prefix;
my $libdir = $type eq 'install' ? File::Spec->catfile($^O eq 'MSWin32' ? $rakudo_home : '${RAKUDO_HOME}', 'lib') : 'blib';
my $sharedir = File::Spec->catfile(
($type eq 'install' && $^O ne 'MSWin32' ? '${PERL6_HOME}' : File::Spec->catfile($prefix, 'share', 'perl6') ),
($type eq 'install' && $^O ne 'MSWin32' ? '${RAKUDO_HOME}' : File::Spec->catfile($prefix, 'share', 'perl6') ),
'site', 'lib');
my $perl6jars = join( $cpsep,
$^O eq 'MSWin32' ? $nqpjars : '${NQP_JARS}',
Expand Down Expand Up @@ -78,13 +78,13 @@
$type eq 'install'
? $preamble_unix . ": \${NQP_HOME=\"\$DIR/../share/nqp\"}
: \${NQP_JARS:=\"$nqpjars\"}
: \${PERL6_HOME:=\"\$DIR/../share/perl6\"}
: \${RAKUDO_HOME:=\"\$DIR/../share/perl6\"}
: \${PERL6_JARS:=\"$perl6jars\"}
exec "
: $preamble_unix . "$NQP_LIB
: \${NQP_HOME:=\"$nqp_home\"}
: \${NQP_JARS:=\"$nqpjars\"}
: \${PERL6_HOME:=\"$prefix\"}
: \${RAKUDO_HOME:=\"$prefix\"}
: \${PERL6_JARS:=\"$perl6jars\"}
exec ";
my $postamble = $^O eq 'MSWin32' ? ' %*' : ' "$@"';
Expand Down
22 changes: 11 additions & 11 deletions tools/lib/NQP/Config/Rakudo.pm
View file
Expand Up @@ -154,9 +154,9 @@ sub configure_refine_vars {

$self->SUPER::configure_refine_vars(@_);

$config->{perl6_home} = $self->nfp(
$config->{rakudo_home} = $self->nfp(
File::Spec->rel2abs(
$config->{perl6_home}
$config->{rakudo_home}
|| File::Spec->catdir( $config->{'prefix'}, 'share', 'perl6' )
)
);
Expand Down Expand Up @@ -343,24 +343,24 @@ sub configure_moar_backend {
}

if ( $config->{relocatable} eq 'reloc' ) {
$nqp_config->{static_nqp_home} = '';
$nqp_config->{static_perl6_home} = '';
$nqp_config->{static_nqp_home_define} = '';
$nqp_config->{static_perl6_home_define} = '';
$nqp_config->{static_nqp_home} = '';
$nqp_config->{static_rakudo_home} = '';
$nqp_config->{static_nqp_home_define} = '';
$nqp_config->{static_rakudo_home_define} = '';
}
else {
my $qchar = $config->{quote};
$nqp_config->{static_nqp_home} = $nqp_config->{'nqp::nqp_home'};
$nqp_config->{static_perl6_home} = $config->{perl6_home};
$nqp_config->{static_nqp_home} = $nqp_config->{'nqp::nqp_home'};
$nqp_config->{static_rakudo_home} = $config->{rakudo_home};
$nqp_config->{static_nqp_home_define} =
'-DSTATIC_NQP_HOME='
. $qchar
. $self->c_escape_string( $nqp_config->{static_nqp_home} )
. $qchar;
$nqp_config->{static_perl6_home_define} =
'-DSTATIC_PERL6_HOME='
$nqp_config->{static_rakudo_home_define} =
'-DSTATIC_RAKUDO_HOME='
. $qchar
. $self->c_escape_string( $nqp_config->{static_perl6_home} )
. $self->c_escape_string( $nqp_config->{static_rakudo_home} )
. $qchar;
}

Expand Down
26 changes: 13 additions & 13 deletions tools/templates/Makefile-backend-common.in
View file
Expand Up @@ -20,7 +20,7 @@
@make_pp_pfx@ifndef @bpv(RUNNER_SUFFIX)@
@bpv(RUNNER_SUFFIX)@ = @runner_suffix@
@make_pp_pfx@endif
@bpv(LIBDIR)@ = @nfp($(PERL6_HOME)/lib)@
@bpv(LIBDIR)@ = @nfp($(RAKUDO_HOME)/lib)@
@bpv(NQP_HOME)@ = @nfp(@nqp::nqp_home@)@

# files we create
Expand Down Expand Up @@ -202,31 +202,31 @@ check_@backend_abbr@_nqp_version: @@script(check-nqp-version.pl)@@
@backend_prefix@-install-dirs::
@echo(+++ Creating installation directories)@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(PREFIX)/bin)@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME))@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(RAKUDO_HOME))@
$(NOECHO)$(MKPATH) @nfpq(@nop($(DESTDIR))@@bpm(LIBDIR)@)@
$(NOECHO)$(MKPATH) @nfpq(@nop($(DESTDIR))@@bpm(LIBDIR)@/Perl6)@
$(NOECHO)$(MKPATH) @nfpq(@nop($(DESTDIR))@@bpm(LIBDIR)@/Perl6/BOOTSTRAP)@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME)/vendor)@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME)/site)@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(RAKUDO_HOME)/vendor)@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(RAKUDO_HOME)/site)@
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(RAKUDO_HOME)/runtime)@

@backend_prefix@-install-pre:: @backend_prefix@-install-dirs

@backend_prefix@-install-main::@for_specs( @bsm(SETTING_@ucspec@)@)@ @bpm(PERL6_PRECOMPS)@ @bpm(PERL6_BOOTSTRAP_PRECOMPS)@ @@bsm(PERL6)@@ @@bsm(PERL6_DEBUG)@@ @backend_prefix@-install-pre
@echo(+++ Installing files)@
$(NOECHO)$(CP) @bpm(PERL6_PRECOMPS)@ @nfpq(@nop($(DESTDIR))@@bpm(LIBDIR)@/Perl6)@
$(NOECHO)$(CP) @bpm(PERL6_BOOTSTRAP_PRECOMPS)@ @nop($(DESTDIR))@@nfpq(@bpm(LIBDIR)@/Perl6/BOOTSTRAP)@
$(NOECHO)$(CP) @for_specs(@bsm(SETTING_@ucspec@)@ )@ @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(NOECHO)$(CP) @bsm(PERL6)@ @bsm(PERL6_DEBUG)@ @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(NOECHO)$(CP) @bsm(PERL6)@ @nfpq($(DESTDIR)$(PERL6_HOME)/runtime/@bsm(RAKUDO)@)@
$(NOECHO)$(CP) @bsm(PERL6_DEBUG)@ @nfpq($(DESTDIR)$(PERL6_HOME)/runtime/@bsm(RAKUDO_DEBUG)@)@
$(NOECHO)$(CP) @for_specs(@bsm(SETTING_@ucspec@)@ )@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/runtime)@
$(NOECHO)$(CP) @bsm(PERL6)@ @bsm(PERL6_DEBUG)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/runtime)@
$(NOECHO)$(CP) @bsm(PERL6)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/runtime/@bsm(RAKUDO)@)@
$(NOECHO)$(CP) @bsm(PERL6_DEBUG)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/runtime/@bsm(RAKUDO_DEBUG)@)@

@backend_prefix@-install-post:: @@script(install-core-dist.p6)@@
@echo(+++ Preparing installation)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.p6)@)@ @nfpq($(DESTDIR)$(PERL6_HOME)/core)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.p6)@)@ @nfpq($(DESTDIR)$(PERL6_HOME)/vendor)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.p6)@)@ @nfpq($(DESTDIR)$(PERL6_HOME)/site)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(install-core-dist.p6)@)@ @nfpq($(DESTDIR)$(PERL6_HOME)/core)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.p6)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/core)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.p6)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/vendor)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.p6)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/site)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(install-core-dist.p6)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/core)@

@backend_prefix@-install:: @backend_prefix@-all @backend_prefix@-install-pre @backend_prefix@-install-main @backend_prefix@-install-post
@echo(+++ @uc(@backend@)@ BACKEND INSTALLED)@
10 changes: 5 additions & 5 deletions tools/templates/Makefile-common-macros.in
View file
Expand Up @@ -21,11 +21,11 @@ RM_RF = @rm_rf@
TEST_F = @test_f@
@shell@

SYSROOT = @nfp(@sysroot@)@
SDKROOT = @nfp(@sdkroot@)@
PREFIX = @nfp(@prefix@)@
PERL6_HOME = @nfp(@perl6_home@)@
BASE_DIR = @base_dir@
SYSROOT = @nfp(@sysroot@)@
SDKROOT = @nfp(@sdkroot@)@
PREFIX = @nfp(@prefix@)@
RAKUDO_HOME = @nfp(@rakudo_home@)@
BASE_DIR = @base_dir@

BOOTSTRAP_SOURCES = \
@nfp(src/Perl6/Metamodel/BOOTSTRAP.nqp)@ \
Expand Down
8 changes: 4 additions & 4 deletions tools/templates/jvm/Makefile.in
View file
Expand Up @@ -45,7 +45,7 @@ $(RUNTIME_JAR): $(RUNTIME_JAVAS)

$(J_RUNNER): @@script(create-jvm-runner.pl)@@
@echo(+++ Setting up $@)@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev . . @q(@bpm(NQP_HOME)@)@ @q($(PERL6_HOME))@ --nqp-lib=blib @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev . . @q(@bpm(NQP_HOME)@)@ @q($(RAKUDO_HOME))@ --nqp-lib=blib @q($(NQP_JARS))@

@backend_prefix@-runner-default: @backend_prefix@-all
@echo(+++ Setting up @uc(@backend@)@ runner)@
Expand All @@ -54,7 +54,7 @@ $(J_RUNNER): @@script(create-jvm-runner.pl)@@

@bpm(DEBUG_RUNNER)@: @@script(create-jvm-runner.pl)@@ @bsm(PERL6_DEBUG)@
@echo(+++ Setting up $@)@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev-debug . . @q(@bpm(NQP_HOME)@)@ @q($(PERL6_HOME))@ --nqp-lib=blib @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev-debug . . @q(@bpm(NQP_HOME)@)@ @q($(RAKUDO_HOME))@ --nqp-lib=blib @q($(NQP_JARS))@

eval-client.pl:
@echo(+++ Setting up $@)@
Expand Down Expand Up @@ -84,12 +84,12 @@ sometests: @backend_prefix@-all

@backend_prefix@-runner-default-install: @backend_prefix@-install
@echo(+++ Installing @uc(@backend@)@ launcher)@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q(@bpm(NQP_HOME)@)@ @q($(PERL6_HOME))@ "" @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q(@bpm(NQP_HOME)@)@ @q($(RAKUDO_HOME))@ "" @q($(NQP_JARS))@
$(NOECHO)$(CP) @nfpq($(DESTDIR)$(PREFIX)/bin/perl6-j$(J_BAT))@ @nfpq($(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT))@
$(NOECHO)$(CHMOD) 755 @nfpq($(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT))@

@backend_prefix@-install-main:: $(RUNTIME_JAR) @@script(create-jvm-runner.pl)@@
$(NOECHO)$(CP) $(RUNTIME_JAR) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(NOECHO)$(CP) $(RUNTIME_JAR) @nfpq($(DESTDIR)$(RAKUDO_HOME)/runtime)@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q(@bpm(NQP_HOME)@)@ @q($(NQP_PREFIX))@ "" @q($(NQP_JARS))@
$(NOECHO)$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install-debug @q($(DESTDIR))@ @q($(PREFIX))@ @q(@bpm(NQP_HOME)@)@ @q($(NQP_PREFIX))@ "" @q($(NQP_JARS))@

Expand Down
2 changes: 1 addition & 1 deletion tools/templates/main-version.in
View file
Expand Up @@ -35,7 +35,7 @@ sub hll-config($config) {
);
$config<prefix> := '@prefix@';
$config<nqp-home> := '@nqp_home@';
$config<perl6-home> := '@perl6_home@';
$config<rakudo-home> := '@rakudo_home@';
$config<source-digest> := '@source_digest()@';
}

0 comments on commit ab2ba1a

Please sign in to comment.