Title: [107165] trunk/Tools
- Revision
- 107165
- Author
- [email protected]
- Date
- 2012-02-08 18:38:47 -0800 (Wed, 08 Feb 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (107164 => 107165)
--- trunk/Tools/ChangeLog 2012-02-09 02:28:31 UTC (rev 107164)
+++ trunk/Tools/ChangeLog 2012-02-09 02:38:47 UTC (rev 107165)
@@ -1,5 +1,14 @@
2012-02-08 Gustavo Noronha Silva <[email protected]>
+ 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 <[email protected]>
+
[GTK] doc rebasing does not respect DESTDIR
https://bugs.webkit.org/show_bug.cgi?id=78177
Modified: trunk/Tools/gtk/common.py (107164 => 107165)
--- trunk/Tools/gtk/common.py 2012-02-09 02:28:31 UTC (rev 107164)
+++ trunk/Tools/gtk/common.py 2012-02-09 02:38:47 UTC (rev 107165)
@@ -42,6 +42,15 @@
def is_valid_build_directory(path):
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:
build_types.reverse()
@@ -64,15 +73,6 @@
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
-
print 'Could not determine build directory.'
sys.exit(1)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
