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 dea4d87346d3f920824145f1b18e46b0de285b20..f6170f58083eb2dbb6ca8c8fc919e083a7c9f96f 100644 (file)
--- 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 5e840cc7eaca84d47c3a1e40e6fe5bb1c8bfbf07..622f876a980bce0edf9102caec0d70529f8c8583 100644 (file)
--- 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):\r
 @rem 1) uncomment the following line:\r
 \r
-@rem    call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only\r
+call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only\r
 \r
 @rem 2) commit and push\r
 @rem 3) wait for all Windows bots to start a build with that changeset\r