Changeset 70720 in webkit

Timestamp:

Oct 27, 2010 3:37:43 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-10-27 Eric Seidel <​eric@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.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (2 diffs)
• Scripts/print-vse-failure-logs (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-27  Eric Seidel  <eric@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@chromium.org>
 

trunk/WebKitTools/Scripts/build-webkit

@@ -524 +524 @@
         }
     }
+    # Various build* calls above may change the CWD.
+    chdirWebKit();
 
     if (exitStatus($result)) {
@@ -540 +542 @@
         exit exitStatus($result);
     }
-    chdirWebKit();
 }
 

trunk/WebKitTools/Scripts/print-vse-failure-logs

@@ -49 +49 @@
     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:
@@ -57 +56 @@
         return build_log_paths
 
+    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.
+        # 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):
-        # 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)
+        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: