diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-03-08 20:51:19 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-03-08 20:51:19 (GMT) |
| commit | 332018d17ce04dcb94ae5275b1343e828632fb92 (patch) | |
| tree | ecea5a99407e2f949a8904c10799898f20d34aee | |
| parent | 786e9220542fe82e548a6c305a4c094807415492 (diff) | |
| parent | 79993a90e2c3668283324681e9d97c30807221de (diff) | |
| download | cpython-332018d17ce04dcb94ae5275b1343e828632fb92.zip cpython-332018d17ce04dcb94ae5275b1343e828632fb92.tar.gz cpython-332018d17ce04dcb94ae5275b1343e828632fb92.tar.bz2 | |
Adds warning to prepare_ssl when nasm is not available.
Force clean externals on buildbots.
| -rw-r--r-- | PCbuild/prepare_ssl.py | 3 | ||||
| -rw-r--r-- | Tools/buildbot/build.bat | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py index dea4d87..f6170f5 100644 --- a/PCbuild/prepare_ssl.py +++ b/PCbuild/prepare_ssl.py @@ -174,6 +174,9 @@ def main(): if not find_all_on_path('nmake.exe'): print('Could not find nmake.exe, try running env.bat') sys.exit(1) + if not find_all_on_path('nasm.exe'): + print('Could not find nasm.exe, please add to PATH') + sys.exit(1) sys.stdout.flush() # Put our working Perl at the front of our path diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat index 5e840cc..622f876 100644 --- a/Tools/buildbot/build.bat +++ b/Tools/buildbot/build.bat @@ -7,7 +7,7 @@ call "%~dp0clean.bat" %* @rem a new version of an external library, especially Tcl/Tk):
@rem 1) uncomment the following line:
-@rem call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
+call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
@rem 2) commit and push
@rem 3) wait for all Windows bots to start a build with that changeset
|