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

Merge 51340 and 51341 from 2.5 branch: 

Leave tk build directory to restore original path.
Invoke debug mk1mf.pl after running Configure.
This commit is contained in:
Martin v. Löwis 2006-08-17 19:19:32 +00:00
parent 4c6b0d5bec
commit 59e9ac8ebe
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PCbuild/build_ssl.py
View File

@ -139,23 +139,26 @@ def main():
try: try:
os.chdir(ssl_dir) os.chdir(ssl_dir)
# If the ssl makefiles do not exist, we invoke Perl to generate them. # If the ssl makefiles do not exist, we invoke Perl to generate them.
if not os.path.isfile(makefile): # Due to a bug in this script, the makefile sometimes ended up empty
# Force a regeneration if it is.
if not os.path.isfile(makefile) or os.path.getsize(makefile)==0:
print "Creating the makefiles..." print "Creating the makefiles..."
sys.stdout.flush() sys.stdout.flush()
# Put our working Perl at the front of our path # Put our working Perl at the front of our path
os.environ["PATH"] = os.path.dirname(perl) + \ os.environ["PATH"] = os.path.dirname(perl) + \
os.pathsep + \ os.pathsep + \
os.environ["PATH"] os.environ["PATH"]
run_configure(configure, do_script)
if arch=="x86" and debug: if arch=="x86" and debug:
# the do_masm script in openssl doesn't generate a debug # the do_masm script in openssl doesn't generate a debug
# build makefile so we generate it here: # build makefile so we generate it here:
os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile) os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
run_configure(configure, do_script)
# Now run make. # Now run make.
print "Executing nmake over the ssl makefiles..." makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
print "Executing ssl makefiles:", makeCommand
sys.stdout.flush() sys.stdout.flush()
rc = os.system("nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)) rc = os.system(makeCommand)
if rc: if rc:
print "Executing "+makefile+" failed" print "Executing "+makefile+" failed"
print rc print rc

1
Tools/buildbot/external.bat
View File

@ -28,6 +28,7 @@ if not exist tcl8.4.12 (
cd tk8.4.12\win cd tk8.4.12\win
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install
cd ..\..
) )
@rem sqlite @rem sqlite