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

Recorded merge of revisions 84902 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84902 | hirokazu.yamamoto | 2010-09-19 18:24:20 +0900 | 1 line

  Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
........
This commit is contained in:
Hirokazu Yamamoto 2010-09-19 10:00:19 +00:00
parent 0dd078a736
commit 25278efac7
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -332,6 +332,8 @@ Tools/Demos
Build Build
----- -----
- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
- Issue #9810: Compile bzip2 source files in python's project file - Issue #9810: Compile bzip2 source files in python's project file
directly. It used to be built with bzip2's makefile. 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) # os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
fix_makefile(makefile) fix_makefile(makefile)
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch) shutil.copy2(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\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# Now run make. # Now run make.
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h") shutil.copy2(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\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % 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": if arch == "amd64":
create_makefile64(makefile, m32) create_makefile64(makefile, m32)
fix_makefile(makefile) fix_makefile(makefile)
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch) shutil.copy2(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\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# Now run make. # Now run make.
if arch == "amd64": if arch == "amd64":
@ -230,8 +230,8 @@ def main():
print("ml64 assembler has failed.") print("ml64 assembler has failed.")
sys.exit(rc) sys.exit(rc)
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h") shutil.copy2(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\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % makefile makeCommand = "nmake /nologo -f \"%s\"" % makefile

8
PCbuild/build_ssl.py
View file

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