Skip to content

Commit c2442e1

Browse files
committed
WIP Fixes for Windows
(cherry picked from commit 7bef9ca)
1 parent 787c47d commit c2442e1

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

graalpython/lib-graalpython/modules/standalone/app/graalpy.cmd

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ for /f "delims=" %%i in ('%JAVA% VTabCreator.java') do set VTAB=%%i
1414
del VTabCreator.java
1515

1616
REM Store each argument separated by vtab
17-
for %%I in (%*) do call :sub %%I
18-
19-
mvn -f "%~dp0"pom.xml exec:exec -Dexec.executable=java -Dexec.args="--module-path %%classpath -Dorg.graalvm.launcher.executablename=%0 --module org.graalvm.py.launcher/com.oracle.graal.python.shell.GraalPythonMain"
20-
21-
goto :eof
22-
23-
:sub
17+
:loop
2418
set GRAAL_PYTHON_ARGS=%GRAAL_PYTHON_ARGS%%VTAB%%~1
25-
goto :eof
19+
shift /1
20+
if not "%~1"=="" goto loop
21+
22+
mvn -f "%~dp0pom.xml" exec:exec -Dexec.executable=java -Dexec.args="--module-path %%classpath -Dorg.graalvm.launcher.executablename=%~0 --module org.graalvm.py.launcher/com.oracle.graal.python.shell.GraalPythonMain"

graalpython/lib-python/3/venv/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ def setup_python(self, context):
366366
base_exe = os.path.basename(context.env_exe)
367367
suffixes.add(base_exe)
368368

369+
copier(context.executable, os.path.join(binpath, "graalpy.cmd"))
369370
for suffix in suffixes:
370371
# Truffle change: we look in 'bin'
371372
src = os.path.join(dirname, 'bin', suffix)
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
3+
"<target>" "--python.Executable=%~0" %*
4+
exit /b %errorlevel%

0 commit comments

Comments
 (0)