Changeset 45197 in webkit

Timestamp:

Jun 25, 2009 2:52:21 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-06-25 Eric Seidel <​eric@webkit.org>

Reviewed by Mark Rowe.

Call WebKitTools/Scripts scripts by their absolute paths
​https://bugs.webkit.org/show_bug.cgi?id=26704

bugzilla-tool used to use whatever build-webkit was in your path.
That could end up building the wrong copy of WebKit.

• Scripts/bugzilla-tool:
• Scripts/modules/scm.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/modules/scm.py (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-06-25  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Call WebKitTools/Scripts scripts by their absolute paths
+        https://bugs.webkit.org/show_bug.cgi?id=26704
+
+        bugzilla-tool used to use whatever build-webkit was in your path.
+        That could end up building the wrong copy of WebKit.
+
+        * Scripts/bugzilla-tool:
+        * Scripts/modules/scm.py:
+
 2009-06-25  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -236 +236 @@
     @staticmethod
     def run_and_throw_if_fail(script_name):
-        build_webkit_process = subprocess.Popen(script_name, shell=True)
+        build_webkit_process = subprocess.Popen(script_name)
         return_code = build_webkit_process.wait()
         if return_code:
@@ -242 +242 @@
 
     @classmethod
+    def run_webkit_script(cls, script_name):
+        # We might need to pass scm into this function for scm.checkout_root
+        cls.run_and_throw_if_fail(os.path.join("WebKitTools", "Scripts", script_name))
+
+    @classmethod
     def build_webkit(cls):
-        cls.run_and_throw_if_fail("build-webkit")
+        cls.run_webkit_script("build-webkit")
 
     @classmethod
     def run_webkit_tests(cls):
-        cls.run_and_throw_if_fail("run-webkit-tests")
+        cls.run_webkit_script("run-webkit-tests")
 
     @staticmethod

trunk/WebKitTools/Scripts/modules/scm.py

@@ -71 +71 @@
         return output
 
+    def script_path(self, script_name):
+        return os.path.join(self.checkout_root, "WebKitTools", "Scripts", script_name)
+
     def ensure_clean_working_directory(self, force):
         if not force and not self.working_directory_is_clean():
@@ -93 +96 @@
         # We should detect and handle that case.
         curl_process = subprocess.Popen(['curl', patch['url']], stdout=subprocess.PIPE)
-        patch_apply_process = subprocess.Popen(['svn-apply', '--reviewer', patch['reviewer']], stdin=curl_process.stdout)
+        patch_apply_process = subprocess.Popen([self.script_path('svn-apply'), '--reviewer', patch['reviewer']], stdin=curl_process.stdout)
 
         return_code = patch_apply_process.wait()
@@ -189 +192 @@
 
     def update_webkit(self):
-        self.run_command("update-webkit")
+        self.run_command(self.script_path("update-webkit"))
 
     def status_command(self):
@@ -208 +211 @@
 
     def create_patch_command(self):
-        return "svn-create-patch"
+        return self.script_path("svn-create-patch")
 
     def commit_with_message(self, message):