From: Christian Heimes Date: Fri, 23 Nov 2007 07:05:03 +0000 (+0000) Subject: Backport of PCbuild9 fixes from py3k r59130 X-Git-Tag: v2.6a1~1020 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2336111aef67cf9946a468b757bcebbfcad713de;p=python Backport of PCbuild9 fixes from py3k r59130 --- diff --git a/PCbuild9/_ssl.vcproj b/PCbuild9/_ssl.vcproj index de329956c9..ddd396ae5c 100644 --- a/PCbuild9/_ssl.vcproj +++ b/PCbuild9/_ssl.vcproj @@ -27,7 +27,7 @@ > "+makefile) + if debug: + print("OpenSSL debug builds aren't supported.") + #if arch=="x86" and debug: + # # the do_masm script in openssl doesn't generate a debug + # # build makefile so we generate it here: + # os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile) + + if arch == "amd64": + create_makefile64(makefile, m32) + fix_makefile(makefile) + 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": - fix_makefile(makefile, m32) + rc = os.system(r"ml64 -c -Foms\uptable.obj ms\uptable.asm") + if rc: + print("ml64 assembler has failed.") + sys.exit(rc) - # Now run make. - makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) + 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 print("Executing ssl makefiles:", makeCommand) sys.stdout.flush() rc = os.system(makeCommand) diff --git a/PCbuild9/pginstrument.vsprops b/PCbuild9/pginstrument.vsprops index 1b08c5d552..cd904d3f4c 100644 --- a/PCbuild9/pginstrument.vsprops +++ b/PCbuild9/pginstrument.vsprops @@ -8,10 +8,21 @@ > + diff --git a/PCbuild9/pyd_d.vsprops b/PCbuild9/pyd_d.vsprops index 3113381daa..ea9041794c 100644 --- a/PCbuild9/pyd_d.vsprops +++ b/PCbuild9/pyd_d.vsprops @@ -24,4 +24,8 @@ Name="VCPostBuildEventTool" CommandLine="" /> +