Skip to content

Commit aac9f52

Browse files
committed
[JVM] Re-add 3rdparty jar jna-4.0.0.jar
1 parent bcdae88 commit aac9f52

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tools/build/install-jvm-runner.pl.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ if ($^O eq 'MSWin32') {
2121
open my $fh, ">", $install_to
2222
or die "Could not open $install_to: $!";
2323
print $fh '@java -Xss1m -Xmx1324m -Xbootclasspath/a:' . $jar_dir . '\\nqp-runtime.jar;' .
24-
"$jar_dir\\@asmfile@;$jar_dir\\@jlinefile@;$lib_dir\\nqp.jar -cp $lib_dir nqp %*\n";
24+
"$jar_dir\\@asmfile@;$jar_dir\\@jlinefile@;$jar_dir\\@jnafile@;$lib_dir\\nqp.jar -cp $lib_dir nqp %*\n";
2525
close $fh
2626
or die "Could not close $install_to: $!";
2727
}
2828
else {
2929
my $nqp_dir = File::Spec->catfile($prefix, qw/share nqp/);
3030
my $jar_dir = File::Spec->catfile('${NQP_DIR}', 'runtime');
3131
my $lib_dir = File::Spec->catfile('${NQP_DIR}', 'lib');
32-
my $jars = "$jar_dir/nqp-runtime.jar:$jar_dir/@asmfile@:$jar_dir/@jlinefile@:$lib_dir/nqp.jar";
32+
my $jars = "$jar_dir/nqp-runtime.jar:$jar_dir/@asmfile@:$jar_dir/@jlinefile@:$jar_dir/@jnafile@:$lib_dir/nqp.jar";
3333
my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j');
3434

3535
open my $fh, ">", $install_to

tools/templates/jvm/nqp-j.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
@insert(runner-prelude)@
44

5-
@exec(java)@ -Xss1m -Xmx1324m -Xbootclasspath/a:"@cur_dir@@envvar(LIB_DIR)@@cpsep@@nfp(@envvar(JAR_DIR)@/nqp-runtime.jar)@@cpsep@@nfp(@envvar(JAR_DIR)@/@asmfile@)@@cpsep@@nfp(@envvar(JAR_DIR)@/@jlinefile@)@@cpsep@@nfp(@envvar(LIB_DIR)@/nqp.jar)@" -cp "@cur_dir@@envvar(LIB_DIR)@" nqp "@sh_allparams@"
5+
@exec(java)@ -Xss1m -Xmx1324m -Xbootclasspath/a:"@cur_dir@@envvar(LIB_DIR)@@cpsep@@nfp(@envvar(JAR_DIR)@/nqp-runtime.jar)@@cpsep@@nfp(@envvar(JAR_DIR)@/@asmfile@)@@cpsep@@nfp(@envvar(JAR_DIR)@/@jlinefile@)@@cpsep@@nfp(@envvar(JAR_DIR)@/@jnafile@)@@cpsep@@nfp(@envvar(LIB_DIR)@/nqp.jar)@" -cp "@cur_dir@@envvar(LIB_DIR)@" nqp "@sh_allparams@"

0 commit comments

Comments
 (0)