Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ba45c2b

Browse files
author
Hirokazu Yamamoto
committed
Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
1 parent 490014b commit ba45c2b

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ Tests
197197
Build
198198
-----
199199

200+
- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
201+
200202
- Issue #9810: Compile bzip2 source files in python's project file
201203
directly. It used to be built with bzip2's makefile.
202204

‎PC/VC6/build_ssl.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ def main():
173173
# os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
174174

175175
fix_makefile(makefile)
176-
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
177-
shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
176+
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
177+
shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
178178

179179
# Now run make.
180-
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
181-
shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
180+
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
181+
shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
182182

183183
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
184184
makeCommand = "nmake /nologo -f \"%s\"" % makefile

‎PC/VS8.0/build_ssl.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ def main():
220220
if arch == "amd64":
221221
create_makefile64(makefile, m32)
222222
fix_makefile(makefile)
223-
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
224-
shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
223+
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
224+
shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
225225

226226
# Now run make.
227227
if arch == "amd64":
@@ -230,8 +230,8 @@ def main():
230230
print("ml64 assembler has failed.")
231231
sys.exit(rc)
232232

233-
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
234-
shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
233+
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
234+
shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
235235

236236
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
237237
makeCommand = "nmake /nologo -f \"%s\"" % makefile

‎PCbuild/build_ssl.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@ def main():
224224
if arch == "amd64":
225225
create_makefile64(makefile, m32)
226226
fix_makefile(makefile)
227-
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
228-
shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
227+
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
228+
shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
229229

230230
# If the assembler files don't exist in tmpXX, copy them there
231231
if not os.path.exists("tmp"+dirsuffix):
232232
os.mkdir("tmp"+dirsuffix)
233233
for f in os.listdir("asm"+dirsuffix):
234234
if not f.endswith(".asm"): continue
235-
shutil.copy(r"asm%s\%s" % (dirsuffix, f), "tmp"+dirsuffix)
235+
shutil.copy2(r"asm%s\%s" % (dirsuffix, f), "tmp"+dirsuffix)
236236

237237
# Now run make.
238238
if arch == "amd64":
@@ -241,8 +241,8 @@ def main():
241241
print("ml64 assembler has failed.")
242242
sys.exit(rc)
243243

244-
shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
245-
shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
244+
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
245+
shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
246246

247247
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
248248
makeCommand = "nmake /nologo -f \"%s\"" % makefile

0 commit comments

Comments
 (0)