traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Recorded rollback of revisions 84902 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k
This commit is contained in:
Hirokazu Yamamoto 2010-09-21 16:25:21 +00:00
parent 285cd1609d
commit 63e9b50653
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -334,8 +334,6 @@ Build
- Issue #1633863: Don't ignore $CC under AIX.
- 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.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# Now run make.
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy(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.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
shutil.copy(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.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
shutil.copy(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
PCbuild/build_ssl.py
View File

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