diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-08-17 19:19:32 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-08-17 19:19:32 (GMT) |
| commit | 59e9ac8ebed57b5b96c51e2bf56f8953f2fd5e2a (patch) | |
| tree | 4f9418560e18b212aace2bf99a323c27887a5be7 | |
| parent | 4c6b0d5bec587770e0d83b550faae97fe251cc65 (diff) | |
| download | cpython-59e9ac8ebed57b5b96c51e2bf56f8953f2fd5e2a.zip cpython-59e9ac8ebed57b5b96c51e2bf56f8953f2fd5e2a.tar.gz cpython-59e9ac8ebed57b5b96c51e2bf56f8953f2fd5e2a.tar.bz2 | |
Merge 51340 and 51341 from 2.5 branch:
Leave tk build directory to restore original path.
Invoke debug mk1mf.pl after running Configure.
| -rw-r--r-- | PCbuild/build_ssl.py | 11 | ||||
| -rw-r--r-- | Tools/buildbot/external.bat | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 03f3d76..5ab3449 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -139,23 +139,26 @@ def main(): try: os.chdir(ssl_dir) # 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..." sys.stdout.flush() # Put our working Perl at the front of our path os.environ["PATH"] = os.path.dirname(perl) + \ os.pathsep + \ os.environ["PATH"] + run_configure(configure, do_script) 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) - run_configure(configure, do_script) # 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() - rc = os.system("nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)) + rc = os.system(makeCommand) if rc: print "Executing "+makefile+" failed" print rc diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat index c6d252d..463285f 100644 --- a/Tools/buildbot/external.bat +++ b/Tools/buildbot/external.bat @@ -28,6 +28,7 @@ if not exist tcl8.4.12 ( cd tk8.4.12\win
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install
+ cd ..\..
)
@rem sqlite
|