[Python-checkins] cpython (3.5): Adds warning to prepare_ssl when nasm is not available.

[steve.dower]

https://hg.python.org/cpython/rev/8ea548397c57
changeset:   100468:8ea548397c57
branch:      3.5
parent:      100466:757159fb4847
user:        Steve Dower <steve.dower at microsoft.com>
date:        Tue Mar 08 12:50:57 2016 -0800
summary:
  Adds warning to prepare_ssl when nasm is not available.
Force clean of externals on buildbots.

files:
  PCbuild/prepare_ssl.py   |  3 +++
  Tools/buildbot/build.bat |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
--- a/PCbuild/prepare_ssl.py
+++ b/PCbuild/prepare_ssl.py
@@ -174,6 +174,9 @@
     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
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -7,7 +7,7 @@
 @rem a new version of an external library, especially Tcl/Tk):
 @rem 1) uncomment the following line:
 
- at 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

-- 
Repository URL: https://hg.python.org/cpython