diff options
| -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 | 10 |
4 files changed, 13 insertions, 15 deletions
@@ -216,8 +216,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 f2adab1..51f34b6 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 cb49767..867fd4c 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 6b682e4..a75c1fb 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -224,15 +224,15 @@ 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) # If the assembler files don't exist in tmpXX, copy them there if not os.path.exists("tmp"+dirsuffix): os.mkdir("tmp"+dirsuffix) for f in os.listdir("asm"+dirsuffix): if not f.endswith(".asm"): continue - shutil.copy2(r"asm%s\%s" % (dirsuffix, f), "tmp"+dirsuffix) + shutil.copy(r"asm%s\%s" % (dirsuffix, f), "tmp"+dirsuffix) # Now run make. if arch == "amd64": @@ -241,8 +241,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 |