r61136 - python/trunk/PCbuild/build_ssl.py python/trunk/PCbuild/readme.txt python/trunk/PCbuild/x64.vsprops

Author: martin.v.loewis Date: Fri Feb 29 19:54:45 2008 New Revision: 61136 Modified: python/trunk/PCbuild/build_ssl.py python/trunk/PCbuild/readme.txt python/trunk/PCbuild/x64.vsprops Log: Port build_ssl.py to 2.4; support HOST_PYTHON variable Modified: python/trunk/PCbuild/build_ssl.py ============================================================================== --- python/trunk/PCbuild/build_ssl.py (original) +++ python/trunk/PCbuild/build_ssl.py Fri Feb 29 19:54:45 2008 @@ -102,8 +102,11 @@ """ if not os.path.isfile(m32): return - with open(m32) as fin: - with open(makefile, 'w') as fout: + # 2.4 compatibility + fin = open(m32) + if 1: # with open(m32) as fin: + fout = open(makefile, 'w') + if 1: # with open(makefile, 'w') as fout: for line in fin: line = line.replace("=tmp32", "=tmp64") line = line.replace("=out32", "=out64") @@ -121,9 +124,13 @@ """ if not os.path.isfile(makefile): return - with open(makefile) as fin: + # 2.4 compatibility + fin = open(makefile) + if 1: # with open(makefile) as fin: lines = fin.readlines() - with open(makefile, 'w') as fout: + fin.close() + fout = open(makefile, 'w') + if 1: # with open(makefile, 'w') as fout: for line in lines: if line.startswith("PERL="): continue @@ -139,6 +146,7 @@ line = line + noalgo line = line + '\n' fout.write(line) + fout.close() def run_configure(configure, do_script): print("perl Configure "+configure) Modified: python/trunk/PCbuild/readme.txt ============================================================================== --- python/trunk/PCbuild/readme.txt (original) +++ python/trunk/PCbuild/readme.txt Fri Feb 29 19:54:45 2008 @@ -303,7 +303,8 @@ ------------------ The build process for AMD64 / x64 is very similar to standard builds. You just -have to set x64 as platform. +have to set x64 as platform. In addition, the HOST_PYTHON environment variable +must point to a Python interpreter (at least 2.4), to support cross-compilation. Building Python Using the free MS Toolkit Compiler -------------------------------------------------- Modified: python/trunk/PCbuild/x64.vsprops ============================================================================== --- python/trunk/PCbuild/x64.vsprops (original) +++ python/trunk/PCbuild/x64.vsprops Fri Feb 29 19:54:45 2008 @@ -15,4 +15,8 @@ Name="VCLinkerTool" TargetMachine="17" /> + <UserMacro + Name="PythonExe" + Value="$(HOST_PYTHON)" + /> </VisualStudioPropertySheet>
participants (1)
-
martin.v.loewis