Drop HALIDE_NODE_JS_PATH in favor of NodeJS_ROOT

Author: alexreinking

master/master.cfg

@@ -715,13 +715,10 @@ def get_halide_cmake_definitions(builder_type, halide_target="host", wasm_jit="w
     if "wasm" in halide_target:
         cmake_definitions["WITH_PYTHON_BINDINGS"] = "OFF"
 
-    # TODO: HALIDE_NODE_JS_PATH is only necessary until EMSDK updates their built-in version of Node
-    # to v16.13+; when that is done, remove this definition.
     if builder_type.handles_wasm() and halide_target.startswith("wasm-"):
         cmake_definitions["CMAKE_TOOLCHAIN_FILE"] = Interpolate(
             "%(prop:EMSDK)s/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
         )
-        cmake_definitions["NODE_JS_EXECUTABLE"] = Property("HALIDE_NODE_JS_PATH")
         if wasm_jit == "v8":
             cmake_definitions["WITH_WABT"] = "OFF"
             cmake_definitions["WITH_V8"] = "ON"
@@ -1050,14 +1047,11 @@ def add_env_setup_step(factory, builder_type, enable_ccache=False):
         "LD": ld,
     }
 
-    # TODO: HALIDE_NODE_JS_PATH is only necessary until EMSDK updates their built-in version of Node
-    # to v16.13+; when that is done, remove HALIDE_NODE_JS_PATH here and on the workers.
     factory.addStep(
         SetPropertiesFromEnv(
             name="Read worker environment",
             variables=[
                 "EMSDK",
-                "HALIDE_NODE_JS_PATH",
                 "HL_HEXAGON_TOOLS",
                 "HL_WEBGPU_NATIVE_LIB",
                 "HL_WEBGPU_NODE_BINDINGS",

worker/macos/install.sh

@@ -54,8 +54,8 @@ fi
 export EMSDK
 
 # TODO: this should be managed in-repo
-HALIDE_NODE_JS_PATH="$(brew --prefix node@18)/bin/node"
-export HALIDE_NODE_JS_PATH
+NodeJS_ROOT="$(brew --prefix node@18)"
+export NodeJS_ROOT
 
 ##
 # Install the autostart script

worker/macos/org.halide-lang.buildbot.plist.in

@@ -20,8 +20,8 @@
             <string>${HL_WEBGPU_NATIVE_LIB}</string>
             <key>EMSDK</key>
             <string>${EMSDK}</string>
-            <key>HALIDE_NODE_JS_PATH</key>
-            <string>${HALIDE_NODE_JS_PATH}</string>
+            <key>NodeJS_ROOT</key>
+            <string>${NodeJS_ROOT}</string>
         </dict>
     </dict>
 </plist>