Skip to content
Permalink
Browse files

More fixes for whitespaces support

  • Loading branch information...
vrurg committed May 4, 2019
1 parent e506c8c commit 16ccbeb003dcef0d5f0f911b990f6e93aa63e8cb
Showing with 130 additions and 97 deletions.
  1. +1 −1 3rdparty/nqp-configure
  2. +68 −36 tools/build/create-jvm-runner.pl
  3. +1 −1 tools/lib/NQP/Config/Rakudo.pm
  4. +60 −59 tools/templates/jvm/Makefile.in
@@ -7,36 +7,54 @@
use File::Spec;
use File::Copy 'cp';

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

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

my $debugger = 0;
if ($type =~ /^(\w+)\-debug$/) {
$type = $1;
if ( $type =~ /^(\w+)\-debug$/ ) {
$type = $1;
$debugger = 1;
}

die "Invalid target type $type" unless $type eq 'dev' || $type eq 'install';

my $cpsep = $^O eq 'MSWin32' ? ';' : ':';
my $cpsep = $^O eq 'MSWin32' ? ';' : ':';
my $bat = $^O eq 'MSWin32' ? '.bat' : '';

my $nqpdir = File::Spec->catfile($nqpprefix, 'share', 'nqp');
my $nqplibdir = $^O eq 'MSWin32' ? File::Spec->catfile($nqpdir, 'lib') : File::Spec->catfile('${NQP_DIR}', 'lib');
my $nqpjars = $^O eq 'MSWin32' ? $thirdpartyjars : join( $cpsep, map { $_ =~ s,$nqpdir,\${NQP_DIR},g; $_ } split($cpsep, $thirdpartyjars) );
my $bindir = $type eq 'install' ? File::Spec->catfile($prefix, 'bin') : $prefix;
my $perl6dir = $type eq 'install' ? File::Spec->catfile($prefix, 'share', 'perl6') : $prefix;
my $jardir = $type eq 'install' ? File::Spec->catfile($^O eq 'MSWin32' ? $perl6dir : '${PERL6_DIR}', 'runtime') : $prefix;
my $libdir = $type eq 'install' ? File::Spec->catfile($^O eq 'MSWin32' ? $perl6dir : '${PERL6_DIR}', 'lib') : 'blib';
my $nqpdir = File::Spec->catfile( $nqpprefix, 'share', 'nqp' );
my $nqplibdir =
$^O eq 'MSWin32'
? File::Spec->catfile( $nqpdir, 'lib' )
: File::Spec->catfile( '${NQP_DIR}', 'lib' );
my $nqpjars = $^O eq 'MSWin32' ? $thirdpartyjars : join( $cpsep,
map { $_ =~ s,$nqpdir,\${NQP_DIR},g; $_ }
split( $cpsep, $thirdpartyjars ) );
my $bindir =
$type eq 'install' ? File::Spec->catfile( $prefix, 'bin' ) : $prefix;
my $perl6dir =
$type eq 'install'
? File::Spec->catfile( $prefix, 'share', 'perl6' )
: $prefix;
my $jardir =
$type eq 'install'
? File::Spec->catfile( $^O eq 'MSWin32' ? $perl6dir : '${PERL6_DIR}',
'runtime' )
: $prefix;
my $libdir =
$type eq 'install'
? File::Spec->catfile( $^O eq 'MSWin32' ? $perl6dir : '${PERL6_DIR}', 'lib' )
: 'blib';
my $sharedir = File::Spec->catfile(
($type eq 'install' && $^O ne 'MSWin32' ? '$DIR/..' : $prefix),
'share', 'perl6', 'site', 'lib');
( $type eq 'install' && $^O ne 'MSWin32' ? '$DIR/..' : $prefix ),
'share', 'perl6', 'site', 'lib' );
my $perl6jars = join( $cpsep,
$^O eq 'MSWin32' ? $nqpjars : '${NQP_JARS}',
File::Spec->catfile($jardir, 'rakudo-runtime.jar'),
File::Spec->catfile($jardir, $debugger ? 'perl6-debug.jar' : 'perl6.jar'));
File::Spec->catfile( $jardir, 'rakudo-runtime.jar' ),
File::Spec->catfile( $jardir, $debugger ? 'perl6-debug.jar' : 'perl6.jar' )
);

