Skip to content

Use Python launcher if present #7541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelDCurran merged 3 commits into from
Feb 2, 2018
Merged

Use Python launcher if present #7541

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b153a20
Use Python launcher if present
francipvb Aug 30, 2017
c54f000
Fixed scons.bat to make use of `&&` and `||` operators instead of `if`
francipvb Oct 3, 2017
44046b6
Redirected stdout and stderr to nul and switched back to an if struct…
francipvb Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions scons.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
@echo off
rem We need this script because .py probably isn't in pathext.
rem We can't just call python -c because it may not be in the path.
rem Python registers itself with the .py extension, so call scons.py.
"%~dp0\scons.py" %*
rem Instead, find the python launcher (installed by python 3)
where py 1>nul 2>&1
if "%ERRORLEVEL%" == "0" (
rem Python launcher is present in the PATH
rem Call python 2.7 for 32 bits
py -2.7-32 "%~dp0\scons.py" %*
) else (
rem Python registers itself with the .py extension, so call scons.py.
"%~dp0\scons.py" %*
)