From f8c38eab74487cf789fe5364208f0da6a8b7e76a Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 5 Jun 2023 02:27:02 -0700
Subject: [PATCH] Proper Windows support

---
 build.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.py b/build.py
index 3f34c250d..8343b383b 100755
--- a/build.py
+++ b/build.py
@@ -432,15 +432,16 @@ def find_jdk():
         if not op.exists(jbr):
             jbr = op.join(studio, "Contents", "jbr", "Contents", "Home", "bin")
         if op.exists(jbr):
-            env["PATH"] = f'{jbr}:{env["PATH"]}'
+            env["PATH"] = f'{jbr}{os.pathsep}{env["PATH"]}'
 
     no_jdk = False
     try:
         proc = subprocess.run(
-            ["javac", "-version"],
+            "javac -version",
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             env=env,
+            shell=True
         )
         no_jdk = proc.returncode != 0
     except FileNotFoundError:
@@ -516,7 +517,7 @@ def cleanup(args):
 
     if "java" in args.target:
         header("* Cleaning java")
-        execv([gradlew, "app:clean", "app:shared:clean", "stub:clean"])
+        execv([gradlew, "app:clean", "app:shared:clean", "stub:clean"], env=find_jdk())
         rm_rf(op.join("app", "src", "debug"))
         rm_rf(op.join("app", "src", "release"))