diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-21 16:25:21 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-21 16:25:21 (GMT) |
| commit | 63e9b5065337778cf069964743c3c7aca60e2000 (patch) | |
| tree | fc142ced258575bc7459efb1f9ace6a5a9407f5d | |
| parent | 285cd1609d7380514b18767f288f678a0a6bb7c2 (diff) | |
| download | cpython-63e9b5065337778cf069964743c3c7aca60e2000.zip cpython-63e9b5065337778cf069964743c3c7aca60e2000.tar.gz cpython-63e9b5065337778cf069964743c3c7aca60e2000.tar.bz2 | |
Recorded rollback of revisions 84902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PC/VC6/build_ssl.py | 8 | ||||
| -rw-r--r-- | PC/VS8.0/build_ssl.py | 8 | ||||
| -rw-r--r-- | PCbuild/build_ssl.py | 8 |
4 files changed, 12 insertions, 14 deletions
@@ -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. diff --git a/PC/VC6/build_ssl.py b/PC/VC6/build_ssl.py index c78a465..3e96a5b 100644 --- a/PC/VC6/build_ssl.py +++ b/PC/VC6/build_ssl.py @@ -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 diff --git a/PC/VS8.0/build_ssl.py b/PC/VS8.0/build_ssl.py index 58de423..ab5fcea 100644 --- a/PC/VS8.0/build_ssl.py +++ b/PC/VS8.0/build_ssl.py @@ -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 diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 42c0017..7fbacaf 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -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 |