Kaydet (Commit) 79993a90 authored tarafından Steve Dower's avatar Steve Dower

Adds warning to prepare_ssl when nasm is not available.

Force clean of externals on buildbots.
üst ada6db78
...@@ -174,6 +174,9 @@ def main(): ...@@ -174,6 +174,9 @@ def main():
if not find_all_on_path('nmake.exe'): if not find_all_on_path('nmake.exe'):
print('Could not find nmake.exe, try running env.bat') print('Could not find nmake.exe, try running env.bat')
sys.exit(1) 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() sys.stdout.flush()
# Put our working Perl at the front of our path # Put our working Perl at the front of our path
......
...@@ -7,7 +7,7 @@ call "%~dp0clean.bat" %* ...@@ -7,7 +7,7 @@ call "%~dp0clean.bat" %*
@rem a new version of an external library, especially Tcl/Tk): @rem a new version of an external library, especially Tcl/Tk):
@rem 1) uncomment the following line: @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 2) commit and push
@rem 3) wait for all Windows bots to start a build with that changeset @rem 3) wait for all Windows bots to start a build with that changeset
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment