traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Copy asm files into place.

This commit is contained in:
Martin v. Löwis 2010-07-31 10:49:53 +00:00
parent 014e0ca58e
commit 26d3fc1738
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PCbuild/build_ssl.py
View File

@ -163,12 +163,14 @@ def main():
do_script = "ms\\do_nasm" do_script = "ms\\do_nasm"
makefile="ms\\nt.mak" makefile="ms\\nt.mak"
m32 = makefile m32 = makefile
dirsuffix = "32"
elif sys.argv[2] == "x64": elif sys.argv[2] == "x64":
arch="amd64" arch="amd64"
configure = "VC-WIN64A" configure = "VC-WIN64A"
do_script = "ms\\do_win64a" do_script = "ms\\do_win64a"
makefile = "ms\\nt64.mak" makefile = "ms\\nt64.mak"
m32 = makefile.replace('64', '') m32 = makefile.replace('64', '')
dirsuffix = "64"
#os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON" #os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
else: else:
raise ValueError(str(sys.argv)) raise ValueError(str(sys.argv))
@ -225,6 +227,13 @@ def main():
shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%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) 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.copy(r"asm%s\%s" % (dirsuffix, f), "tmp"+dirsuffix)
# Now run make. # Now run make.
if arch == "amd64": if arch == "amd64":
rc = os.system("ml64 -c -Foms\\uptable.obj ms\\uptable.asm") rc = os.system("ml64 -c -Foms\\uptable.obj ms\\uptable.asm")