some minor fixes

eclipsesource · Aug 29, 2017 · 0e83e34 · 0e83e34
1 parent 31a2079
commit 0e83e34
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/build_system/build_executor.py b/build_system/build_executor.py
@@ -201,12 +201,12 @@ def execute_build(params):
         print "Checking Node.js builtins integration consistency..."
         utils.check_node_builtins()
 
-        major,minor,build,patch,is_candidate = utils.get_v8_version()
-        major,minor,patch,is_release = utils.get_nodejs_version()
+        v8_major,v8_minor,v8_build,v8_patch,v8_is_candidate = utils.get_v8_version()
+        njs_major,njs_minor,njs_patch,njs_is_release = utils.get_nodejs_version()
 
         print "--------------------------------------------------"
-        print "V8:      %(major)s.%(minor)s.%(build)s.%(patch)s (candidate: %(is_candidate)s)" % locals()
-        print "Node.js: %(major)s.%(minor)s.%(patch)s (release: %(is_release)s)" % locals()
+        print "V8:      %(v8_major)s.%(v8_minor)s.%(v8_build)s.%(v8_patch)s (candidate: %(v8_is_candidate)s)" % locals()
+        print "Node.js: %(njs_major)s.%(njs_minor)s.%(njs_patch)s (release: %(njs_is_release)s)" % locals()
         print "--------------------------------------------------"
 
         print "Caching Node.js artifacts..."

diff --git a/build_system/build_utils.py b/build_system/build_utils.py
@@ -300,14 +300,14 @@ def check_node_builtins():
     code in jni/com_eclipsesource_v8_V8Impl.cpp to make sure that every module
     is correctly initialized and linked into the native J2V8 library.
     """
-    node_src = "node/src/"
+    node_src = "./node/src/"
 
     # node.js directory is not available
     if (not os.path.exists(node_src)):
         return
 
     # building from a pre-built dependency package (does not include c++ source files)
-    if (len(glob.glob(node_src + ".cc")) == 0):
+    if (len(glob.glob(node_src + "*.cc")) == 0):
         return
 
     j2v8_jni_cpp_path = "jni/com_eclipsesource_v8_V8Impl.cpp"

diff --git a/build_system/shared_build_steps.py b/build_system/shared_build_steps.py
@@ -57,7 +57,7 @@ def setEnvVar(name, value):
     if (os.name == "nt"):
         return ["set \"" + name + "=" + value + "\""]
     else:
-        return ["export " + name + "=" + value]
+        return ["export " + name + "=\"" + value + "\""]
 
 def setJavaHome(config):
     # NOTE: Docker Linux builds need some special handling, because not all images have