Recorded merge of revisions 84902 via svnmerge from

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)
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 0c4678b955d12ceb27af647906dcce6770d929e5..8a8dcb4e30b7cbe61bacb4543f0b734ab31478a5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -332,6 +332,8 @@ Tools/Demos
 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.
 

diff --git a/PC/VC6/build_ssl.py b/PC/VC6/build_ssl.py
index 3e96a5b5bb05e7f6a4f74f8ee15d660d8d70660f..c78a4655b6fb5df50251ea028787a2adc1ff6d26 100644 (file)
--- 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.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

diff --git a/PC/VS8.0/build_ssl.py b/PC/VS8.0/build_ssl.py
index ab5fcea8f57d132f453814e3dc792c03d5bff7ba..58de4231066604f007299e5986b9ea4a82095c17 100644 (file)
--- 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.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

diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 7fbacaf59f3bdc2e68ced5f1a09dc04c31e7c151..42c0017f9dc7218e22b34c02196787be30d3da18 100644 (file)
--- 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.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":
@@ -236,8 +236,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