[Python-checkins] r84904 - in python/branches/release27-maint: Misc/NEWS PC/VC6/build_ssl.py PC/VS8.0/build_ssl.py PCbuild/build_ssl.py

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Sun Sep 19 12:00:19 2010
New Revision: 84904

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/PC/VC6/build_ssl.py
   python/branches/release27-maint/PC/VS8.0/build_ssl.py
   python/branches/release27-maint/PCbuild/build_ssl.py

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sun Sep 19 12:00:19 2010
@@ -332,6 +332,8 @@
 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.
 

Modified: python/branches/release27-maint/PC/VC6/build_ssl.py
==============================================================================
--- python/branches/release27-maint/PC/VC6/build_ssl.py	(original)
+++ python/branches/release27-maint/PC/VC6/build_ssl.py	Sun Sep 19 12:00:19 2010
@@ -173,12 +173,12 @@
             #    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

Modified: python/branches/release27-maint/PC/VS8.0/build_ssl.py
==============================================================================
--- python/branches/release27-maint/PC/VS8.0/build_ssl.py	(original)
+++ python/branches/release27-maint/PC/VS8.0/build_ssl.py	Sun Sep 19 12:00:19 2010
@@ -220,8 +220,8 @@
             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 @@
                 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

Modified: python/branches/release27-maint/PCbuild/build_ssl.py
==============================================================================
--- python/branches/release27-maint/PCbuild/build_ssl.py	(original)
+++ python/branches/release27-maint/PCbuild/build_ssl.py	Sun Sep 19 12:00:19 2010
@@ -226,8 +226,8 @@
             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 @@
                 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