From c142d49650f6697c6ae1683146c193818b8ce84d Mon Sep 17 00:00:00 2001 From: "mrobinson@webkit.org" Date: Tue, 3 Apr 2012 18:54:54 +0000 Subject: [PATCH 1/1] [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. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@113066 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 13 +++++++++++++ Tools/gtk/run-with-jhbuild | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 5d9b75b..7653a1a 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,16 @@ +2012-04-03 Martin Robinson + + [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-04-03 Sudarsana Nagineni [EFL] DRT support for setInteractiveFormValidationEnabled diff --git a/Tools/gtk/run-with-jhbuild b/Tools/gtk/run-with-jhbuild index 9ff0034..34fee1b 100755 --- a/Tools/gtk/run-with-jhbuild +++ b/Tools/gtk/run-with-jhbuild @@ -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) -- 1.8.3.1