From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 31 Jul 2010 10:49:53 +0000 (+0000)
Subject: Copy asm files into place.
X-Git-Tag: v3.2a1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26d3fc1738ebb2f1dd097009bca44acc1f7362cd;p=python

Copy asm files into place.
---

diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 498b48ecfd..a75c1fbef3 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -163,12 +163,14 @@ def main():
         do_script = "ms\\do_nasm"
         makefile="ms\\nt.mak"
         m32 = makefile
+        dirsuffix = "32"
     elif sys.argv[2] == "x64":
         arch="amd64"
         configure = "VC-WIN64A"
         do_script = "ms\\do_win64a"
         makefile = "ms\\nt64.mak"
         m32 = makefile.replace('64', '')
+        dirsuffix = "64"
         #os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
     else:
         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\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.
         if arch == "amd64":
             rc = os.system("ml64 -c -Foms\\uptable.obj ms\\uptable.asm")