Skip to content
Permalink
Browse files

Make the JVM build and run again.

  • Loading branch information...
patzim committed Jan 30, 2019
1 parent 2c9c823 commit ab96f1a678a88ed57a61d937f60cc5319c1dda3b
Showing with 17 additions and 4 deletions.
  1. +9 −2 src/main.nqp
  2. +6 −0 src/perl6-debug.nqp
  3. +2 −2 tools/build/Makefile-JVM.in
@@ -4,13 +4,20 @@ use Perl6::Compiler;

# Determine Perl6 and NQP dirs.
my $sep := nqp::backendconfig()<osname> eq 'MSWin32' ?? '\\' !! '/';
#?if jvm
my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname');
my $exec-dir := nqp::substr($execname, 0, nqp::rindex($execname, $sep));
#?endif
#?if !jvm
my $exec-dir := nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
#?endif

my $perl6-home := nqp::getenvhash()<PERL6_HOME> // $exec-dir ~ '/../share/perl6';
if (nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep) {
if nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep {
$perl6-home := nqp::substr($perl6-home, 0, nqp::chars($perl6-home) - 1);
}
my $nqp-home := nqp::getenvhash()<NQP_HOME> // $exec-dir ~ '/../share/nqp';
if (nqp::substr($nqp-home, nqp::chars($nqp-home) - 1) eq $sep) {
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);
@@ -447,7 +447,13 @@ class Perl6::Debugger is Perl6::Compiler {
sub MAIN(*@ARGS) {
# Determine Perl6 and NQP dirs.
my $sep := nqp::backendconfig()<osname> eq 'MSWin32' ?? '\\' !! '/';
#?if jvm
my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname');
my $exec-dir := nqp::substr($execname, 0, nqp::rindex($execname, $sep));
#?endif
#?if !jvm
my $exec-dir := nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
#?endif
my $perl6-home := nqp::getenvhash()<PERL6_HOME> // $exec-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);
@@ -13,8 +13,8 @@ J_LIBPATH = @nqp::libdir@
NQP_JARS = @nqp_jars@
BLD_NQP_JARS = @bld_nqp_jars@

J_RUN_NQP_RR = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp .@cpsep@$(BLD_NQP_JARS)@cpsep@rakudo-runtime.jar@cpsep@$(SYSROOT)@nqp_classpath@ nqp
J_RUN_PERL6 = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp .@cpsep@$(BLD_NQP_JARS)@cpsep@rakudo-runtime.jar@cpsep@perl6.jar@cpsep@$(SYSROOT)@nqp_classpath@ perl6
J_RUN_NQP_RR = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp ./blib@cpsep@$(BLD_NQP_JARS)@cpsep@rakudo-runtime.jar@cpsep@$(SYSROOT)@nqp_classpath@ nqp
J_RUN_PERL6 = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp ./blib@cpsep@$(BLD_NQP_JARS)@cpsep@rakudo-runtime.jar@cpsep@perl6.jar@cpsep@$(SYSROOT)@nqp_classpath@ perl6

RUNTIME_JAVAS = src/vm/jvm/runtime/org/perl6/rakudo/*.java

0 comments on commit ab96f1a

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