mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert r84902 before committing better solution.

Browse source
This commit is contained in:
Hirokazu Yamamoto 2010-09-21 16:05:47 +00:00
parent f6350d2654
commit e31f7d9e2e
4 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -216,8 +216,6 @@ Build
- Issue #1633863: Don't ignore $CC under AIX. - 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 - Issue #9810: Compile bzip2 source files in python's project file
directly. It used to be built with bzip2's makefile. directly. It used to be built with bzip2's makefile.

8
PC/VC6/build_ssl.py
View file

@ -173,12 +173,12 @@ def main():
# os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile) # os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
fix_makefile(makefile) fix_makefile(makefile)
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch) shutil.copy(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\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# Now run make. # Now run make.
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h") shutil.copy(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\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % makefile makeCommand = "nmake /nologo -f \"%s\"" % makefile

8
PC/VS8.0/build_ssl.py
View file

@ -220,8 +220,8 @@ def main():
if arch == "amd64": if arch == "amd64":
create_makefile64(makefile, m32) create_makefile64(makefile, m32)
fix_makefile(makefile) fix_makefile(makefile)
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch) shutil.copy(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\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# Now run make. # Now run make.
if arch == "amd64": if arch == "amd64":
@ -230,8 +230,8 @@ def main():
print("ml64 assembler has failed.") print("ml64 assembler has failed.")
sys.exit(rc) sys.exit(rc)
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h") shutil.copy(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\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % makefile makeCommand = "nmake /nologo -f \"%s\"" % makefile

10
PCbuild/build_ssl.py
View file

@ -224,15 +224,15 @@ def main():
if arch == "amd64": if arch == "amd64":
create_makefile64(makefile, m32) create_makefile64(makefile, m32)
fix_makefile(makefile) fix_makefile(makefile)
shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch) shutil.copy(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\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# If the assembler files don't exist in tmpXX, copy them there # If the assembler files don't exist in tmpXX, copy them there
if not os.path.exists("tmp"+dirsuffix): if not os.path.exists("tmp"+dirsuffix):
os.mkdir("tmp"+dirsuffix) os.mkdir("tmp"+dirsuffix)
for f in os.listdir("asm"+dirsuffix): for f in os.listdir("asm"+dirsuffix):
if not f.endswith(".asm"): continue 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. # Now run make.
if arch == "amd64": if arch == "amd64":
@ -241,8 +241,8 @@ def main():
print("ml64 assembler has failed.") print("ml64 assembler has failed.")
sys.exit(rc) sys.exit(rc)
shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h") shutil.copy(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\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % makefile makeCommand = "nmake /nologo -f \"%s\"" % makefile