diff -r c95ce9b0a085 PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat Fri Oct 31 13:13:09 2014 +0100
+++ b/PCbuild/get_externals.bat Fri Oct 31 12:35:36 2014 -0500
@@ -20,6 +20,7 @@
for /D %%d in (
bzip2-*
db-*
+ nasm-*
openssl-*
tcl-*
tcltk*
@@ -51,6 +52,7 @@
for %%e in (
bzip2-1.0.6
+ nasm-2.11.06
openssl-1.0.1j
tcl-8.6.1.0
tk-8.6.1.0
@@ -87,9 +89,9 @@
echo.**WARNING**: the cleaning options unconditionally remove any directory
echo.that is a child of
echo. %CD%
-echo.and matches wildcard patterns beginning with bzip2-, db-, openssl-, tcl-,
-echo.tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential to be
-echo.very destructive if you are not aware of what it is doing. Use with
+echo.and matches wildcard patterns beginning with bzip2-, db-, nasm-, openssl-,
+echo.tcl-, tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential
+echo.to be very destructive if you are not aware of what it is doing. Use with
echo.caution!
popd
exit /b -1
diff -r c95ce9b0a085 PCbuild/pyproject.props
--- a/PCbuild/pyproject.props Fri Oct 31 13:13:09 2014 +0100
+++ b/PCbuild/pyproject.props Fri Oct 31 12:35:36 2014 -0500
@@ -20,6 +20,7 @@
$(externalsDir)\sqlite-3.8.3.1
$(externalsDir)\bzip2-1.0.6
$(externalsDir)\xz-5.0.5
+ $(externalsDir)\nasm-2.11.06
$(externalsDir)\openssl-1.0.1j
$(externalsDir)\tcl-8.6.1.0
$(externalsDir)\tk-8.6.1.0
@@ -77,6 +78,9 @@
$(lzmaDir)
+
+ $(nasmDir)
+
$(opensslDir)
diff -r c95ce9b0a085 PCbuild/readme.txt
--- a/PCbuild/readme.txt Fri Oct 31 13:13:09 2014 +0100
+++ b/PCbuild/readme.txt Fri Oct 31 12:35:36 2014 -0500
@@ -3,9 +3,8 @@
1. Install Microsoft Visual C++ 2010 SP1, any edition.
2. Install Subversion, and make sure 'svn.exe' is on your PATH.
-3. Install NASM, and make sure 'nasm.exe' is on your PATH.
-4. Run "build.bat -e" to build Python in 32-bit Release configuration.
-5. (Optional, but recommended) Run the test suite with "rt.bat -q".
+3. Run "build.bat -e" to build Python in 32-bit Release configuration.
+4. (Optional, but recommended) Run the test suite with "rt.bat -q".
Building Python using Microsoft Visual C++
@@ -225,7 +224,8 @@
to be somewhere on your PATH. More recent versions of OpenSSL may
need a later version of NASM. If OpenSSL's self tests don't pass,
you should first try to update NASM and do a full rebuild of
- OpenSSL.
+ OpenSSL. get_externals.py also downloads a snapshot of NASM, and the
+ ssl sub-project includes that version of nasm.exe on PATH.
The ssl sub-project expects your OpenSSL sources to have already
been configured and be ready to build. If you get your sources
diff -r c95ce9b0a085 PCbuild/ssl.vcxproj
--- a/PCbuild/ssl.vcxproj Fri Oct 31 13:13:09 2014 +0100
+++ b/PCbuild/ssl.vcxproj Fri Oct 31 12:35:36 2014 -0500
@@ -119,6 +119,7 @@
<_ProjectFileVersion>10.0.30319.1
+path $(SolutionDir)$(nasmDir);%PATH%
cd "$(SolutionDir)$(opensslDir)"
copy /Y crypto\buildinf_x86.h crypto\buildinf.h
copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h
@@ -133,6 +134,7 @@
$(NMakeAssemblySearchPath)
$(NMakeForcedUsingAssemblies)
+path $(SolutionDir)$(nasmDir);%PATH%
cd "$(SolutionDir)$(opensslDir)"
nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit
copy /Y crypto\buildinf_amd64.h crypto\buildinf.h
@@ -148,6 +150,7 @@
$(NMakeAssemblySearchPath)
$(NMakeForcedUsingAssemblies)
+path $(SolutionDir)$(nasmDir);%PATH%
cd "$(SolutionDir)$(opensslDir)"
copy /Y crypto\buildinf_x86.h crypto\buildinf.h
copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h
@@ -162,6 +165,7 @@
$(NMakeAssemblySearchPath)
$(NMakeForcedUsingAssemblies)
+path $(SolutionDir)$(nasmDir);%PATH%
cd "$(SolutionDir)$(opensslDir)"
nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit
copy /Y crypto\buildinf_amd64.h crypto\buildinf.h
@@ -177,6 +181,7 @@
$(NMakeAssemblySearchPath)
$(NMakeForcedUsingAssemblies)
+path $(SolutionDir)$(nasmDir);%PATH%
cd "$(SolutionDir)$(opensslDir)"
copy /Y crypto\buildinf_x86.h crypto\buildinf.h
copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h
@@ -191,6 +196,7 @@
$(NMakeAssemblySearchPath)
$(NMakeForcedUsingAssemblies)
+path $(SolutionDir)$(nasmDir);%PATH%
cd "$(SolutionDir)$(opensslDir)"
nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit
copy /Y crypto\buildinf_amd64.h crypto\buildinf.h
@@ -206,6 +212,7 @@
$(NMakeAssemblySearchPath)
$(NMakeForcedUsingAssemblies)
+path $(SolutionDir)$(nasmDir);%PATH%
cd "$(SolutionDir)$(opensslDir)"
copy /Y crypto\buildinf_x86.h crypto\buildinf.h
copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h
@@ -220,6 +227,7 @@
$(NMakeAssemblySearchPath)
$(NMakeForcedUsingAssemblies)
+path $(SolutionDir)$(nasmDir);%PATH%
cd "$(SolutionDir)$(opensslDir)"
nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit
copy /Y crypto\buildinf_amd64.h crypto\buildinf.h