my $NQP_LIB = $blib ? ': ${NQP_LIB:="blib"}' : '';

@@ -80,23 +98,27 @@
: \${PERL6_JARS:=\"$perl6jars\"}
exec ";

my $preamble = $^O eq 'MSWin32' ? '@' :
$type eq 'install' ? $preamble_reloc :
"#!/bin/sh
my $preamble =
$^O eq 'MSWin32' ? '@'
: (
$type eq 'install' ? $preamble_reloc
: "#!/bin/sh
$NQP_LIB
: \${NQP_DIR:=\"$nqpdir\"}
: \${NQP_JARS:=\"$nqpjars\"}
: \${PERL6_DIR:=\"$perl6dir\"}
: \${PERL6_JARS:=\"$perl6jars\"}
exec ";
exec "
);
my $postamble = $^O eq 'MSWin32' ? ' %*' : ' "$@"';

sub install {
my ($name, $command) = @_;
my ( $name, $command ) = @_;

my $install_to = $destdir
? File::Spec->catfile($destdir, $bindir, "$name$bat")
: File::Spec->catfile($bindir, "$name$bat");
my $install_to =
$destdir
? File::Spec->catfile( $destdir, $bindir, "$name$bat" )
: File::Spec->catfile( $bindir, "$name$bat" );

print "Creating '$install_to'\n";
open my $fh, ">", $install_to or die "open: $!";
@@ -106,21 +128,31 @@ sub install {
chmod 0755, $install_to if $^O ne 'MSWin32';
}

my $classpath = join($cpsep, ($perl6jars, $jardir, $libdir, $nqplibdir));
my $jopts = '-noverify -Xms100m'
. ' -cp ' . ($^O eq 'MSWin32' ? '"%CLASSPATH%";' : '$CLASSPATH:') . $classpath
. ' -Dperl6.prefix=' . ($type eq 'install' && $^O ne 'MSWin32' ? '$DIR/..' : $prefix)
. ' -Djna.library.path=' . $sharedir
. ($^O eq 'MSWin32' ? ' -Dperl6.execname="%~dpf0"' : ' -Dperl6.execname="$0"');
my $jdbopts = '-Xdebug -Xrunjdwp:transport=dt_socket,address='
. ($^O eq 'MSWin32' ? '8000' : '${RAKUDO_JDB_PORT:=8000}')
. ',server=y,suspend=y';
my $classpath = join( $cpsep, ( $perl6jars, $jardir, $libdir, $nqplibdir ) );
my $jopts =
'-noverify -Xms100m' . ' -cp '
. ( $^O eq 'MSWin32' ? '"%CLASSPATH%";' : '"$CLASSPATH":' )
. $classpath
. ' -Dperl6.prefix='
. ( $type eq 'install' && $^O ne 'MSWin32' ? '$DIR/..' : $prefix )
. ' -Djna.library.path='
. $sharedir
. (
$^O eq 'MSWin32'
? ' -Dperl6.execname="%~dpf0"'
: ' -Dperl6.execname="$0"'
);
my $jdbopts =
'-Xdebug -Xrunjdwp:transport=dt_socket,address='
. ( $^O eq 'MSWin32' ? '8000' : '${RAKUDO_JDB_PORT:=8000}' )
. ',server=y,suspend=y';

if ($debugger) {
install "perl6-debug-j", "java $jopts perl6-debug";
}
else {
install "perl6-j", "java $jopts perl6 $blib";
install "perl6-j", "java $jopts perl6 $blib";
install "perl6-jdb-server", "java $jdbopts $jopts perl6 $blib";
install "perl6-eval-server", "java -Xmx3000m $jopts org.perl6.nqp.tools.EvalServer";
install "perl6-eval-server",
"java -Xmx3000m $jopts org.perl6.nqp.tools.EvalServer";
}
@@ -7,7 +7,7 @@ use Cwd;
use POSIX qw<strftime>;
use Digest::SHA;
use File::Find;
use NQP::Config qw<slurp read_config cmp_rev system_or_die>;
use NQP::Config qw<slurp read_config cmp_rev system_or_die run_or_die>;
use IPC::Cmd qw<run>;
use NQP::Macros;

@@ -1,8 +1,9 @@
JAVA = java
JAVAC = javac
JAR = jar
J_NQP = @j_nqp@
J_GEN_CAT = @script(gen-cat.nqp)@ jvm
J_NQP = @shquot(@j_nqp@)@
# J_GEN_CAT is only used in command lines, can be pre-quoted
J_GEN_CAT = @shquot(@script(gen-cat.nqp)@)@ jvm

NQP_PREFIX = @nqp_prefix@

@@ -13,8 +14,8 @@ J_LIBPATH = @nqp::libdir@
NQP_JARS = @nqp_jars@
BLD_NQP_JARS = @bld_nqp_jars@

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

RUNTIME_JAVAS = @nfp(src/vm/jvm/runtime/org/perl6/rakudo/*.java)@

@@ -84,102 +85,102 @@ J_HARNESS5_WITH_FUDGE = $(J_HARNESS5) --fudge --keep-exit-code

j-all: check_@backend_prefix@_nqp_version $(PERL6_JAR) $(SETTING_JAR) $(SETTING_D_JAR) $(J_RUNNER) eval-client.pl $(PERL6_DEBUG_JAR) $(J_DEBUG_RUNNER)

check_@backend_prefix@_nqp_version: @script(check-nqp-version.pl)@
$(PERL5) @script(check-nqp-version.pl)@ $(J_NQP)
check_@backend_prefix@_nqp_version: @@script(check-nqp-version.pl)@@
$(PERL5) @shquot(@script(check-nqp-version.pl)@)@ $(J_NQP)

$(RUNTIME_JAR): $(RUNTIME_JAVAS)
$(MKPATH) bin
$(JAVAC) -source 1.8 -cp $(BLD_NQP_JARS) -g -d bin -encoding UTF8 $(RUNTIME_JAVAS)
$(JAVAC) -source 1.8 -cp @q($(BLD_NQP_JARS))@ -g -d bin -encoding UTF8 $(RUNTIME_JAVAS)
$(JAR) cf0 rakudo-runtime.jar -C bin@slash@ .

$(PERL6_ML_JAR): @nfp(src/Perl6/ModuleLoader.nqp src/vm/jvm/ModuleLoaderVMConfig.nqp src/vm/jvm/Perl6/JavaModuleLoader.nqp gen/nqp-version)@
$(J_NQP) $(J_GEN_CAT) @nfp(src/vm/jvm/ModuleLoaderVMConfig.nqp src/Perl6/ModuleLoader.nqp src/vm/jvm/Perl6/JavaModuleLoader.nqp > $(J_BUILD_DIR)/ModuleLoader.nqp)@
$(PERL6_ML_JAR): @nfpl(src/Perl6/ModuleLoader.nqp src/vm/jvm/ModuleLoaderVMConfig.nqp src/vm/jvm/Perl6/JavaModuleLoader.nqp gen/nqp-version)@
$(J_NQP) $(J_GEN_CAT) @nfpl(src/vm/jvm/ModuleLoaderVMConfig.nqp src/Perl6/ModuleLoader.nqp src/vm/jvm/Perl6/JavaModuleLoader.nqp)@ > @nfpq($(J_BUILD_DIR)/ModuleLoader.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_ML_JAR) \
@nfp($(J_BUILD_DIR)/ModuleLoader.nqp)@
@nfpq($(J_BUILD_DIR)/ModuleLoader.nqp)@

$(PERL6_OPS_JAR): @nfp(src/vm/jvm/Perl6/Ops.nqp gen/nqp-version)@
$(PERL6_OPS_JAR): @nfpl(src/vm/jvm/Perl6/Ops.nqp gen/nqp-version)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_OPS_JAR) \
@nfp(src/vm/jvm/Perl6/Ops.nqp)@

$(PERL6_W_JAR): $(PERL6_ML_JAR) $(PERL6_OPS_JAR) $(PERL6_P_JAR) @nfp(src/Perl6/World.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_W_JAR) \
@nfp(src/Perl6/World.nqp)@

$(PERL6_P_JAR): @nfp(src/Perl6/Pod.nqp gen/nqp-version)@
$(PERL6_P_JAR): @nfpl(src/Perl6/Pod.nqp gen/nqp-version)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_P_JAR) \
@nfp(src/Perl6/Pod.nqp)@

$(PERL6_A_JAR): @nfp(src/Perl6/Actions.nqp)@ $(PERL6_P_JAR) $(PERL6_OPS_JAR)
$(J_NQP) $(J_GEN_CAT) @nfp(src/Perl6/Actions.nqp \
src/Perl6/PodActions.nqp > $(J_BUILD_DIR)/Perl6-Actions.nqp)@
$(J_NQP) $(J_GEN_CAT) @nfpl(src/Perl6/Actions.nqp \
src/Perl6/PodActions.nqp)@ > @nfpq($(J_BUILD_DIR)/Perl6-Actions.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_A_JAR) \
@nfp($(J_BUILD_DIR)/Perl6-Actions.nqp)@
@nfpq($(J_BUILD_DIR)/Perl6-Actions.nqp)@

$(PERL6_G_JAR): @nfp(src/Perl6/Grammar.nqp)@ $(PERL6_W_JAR) $(PERL6_A_JAR) $(PERL6_P_JAR)
$(J_NQP) $(J_GEN_CAT) @nfp(src/Perl6/Grammar.nqp \
src/Perl6/PodGrammar.nqp > $(J_BUILD_DIR)/Perl6-Grammar.nqp)@
$(J_NQP) $(J_GEN_CAT) @nfpl(src/Perl6/Grammar.nqp \
src/Perl6/PodGrammar.nqp)@ > @nfpq($(J_BUILD_DIR)/Perl6-Grammar.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_G_JAR) \
@nfp($(J_BUILD_DIR)/Perl6-Grammar.nqp)@
@nfpq($(J_BUILD_DIR)/Perl6-Grammar.nqp)@

$(PERL6_O_JAR): @nfp(src/Perl6/Optimizer.nqp)@ $(PERL6_OPS_JAR)
$(J_NQP) $(J_GEN_CAT) @nfp(src/Perl6/Optimizer.nqp > $(J_BUILD_DIR)/Perl6-Optimizer.nqp)@
$(J_NQP) $(J_GEN_CAT) @nfp(src/Perl6/Optimizer.nqp)@ > @nfpq($(J_BUILD_DIR)/Perl6-Optimizer.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_O_JAR) \
@nfp($(J_BUILD_DIR)/Perl6-Optimizer.nqp)@
@nfpq($(J_BUILD_DIR)/Perl6-Optimizer.nqp)@

$(PERL6_C_JAR): @nfp(src/Perl6/Compiler.nqp)@ $(PERL6_O_JAR)
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_C_JAR) \
@nfp(src/Perl6/Compiler.nqp)@

$(PERL6_JAR): @nfp(src/main.nqp)@ $(RUNTIME_JAR) $(PERL6_G_JAR) $(PERL6_A_JAR) $(PERL6_C_JAR) $(PERL6_P_JAR) $(J_METAMODEL_SOURCES) $(BOOTSTRAP_SOURCES) $(J_CORE_SOURCES) $(J_CORE_D_SOURCES)
$(PERL5) @script(gen-version.pl)@ $(PREFIX) $(LIBDIR) > @nfp($(J_BUILD_DIR)/main-version.nqp)@
$(J_NQP) $(J_GEN_CAT) @nfp(src/main.nqp $(J_BUILD_DIR)/main-version.nqp > $(J_BUILD_DIR)/main.nqp)@
$(CONFIGURE) --expand main-version --out @nfpq($(J_BUILD_DIR)/main-version.nqp)@
$(J_NQP) $(J_GEN_CAT) @nfp(src/main.nqp)@ @nfpq($(J_BUILD_DIR)/main-version.nqp)@ > @nfpq($(J_BUILD_DIR)/main.nqp)@
$(J_NQP) --module-path=blib --target=jar --javaclass=perl6 --output=$(PERL6_JAR) \
@nfp($(J_BUILD_DIR)/main.nqp)@
@nfpq($(J_BUILD_DIR)/main.nqp)@

$(PERL6_M_JAR): $(J_METAMODEL_SOURCES) $(PERL6_OPS_JAR)
$(J_NQP) $(J_GEN_CAT) $(J_METAMODEL_SOURCES) > @nfp($(J_BUILD_DIR)/Metamodel.nqp)@
$(J_NQP) $(J_GEN_CAT) $(J_METAMODEL_SOURCES) > @nfpq($(J_BUILD_DIR)/Metamodel.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_M_JAR) \
@nfp($(J_BUILD_DIR)/Metamodel.nqp)@
@nfpq($(J_BUILD_DIR)/Metamodel.nqp)@

$(PERL6_B_JAR): $(BOOTSTRAP_SOURCES) $(PERL6_M_JAR)
$(J_NQP) $(J_GEN_CAT) $(BOOTSTRAP_SOURCES) > @nfp($(J_BUILD_DIR)/BOOTSTRAP.nqp)@
$(J_RUN_NQP_RR) --module-path=blib --target=jar --output=$(PERL6_B_JAR) @nfp($(J_BUILD_DIR)/BOOTSTRAP.nqp)@
$(J_NQP) $(J_GEN_CAT) $(BOOTSTRAP_SOURCES) > @nfpq($(J_BUILD_DIR)/BOOTSTRAP.nqp)@
$(J_RUN_NQP_RR) --module-path=blib --target=jar --output=$(PERL6_B_JAR) @nfpq($(J_BUILD_DIR)/BOOTSTRAP.nqp)@

$(SETTING_JAR): $(PERL6_JAR) $(PERL6_B_JAR) $(J_CORE_SOURCES)
$(J_NQP) $(J_GEN_CAT) -f @template(jvm_core_sources)@ > @nfp($(J_BUILD_DIR)/CORE.setting)@
$(J_NQP) $(J_GEN_CAT) -f @shquot(@template(jvm_core_sources)@)@ > @nfpq($(J_BUILD_DIR)/CORE.setting)@
@echo "The following step can take a long time, please be patient."
@set_nqp_lib@$(J_RUN_PERL6) --setting=NULL --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_JAR) --nqp-lib=blib @nfp($(J_BUILD_DIR)/CORE.setting)@
@set_nqp_lib@$(J_RUN_PERL6) --setting=NULL --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_JAR) --nqp-lib=blib @nfpq($(J_BUILD_DIR)/CORE.setting)@

$(SETTING_D_JAR): $(PERL6_JAR) $(PERL6_B_JAR) $(SETTING_JAR) $(J_CORE_SOURCES)
$(J_NQP) $(J_GEN_CAT) $(J_CORE_D_SOURCES) > @nfp($(J_BUILD_DIR)/CORE.d.setting)@
$(J_NQP) $(J_GEN_CAT) $(J_CORE_D_SOURCES) > @nfpq($(J_BUILD_DIR)/CORE.d.setting)@
@echo "The following step can take a long time, please be patient."
@set_nqp_lib@$(J_RUN_PERL6) --setting=NULL.d --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_D_JAR) --nqp-lib=blib @nfp($(J_BUILD_DIR)/CORE.d.setting)@
@set_nqp_lib@$(J_RUN_PERL6) --setting=NULL.d --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_D_JAR) --nqp-lib=blib @nfpq($(J_BUILD_DIR)/CORE.d.setting)@

$(J_RUNNER): @script(create-jvm-runner.pl)@
$(PERL5) @script(create-jvm-runner.pl)@ dev . . $(NQP_PREFIX) --nqp-lib=blib $(NQP_JARS)
$(J_RUNNER): @@script(create-jvm-runner.pl)@@
$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev . . @q($(NQP_PREFIX))@ --nqp-lib=blib @q($(NQP_JARS))@

j-runner-default: j-all
$(CP) $(J_RUNNER) perl6$(J_BAT)
$(CHMOD) 755 perl6$(J_BAT)

$(PERL6_DEBUG_JAR): @nfp(src/perl6-debug.nqp)@ $(PERL6_JAR)
$(J_NQP) $(J_GEN_CAT) @nfp(src/perl6-debug.nqp $(J_BUILD_DIR)/main-version.nqp > $(J_BUILD_DIR)/perl6-debug.nqp)@
$(J_NQP) $(J_GEN_CAT) @nfp(src/perl6-debug.nqp)@ @nfpq($(J_BUILD_DIR)/main-version.nqp)@ > @nfpq($(J_BUILD_DIR)/perl6-debug.nqp)@
$(J_NQP) --module-path=blib --target=jar --javaclass=perl6-debug --output=$(PERL6_DEBUG_JAR) \
@nfp($(J_BUILD_DIR)/perl6-debug.nqp)@
@nfpq($(J_BUILD_DIR)/perl6-debug.nqp)@

$(J_DEBUG_RUNNER): @script(create-jvm-runner.pl)@ $(PERL6_DEBUG_JAR)
$(PERL5) @script(create-jvm-runner.pl)@ dev-debug . . $(NQP_PREFIX) --nqp-lib=blib $(NQP_JARS)
$(J_DEBUG_RUNNER): @@script(create-jvm-runner.pl)@@ $(PERL6_DEBUG_JAR)
$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev-debug . . @q($(NQP_PREFIX))@ --nqp-lib=blib @q($(NQP_JARS))@

eval-client.pl:
$(CP) @nfp($(SDKROOT)$(NQP_PREFIX)/bin/eval-client.pl)@ .
$(CP) @nfpq($(SDKROOT)$(NQP_PREFIX)/bin/eval-client.pl)@ .

## testing targets
j-test : j-coretest

j-fulltest: j-coretest j-stresstest

j-coretest: j-all
$(J_HARNESS5) @nfp(t/01-sanity t/02-rakudo t/03-jvm t/04-nativecall t/05-messages t/06-telemetry t/07-pod-to-text t/08-performance t/10-qast)@
$(J_HARNESS5) @nfpl(t/01-sanity t/02-rakudo t/03-jvm t/04-nativecall t/05-messages t/06-telemetry t/07-pod-to-text t/08-performance t/10-qast)@

# Run the spectests that we know work.
j-spectest: j-testable @nfp(t/spectest.data)@
@@ -216,28 +217,28 @@ j-localtest_loud: j-all spectest_checkout @nfp(t/localtest.data)@
sometests: j-all
@$(J_HARNESS5_WITH_FUDGE) $(TESTFILES)

j-install: j-all @script(create-jvm-runner.pl)@ @script(install-core-dist.p6)@
$(MKPATH) @nfp($(DESTDIR)$(PREFIX)/bin)@
$(MKPATH) @nfp($(DESTDIR)$(J_LIBPATH)/Perl6)@
$(MKPATH) @nfp($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_LANG_JARS) @nfp($(DESTDIR)$(J_LIBPATH)/Perl6)@
$(CP) $(SETTING_JAR) $(SETTING_D_JAR) @nfp($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_JAR) @nfp($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_DEBUG_JAR) @nfp($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(RUNTIME_JAR) @nfp($(DESTDIR)$(PERL6_HOME)/runtime)@
.@slash@$(J_RUNNER) @script(upgrade-repository.p6)@ $(DESTDIR)$(PERL6_HOME)
$(MKPATH) @nfp($(DESTDIR)$(PERL6_HOME)/vendor)@
.@slash@$(J_RUNNER) @script(upgrade-repository.p6)@ @nfp($(DESTDIR)$(PERL6_HOME)/vendor)@
$(MKPATH) @nfp($(DESTDIR)$(PERL6_HOME)/site)@
.@slash@$(J_RUNNER) @script(upgrade-repository.p6)@ @nfp($(DESTDIR)$(PERL6_HOME)/site)@
.@slash@$(J_RUNNER) @script(install-core-dist.p6)@ $(DESTDIR)$(PERL6_HOME)
$(PERL5) @script(create-jvm-runner.pl)@ install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
$(PERL5) @script(create-jvm-runner.pl)@ install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
j-install: j-all @@script(create-jvm-runner.pl)@@ @@script(install-core-dist.p6)@@
$(MKPATH) @nfpq($(DESTDIR)$(PREFIX)/bin)@
$(MKPATH) @nfpq($(DESTDIR)$(J_LIBPATH)/Perl6)@
$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_LANG_JARS) @nfpq($(DESTDIR)$(J_LIBPATH)/Perl6)@
$(CP) $(SETTING_JAR) $(SETTING_D_JAR) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_JAR) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_DEBUG_JAR) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(RUNTIME_JAR) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
@nfpq($(BASE_DIR)/$(J_RUNNER))@ @shquot(@script(upgrade-repository.p6)@)@ @shquot($(DESTDIR)$(PERL6_HOME))@
$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME)/vendor)@
@nfpq($(BASE_DIR)/$(J_RUNNER))@ @shquot(@script(upgrade-repository.p6)@)@ @nfpq($(DESTDIR)$(PERL6_HOME)/vendor)@
$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME)/site)@
@nfpq($(BASE_DIR)/$(J_RUNNER))@ @shquot(@script(upgrade-repository.p6)@)@ @nfpq($(DESTDIR)$(PERL6_HOME)/site)@
@nfpq($(BASE_DIR)/$(J_RUNNER))@ @shquot(@script(install-core-dist.p6)@)@ @shquot($(DESTDIR)$(PERL6_HOME))@
$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q($(NQP_PREFIX))@ "" @q($(NQP_JARS))@
$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install-debug @q($(DESTDIR))@ @q($(PREFIX))@ @q($(NQP_PREFIX))@ "" @q($(NQP_JARS))@

j-runner-default-install: j-install
$(PERL5) @script(create-jvm-runner.pl)@ install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
$(CP) @nfp($(DESTDIR)$(PREFIX)/bin/perl6-j$(J_BAT) $(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT))@
$(CHMOD) 755 @nfp($(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT))@
$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ install @q($(DESTDIR))@ @q($(PREFIX))@ @q($(NQP_PREFIX))@ "" @q($(NQP_JARS))@
$(CP) @nfpq($(DESTDIR)$(PREFIX)/bin/perl6-j$(J_BAT))@ @nfpq($(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT))@
$(CHMOD) 755 @nfpq($(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT))@

## cleaning
j-clean:

0 comments on commit 16ccbeb

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