Title: [116881] releases/WebKitGTK/webkit-1.8/Tools
- Revision
- 116881
- Author
- [email protected]
- Date
- 2012-05-13 06:42:21 -0700 (Sun, 13 May 2012)
Log Message
Merge 113066 - [GTK] Tools/Scripts/run-gtk-tests should not force you to use the WebKit jhbuild
https://bugs.webkit.org/show_bug.cgi?id=82473
Reviewed by Philippe Normand.
Only use jhbuild if WebKitBuild/Dependencies exists (if update-webkitgtk-libs)
was ever run.
* gtk/run-with-jhbuild: Instead of using jhbuild unconditionally, first
check if the user has ever run update-gtk-libs and, if so, then use jhbuild.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (116880 => 116881)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:42:08 UTC (rev 116880)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:42:21 UTC (rev 116881)
@@ -1,3 +1,16 @@
+2012-04-03 Martin Robinson <[email protected]>
+
+ [GTK] Tools/Scripts/run-gtk-tests should not force you to use the WebKit jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=82473
+
+ Reviewed by Philippe Normand.
+
+ Only use jhbuild if WebKitBuild/Dependencies exists (if update-webkitgtk-libs)
+ was ever run.
+
+ * gtk/run-with-jhbuild: Instead of using jhbuild unconditionally, first
+ check if the user has ever run update-gtk-libs and, if so, then use jhbuild.
+
2012-03-26 Raphael Kubo da Costa <[email protected]>
[jhbuild] Prepend jhbuildrc's directory to sys.path instead of appending.
Modified: releases/WebKitGTK/webkit-1.8/Tools/gtk/run-with-jhbuild (116880 => 116881)
--- releases/WebKitGTK/webkit-1.8/Tools/gtk/run-with-jhbuild 2012-05-13 13:42:08 UTC (rev 116880)
+++ releases/WebKitGTK/webkit-1.8/Tools/gtk/run-with-jhbuild 2012-05-13 13:42:21 UTC (rev 116881)
@@ -18,10 +18,13 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import common
+import os
import subprocess
import sys
-jhbuild_wrapper = common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper')
-process = subprocess.Popen([jhbuild_wrapper, '--gtk', 'run'] + sys.argv[1:])
+if not os.path.exists(common.top_level_path('WebKitBuild', 'Dependencies')):
+ process = subprocess.Popen(sys.argv[1:])
+else:
+ process = subprocess.Popen([common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper'), '--gtk', 'run'] + sys.argv[1:])
process.wait()
sys.exit(process.returncode)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
