Merge 51340 and 51341 from 2.5 branch:

Leave tk build directory to restore original path.
Invoke debug mk1mf.pl after running Configure.

diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 03f3d767c1e8040a1155a977c9a99affa80bfa17..5ab34498a846248d3dff1bf43b8127780e65107b 100644 (file)
--- 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 c6d252ddb9ef7cfc00cdbbf9a5e003e026968285..463285fa4989bac9b3dcad662efa2d2abe22d8c6 100644 (file)
--- 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\r
    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12\r
    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install\r
+   cd ..\..\r
 )\r
 \r
 @rem sqlite\r