Changeset 107165 in webkit

Timestamp:

Feb 8, 2012, 6:38:47 PM (15 years ago)

Author:

kov@webkit.org

Message:

Rubber-stamped by Martin Robinson.

• gtk/common.py:

(get_build_path): Move test for current directory being a valid
directory up so it takes precedence over WebKitBuild/Release and
WebKitBuild/Debug when they exist as well.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/common.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-08  Gustavo Noronha Silva  <gns@gnome.org>
+
+        Rubber-stamped by Martin Robinson.
+
+        * gtk/common.py:
+        (get_build_path): Move test for current directory being a valid
+        directory up so it takes precedence over WebKitBuild/Release and
+        WebKitBuild/Debug when they exist as well.
+
 2012-02-08  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Tools/gtk/common.py

@@ -43 +43 @@
         return os.path.exists(os.path.join(path, 'GNUmakefile'))
 
+    # Debian and Ubuntu build both flavours of the library (with gtk2
+    # and with gtk3); they use directories build-2.0 and build-3.0 for
+    # that, which is not handled by the above cases; we check that the
+    # directory where we are called from is a valid build directory,
+    # which should handle pretty much all other non-standard cases.
+    build_dir = os.getcwd()
+    if is_valid_build_directory(build_dir):
+        return build_dir
+
     build_types = ['Release', 'Debug']
     if '--debug' in sys.argv:
@@ -62 +71 @@
 
     build_dir = top_level_path("WebKitBuild")
-    if is_valid_build_directory(build_dir):
-        return build_dir
-
-    # Debian and Ubuntu build both flavours of the library (with gtk2
-    # and with gtk3); they use directories build-2.0 and build-3.0 for
-    # that, which is not handled by the above cases; we check that the
-    # directory where we are called from is a valid build directory,
-    # which should handle pretty much all other non-standard cases.
-    build_dir = os.getcwd()
     if is_valid_build_directory(build_dir):
         return build_dir