Recorded rollback of revisions 84902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
diff --git a/Misc/NEWS b/Misc/NEWS
index 64d15e2..dfa9bd6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -334,8 +334,6 @@
- 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 @@
# 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 @@
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 @@
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 @@
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 @@
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