Adds warning to prepare_ssl when nasm is not available.

Force clean externals on buildbots.
skrah · Mar 8, 2016 · 332018d · 332018d
2 parents 786e922 + 79993a9
commit 332018d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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