[GTK][EFL] Use function jhbuildWrapperPrefixIfNeeded to run launcher

https://bugs.webkit.org/show_bug.cgi?id=117275

Reviewed by Carlos Garcia Campos.

If we are not using the internal jhbuild we must not use the
jhbuild-wrapper script, else it will try to download and install
it.

* Scripts/run-launcher:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2e919e2..6d4c14e 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2014-01-07  Alberto Garcia  <berto@igalia.com>
+
+        [GTK][EFL] Use function jhbuildWrapperPrefixIfNeeded to run launcher
+        https://bugs.webkit.org/show_bug.cgi?id=117275
+
+        Reviewed by Carlos Garcia Campos.
+
+        If we are not using the internal jhbuild we must not use the
+        jhbuild-wrapper script, else it will try to download and install
+        it.
+
+        * Scripts/run-launcher:
+
 2014-01-07  Krzysztof Czech  <k.czech@samsung.com>
 
         [ATK] Expose aria-checked mixed state as ATK_STATE_INDETERMINATE

diff --git a/Tools/Scripts/run-launcher b/Tools/Scripts/run-launcher
index b89611f..ca05261 100755 (executable)
--- a/Tools/Scripts/run-launcher
+++ b/Tools/Scripts/run-launcher
@@ -38,7 +38,8 @@ use webkitdirs;
 
 setConfiguration();
 my $productDir = productDir();
-my $launcherPath = productDir();
+my $launcherPath;
+my @jhbuildWrapper;
 
 # Check to see that all the frameworks are built.
 checkFrameworks();
@@ -46,25 +47,25 @@ checkFrameworks();
 # Set paths according to the build system used
 if (isGtk()) {
     if (isWK2()) {
-        unshift(@ARGV, catdir($launcherPath, "Programs", "MiniBrowser"));
+        $launcherPath = catdir($productDir, "Programs", "MiniBrowser");
     } else {
-        unshift(@ARGV, catdir($launcherPath, "Programs", "GtkLauncher"));
+        $launcherPath = catdir($productDir, "Programs", "GtkLauncher");
     }
-    $launcherPath = catdir(sourceDir(), "Tools", "jhbuild", "jhbuild-wrapper");
-    unshift(@ARGV, ("--gtk", "run"));
 }
 
 if (isEfl()) {
     if (isWK2()) {
-        unshift(@ARGV, catdir($launcherPath, "bin", "MiniBrowser"));
+        $launcherPath = catdir($productDir, "bin", "MiniBrowser");
     } else {
-        unshift(@ARGV, catdir($launcherPath, "bin", "EWebLauncher"));
+        $launcherPath = catdir($productDir, "bin", "EWebLauncher");
     }
-    $launcherPath = catdir(sourceDir(), "Tools", "jhbuild", "jhbuild-wrapper");
-    unshift(@ARGV, ("--efl", "run"));
 }
 
+$launcherPath && -x $launcherPath or die "Can't find the launcher command";
+
+@jhbuildWrapper = jhbuildWrapperPrefixIfNeeded();
+
 print "Starting webkit launcher.\n";
 
-exec $launcherPath, @ARGV or die;
+exec @jhbuildWrapper, $launcherPath, @ARGV or die;