From 2393a1992549e05c45359fc8e9cfd0405f79f3a8 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 21:57:10 -0500 Subject: Update scons.bat to first look for scons.py and then scons so that a universal python wheel can work on windows --- src/CHANGES.txt | 9 +++++---- src/engine/MANIFEST.in | 4 ++-- src/script/scons.bat | 2 ++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 071bd59..231badb 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,12 +11,13 @@ RELEASE 3.0.3 - Mon, 07 Jan 2019 20:05:22 -0400 From William Deegan: - - Fixes to packaging logic. Ensuring the SCons.Tool.clangCommon module and the docbook xsl files are added - to the packages. + - Fixes to packaging logic. Ensuring the SCons.Tool.clangCommon module is added + to the release packages. + - Modify scons.bat script to check for scons python script without .py extension if no file + scons.py exists. This enables an all platform wheel to work. From Mats Wichmann: - - Update some doc examples for Py3: map() now returns an interable - instead of a list. + - Update doc examples to work with Python 3.5+: map() now returns an iterable instead of a list. RELEASE 3.0.2 - Mon, 31 Dec 2018 16:00:12 -0700 diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 7456824..39aba6c 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -179,5 +179,5 @@ SCons/Tool/msgfmt.py SCons/Tool/msginit.py SCons/Tool/msgmerge.py SCons/Tool/xgettext.py -SCons/Tool/docbook/docbook-xsl-1.76.1/** -SCons/Tool/docbook/utils/** +#SCons/Tool/docbook/docbook-xsl-1.76.1/** +#SCons/Tool/docbook/utils/** diff --git a/src/script/scons.bat b/src/script/scons.bat index a9e777e..10b8637 100644 --- a/src/script/scons.bat +++ b/src/script/scons.bat @@ -22,6 +22,8 @@ popd @REM try the script named as the .bat file in current dir, then in Scripts subdir set scriptname=%~dp0%~n0.py if not exist "%scriptname%" set scriptname=%~dp0Scripts\%~n0.py +@REM Handle when running from wheel where the script has no .py extension +if not exist "%scriptname%" set scriptname=%~dp0%~n0 python "%scriptname%" %* endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL% -- cgit v0.12