Modified: trunk/Tools/ChangeLog (161418 => 161419)
--- trunk/Tools/ChangeLog 2014-01-07 11:59:46 UTC (rev 161418)
+++ trunk/Tools/ChangeLog 2014-01-07 12:52:22 UTC (rev 161419)
@@ -1,3 +1,16 @@
+2014-01-07 Alberto Garcia <[email protected]>
+
+ [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 <[email protected]>
[ATK] Expose aria-checked mixed state as ATK_STATE_INDETERMINATE
Modified: trunk/Tools/Scripts/run-launcher (161418 => 161419)
--- trunk/Tools/Scripts/run-launcher 2014-01-07 11:59:46 UTC (rev 161418)
+++ trunk/Tools/Scripts/run-launcher 2014-01-07 12:52:22 UTC (rev 161419)
@@ -38,7 +38,8 @@
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 @@
# 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;
