Skip to content

Commit 54744fb

Browse files
author
Mike Hearn
committed
Fix some regressions. Need a proper test suite!
1 parent 5faaada commit 54744fb

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

docsite/docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This repository demonstrates how to use NodeJS/npm modules directly from Java an
1010

1111
## How does it work?
1212

13-
GraalVM is a modified version of OpenJDK that includes the cutting edge Graal and Truffle compiler infrastructure.
13+
[GraalVM](https://www.graalvm.org/) is a modified version of OpenJDK that includes the cutting edge Graal and Truffle compiler infrastructure.
1414
It provides an advanced JavaScript engine that has competitive performance with V8, and also a modified version of
1515
NodeJS 10 that swaps out V8 for this enhanced JVM. In this way you can fuse together NodeJS and the JVM, allowing apps
1616
to smoothly access both worlds simultaneously with full JIT compilation.

src/main/resources/boot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ let evalWrapper = function(str) {
4444
};
4545

4646
// Now pass control to the Java side.
47-
Java.type('net.plan99.nodejs.NodeJS').boot(javaEntryPoint, javaToJSQueue, evalWrapper, process.argv.slice(2));
47+
Java.type('net.plan99.nodejs.java.NodeJS').boot(javaEntryPoint, javaToJSQueue, evalWrapper, process.argv.slice(2));

src/main/resources/nodejvm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fi
2929

3030
# Figure out our current directory.
3131
nodejvmDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )
32-
interopJar="$nodejvmDir/nodejs-interop-1.0.jar"
32+
interopJar="$nodejvmDir/nodejs-interop-1.1.jar"
3333

3434
if [[ ! -e "$interopJar" ]]; then
3535
echo "$interopJar not found, is this script installed correctly?"
@@ -75,7 +75,8 @@ export NODE_PATH=$PWD/node_modules
7575
# Now feed the boot.js script to the node binary. The quoted "EOF" here
7676
# doc string disables parsing and interpolation of the embedded script,
7777
# which is needed because backticks are meaningful to both JS and shell.
78-
79-
cat <<"EOF" | $node --experimental-worker --jvm ${newargs[@]}
78+
cmd="$node --experimental-worker --jvm ${newargs[@]}"
79+
echo $cmd
80+
cat <<"EOF" | $cmd
8081
@bootjs@
8182
EOF

0 commit comments

Comments
 (0)