Removing all usages of TRUFFLE_JAR_PATH environment variable.

iamstolis · iamstolis · commit cfaa6fae961d · 2019-09-04T12:09:47.000+02:00
diff --git a/graal-nodejs/deps/v8/src/graal/graal_isolate.cc b/graal-nodejs/deps/v8/src/graal/graal_isolate.cc
@@ -315,11 +315,6 @@ v8::Isolate* GraalIsolate::New(v8::Isolate::CreateParams const& params) {
             fprintf(stderr, "Cannot find %s. Update GRAAL_SDK_JAR_PATH environment variable!\n", graal_sdk_jar_path.c_str());
             exit(1);
         }
-        std::string truffle_jar_path = getstdenv("TRUFFLE_JAR_PATH");
-        if (!truffle_jar_path.empty() && access(truffle_jar_path.c_str(), F_OK) == -1) {
-            fprintf(stderr, "Cannot find %s. Update TRUFFLE_JAR_PATH environment variable!\n", truffle_jar_path.c_str());
-            exit(1);
-        }
         std::string graaljs_jar_path = getstdenv("GRAALJS_JAR_PATH");
         if (!graaljs_jar_path.empty() && access(graaljs_jar_path.c_str(), F_OK) == -1) {
             fprintf(stderr, "Cannot find %s. Update GRAALJS_JAR_PATH environment variable!\n", graaljs_jar_path.c_str());
diff --git a/graal-nodejs/lib/child_process.js b/graal-nodejs/lib/child_process.js
@@ -531,7 +531,7 @@ function normalizeSpawnArguments(file, args, options) {
   }
 
   if (!env.LD_LIBRARY_PATH) {
-    var graalNodeKeys = ['LD_LIBRARY_PATH', 'JAVA_HOME', 'GRAAL_SDK_JAR_PATH', 'LAUNCHER_COMMON_JAR_PATH', 'TRUFFLE_JAR_PATH', 'GRAALJS_JAR_PATH', 'TREGEX_JAR_PATH', 'TRUFFLEOM_JAR_PATH', 'TRUFFLENODE_JAR_PATH', 'NODE_JVM_OPTIONS', 'NODE_JVM_LIB', 'NODE_STACK_SIZE', 'NODE_JVM_CLASSPATH', 'NODE_JVM_BOOTCLASSPATH', 'ICU4J_DATA_PATH'];
+    var graalNodeKeys = ['LD_LIBRARY_PATH', 'JAVA_HOME', 'GRAAL_SDK_JAR_PATH', 'LAUNCHER_COMMON_JAR_PATH', 'GRAALJS_JAR_PATH', 'TREGEX_JAR_PATH', 'TRUFFLEOM_JAR_PATH', 'TRUFFLENODE_JAR_PATH', 'NODE_JVM_OPTIONS', 'NODE_JVM_LIB', 'NODE_STACK_SIZE', 'NODE_JVM_CLASSPATH', 'NODE_JVM_BOOTCLASSPATH', 'ICU4J_DATA_PATH'];
     graalNodeKeys.forEach(function(key) {
       var origValue = process.env[key];
       if (origValue && !env[key]) {
diff --git a/graal-nodejs/mx.graal-nodejs/mx_graal_nodejs.py b/graal-nodejs/mx.graal-nodejs/mx_graal_nodejs.py
@@ -365,7 +365,6 @@ def setupNodeEnvironment(args, add_graal_vm_args=True):
     _setEnvVar('JAVA_HOME', javaHome)
     if mx.suite('compiler', fatalIfMissing=False) is None:
         _setEnvVar('GRAAL_SDK_JAR_PATH', mx.distribution('sdk:GRAAL_SDK').path)
-        _setEnvVar('TRUFFLE_JAR_PATH', mx.distribution('truffle:TRUFFLE_API').path)
     _setEnvVar('LAUNCHER_COMMON_JAR_PATH', mx.distribution('sdk:LAUNCHER_COMMON').path)
     _setEnvVar('TRUFFLENODE_JAR_PATH', mx.distribution('TRUFFLENODE').path)
     node_jvm_cp = (os.environ['NODE_JVM_CLASSPATH'] + os.pathsep) if 'NODE_JVM_CLASSPATH' in os.environ else ''

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ function normalizeSpawnArguments(file, args, options) {`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`if (!env.LD_LIBRARY_PATH) {`
`534`		`- var graalNodeKeys = ['LD_LIBRARY_PATH', 'JAVA_HOME', 'GRAAL_SDK_JAR_PATH', 'LAUNCHER_COMMON_JAR_PATH', 'TRUFFLE_JAR_PATH', 'GRAALJS_JAR_PATH', 'TREGEX_JAR_PATH', 'TRUFFLEOM_JAR_PATH', 'TRUFFLENODE_JAR_PATH', 'NODE_JVM_OPTIONS', 'NODE_JVM_LIB', 'NODE_STACK_SIZE', 'NODE_JVM_CLASSPATH', 'NODE_JVM_BOOTCLASSPATH', 'ICU4J_DATA_PATH'];`
	`534`	`+ var graalNodeKeys = ['LD_LIBRARY_PATH', 'JAVA_HOME', 'GRAAL_SDK_JAR_PATH', 'LAUNCHER_COMMON_JAR_PATH', 'GRAALJS_JAR_PATH', 'TREGEX_JAR_PATH', 'TRUFFLEOM_JAR_PATH', 'TRUFFLENODE_JAR_PATH', 'NODE_JVM_OPTIONS', 'NODE_JVM_LIB', 'NODE_STACK_SIZE', 'NODE_JVM_CLASSPATH', 'NODE_JVM_BOOTCLASSPATH', 'ICU4J_DATA_PATH'];`
`535`	`535`	`graalNodeKeys.forEach(function(key) {`
`536`	`536`	`var origValue = process.env[key];`
`537`	`537`	`if (origValue && !env[key]) {`