[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2f71afb107a1df248b10b9e3bba92db3c400b2dc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 22:37:43 2010 +0000

    2010-10-27  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.
    
            build-webkit should collect Visual Studio Express logs and display them
            https://bugs.webkit.org/show_bug.cgi?id=39199
    
            It turns out my previous patch wasn't actually working on the win-ews
            machine.  So I've fixed my mistakes from before.
    
            * Scripts/build-webkit:
             - Windows VSE builds change the CWD while building.  Why?  Who knows.
            * Scripts/print-vse-failure-logs:
             - windows VSE builds don't use Debug/Release as I expected, so I've
               moved off of --configuration to --top-level and added the /obj
               optimization while I was there.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70720 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1ab9c5c..713b0ac 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-27  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.
+
+        build-webkit should collect Visual Studio Express logs and display them
+        https://bugs.webkit.org/show_bug.cgi?id=39199
+
+        It turns out my previous patch wasn't actually working on the win-ews
+        machine.  So I've fixed my mistakes from before.
+
+        * Scripts/build-webkit:
+         - Windows VSE builds change the CWD while building.  Why?  Who knows.
+        * Scripts/print-vse-failure-logs:
+         - windows VSE builds don't use Debug/Release as I expected, so I've
+           moved off of --configuration to --top-level and added the /obj
+           optimization while I was there.
+
 2010-10-27  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Unreviewed, rolling out r70674.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 31a0335..eb7794f 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -523,6 +523,8 @@ for my $dir (@projects) {
             $result = buildVisualStudioProject("win/WebKit.vcproj/WebKit.sln", $clean);
         }
     }
+    # Various build* calls above may change the CWD.
+    chdirWebKit();
 
     if (exitStatus($result)) {
         my $scriptDir = relativeScriptsDir();
@@ -539,7 +541,6 @@ for my $dir (@projects) {
         }
         exit exitStatus($result);
     }
-    chdirWebKit();
 }
 
 # Don't report the "WebKit is now built" message after a clean operation.
diff --git a/WebKitTools/Scripts/print-vse-failure-logs b/WebKitTools/Scripts/print-vse-failure-logs
index 37103ee..cec806e 100755
--- a/WebKitTools/Scripts/print-vse-failure-logs
+++ b/WebKitTools/Scripts/print-vse-failure-logs
@@ -48,7 +48,6 @@ class PrintVisualStudioExpressLogs(object):
 
     def _find_buildlogs(self, build_directory):
         build_log_paths = []
-        # FIXME: Walking the obj/ root under the build directory might be faster.
         for dirpath, dirnames, filenames in os.walk(build_directory):
             for file_name in filenames:
                 if file_name == "BuildLog.htm":
@@ -56,12 +55,20 @@ class PrintVisualStudioExpressLogs(object):
                     build_log_paths.append(file_path)
         return build_log_paths
 
-    def main(self):
+    def _obj_directory(self):
+        scripts_directory = os.path.dirname(__file__)
+        build_directory_script_path = os.path.join(scripts_directory, "webkit-build-directory")
         # FIXME: ports/webkit.py should provide the build directory in a nice API.
-        build_directory = self._executive.run_command(["webkit-build-directory", "--configuration"]).rstrip()
-        build_log_paths = self._find_buildlogs(build_directory)
+        # NOTE: The windows VSE build does not seem to use different directories
+        # for Debug and Release.
+        build_directory = self._executive.run_command([build_directory_script_path, "--top-level"]).rstrip()
+        return os.path.join(build_directory, "obj")
+
+    def main(self):
+        obj_directory = self._obj_directory()
+        build_log_paths = self._find_buildlogs(obj_directory)
 
-        print "Found %s Visual Studio Express Build Logs:%s" % (len(build_log_paths), "\n".join(build_log_paths))
+        print "Found %s Visual Studio Express Build Logs:\n%s" % (len(build_log_paths), "\n".join(build_log_paths))
 
         for build_log_path in build_log_paths:
             print "%s:\n" % build_log_path

-- 
WebKit Debian packaging