Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)

This commit is contained in:
Hirokazu Yamamoto 2010-09-19 09:24:20 +00:00
parent 490014ba4d
commit ba45c2b6a7
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -197,6 +197,8 @@ Tests
Build
-----
- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
- Issue #9810: Compile bzip2 source files in python's project file
directly. It used to be built with bzip2's makefile.

8
PC/VC6/build_ssl.py
View File

@ -173,12 +173,12 @@ def main():
# os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
fix_makefile(makefile)
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# Now run make.
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % makefile

8
PC/VS8.0/build_ssl.py
View File

@ -220,8 +220,8 @@ def main():
if arch == "amd64":
create_makefile64(makefile, m32)
fix_makefile(makefile)
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# Now run make.
if arch == "amd64":
@ -230,8 +230,8 @@ def main():
print("ml64 assembler has failed.")
sys.exit(rc)
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % makefile

10
PCbuild/build_ssl.py
View File

@ -224,15 +224,15 @@ def main():
if arch == "amd64":
create_makefile64(makefile, m32)
fix_makefile(makefile)
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# If the assembler files don't exist in tmpXX, copy them there
if not os.path.exists("tmp"+dirsuffix):
os.mkdir("tmp"+dirsuffix)
for f in os.listdir("asm"+dirsuffix):
if not f.endswith(".asm"): continue
shutil.copy(r"asm%s\%s" % (dirsuffix, f), "tmp"+dirsuffix)
shutil.copy2(r"asm%s\%s" % (dirsuffix, f), "tmp"+dirsuffix)
# Now run make.
if arch == "amd64":
@ -241,8 +241,8 @@ def main():
print("ml64 assembler has failed.")
sys.exit(rc)
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % makefile