mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-11 14:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Adds warning to prepare_ssl when nasm is not available.

Browse source 
Force clean externals on buildbots.
This commit is contained in:
Steve Dower 2016-03-08 12:51:19 -08:00
commit 332018d17c
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PCbuild/prepare_ssl.py
View file

@ -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

2
Tools/buildbot/build.bat
View file

@ -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