Skip to content

Commit efde0fb

Browse files
committed
[GR-60314] Fix: use gradlew.bat on Windows.
PullRequest: graalpython/3606
2 parents 94cf40f + 07c2199 commit efde0fb

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "106ff9956a291d98428a19ec769ba281dd67afd5" }
1+
{ "overlay": "da1c0a1c9113a31a57d5dc39dc9fc6c02ed63c5e" }

mx.graalpython/mx_graalpython_gradleproject.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,8 @@ def get_ide_project_dir(self):
232232
self.getBuildTask([])._create_build_script()
233233

234234

235-
def _run_gradlew(args, **kwargs):
236-
kwargs.setdefault('env', os.environ.copy())
237-
env = kwargs.pop('env')
235+
def _run_gradlew(args, cwd):
236+
env = os.environ.copy()
238237
if 'GRADLE_JAVA_HOME' not in env:
239238
def abortCallback(msg):
240239
mx.abort("Could not find a JDK of version between 17 and 21 to build a Gradle project.\n"
@@ -246,10 +245,8 @@ def abortCallback(msg):
246245
else:
247246
env['JAVA_HOME'] = env['GRADLE_JAVA_HOME']
248247
mx.logv("Building Gradle project using java: " + env['GRADLE_JAVA_HOME'])
249-
command = './gradlew'
250-
if mx.is_windows():
251-
command = 'gradle.bat'
252-
mx.run([command, *args], env=env, **kwargs)
248+
command = os.path.join(cwd, 'gradlew.bat' if mx.is_windows() else 'gradlew')
249+
mx.run([command, *args], env=env, cwd=cwd)
253250

254251

255252
# Gradle uses forward slashes in paths even on Windows

0 commit comments

Comments
 (0)