diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-19 10:00:19 +0000 |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-19 10:00:19 +0000 |
| commit | cfade738eb0926236bc0129afad08dfd6410b0e2 (patch) | |
| tree | b9ad274d224eb877fef27fda46a2e1278a125c68 /PC | |
| parent | a808f66a6683ada316b8fdc2b388e10d9666ae1a (diff) | |
| download | cpython-cfade738eb0926236bc0129afad08dfd6410b0e2.tar.gz | |
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)
........
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VC6/build_ssl.py | 8 | ||||
| -rw-r--r-- | PC/VS8.0/build_ssl.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/PC/VC6/build_ssl.py b/PC/VC6/build_ssl.py index 3e96a5b5bb..c78a4655b6 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.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 ab5fcea8f5..58de423106 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.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 |