From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 8 Mar 2016 20:50:57 +0000 (-0800)
Subject: Adds warning to prepare_ssl when nasm is not available.
X-Git-Tag: v3.6.0a1~509^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79993a90e2c3668283324681e9d97c30807221de;p=python

Adds warning to prepare_ssl when nasm is not available.
Force clean of externals on buildbots.
---

diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
index dea4d87346..f6170f5808 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 5e840cc7ea..622f876a98 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