Skip to content
Permalink
Browse files
2010-03-18 Leandro Pereira <leandro@profusion.mobi>
        Reviewed by Kenneth Rohde Christiansen.

        Add support to run-launcher to open the EFL example browser.
        http://webkit.org/b/36181

        * Scripts/webkitdirs.pm:
        * Scripts/run-launcher:

Canonical link: https://commits.webkit.org/47454@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@56160 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eseidel committed Mar 18, 2010
1 parent 8da3ed3 commit 2a6893b982290acb5ad2fbb6c1267b8b9060b688
Showing with 44 additions and 8 deletions.
  1. +10 −0 WebKitTools/ChangeLog
  2. +4 −0 WebKitTools/Scripts/run-launcher
  3. +30 −8 WebKitTools/Scripts/webkitdirs.pm
@@ -1,3 +1,13 @@
2010-03-18 Leandro Pereira <leandro@profusion.mobi>

Reviewed by Kenneth Rohde Christiansen.

Add support to run-launcher to open the EFL example browser.
http://webkit.org/b/36181

* Scripts/webkitdirs.pm:
* Scripts/run-launcher:

2010-03-18 Sergio Villar Senin <svillar@igalia.com>

Reviewed by Xan Lopez.
@@ -64,6 +64,10 @@ if (isQt()) {
$launcherPath = catdir($launcherPath, "Programs", "GtkLauncher");
}

if (isEfl()) {
$launcherPath = catdir($launcherPath, "Programs", "EWebLauncher");
}

if (isWx()) {
if (isDarwin()) {
$launcherPath = catdir($launcherPath, 'wxBrowser.app', 'Contents', 'MacOS', 'wxBrowser');
@@ -63,6 +63,7 @@ my $isSymbian;
my %qtFeatureDefaults;
my $isGtk;
my $isWx;
my $isEfl;
my @wxArgs;
my $isChromium;
my $isInspectorFrontend;
@@ -245,6 +246,7 @@ sub argumentsForConfiguration()
push(@args, '--qt') if isQt();
push(@args, '--symbian') if isSymbian();
push(@args, '--gtk') if isGtk();
push(@args, '--efl') if isEfl();
push(@args, '--wx') if isWx();
push(@args, '--chromium') if isChromium();
push(@args, '--inspector-frontend') if isInspectorFrontend();
@@ -270,11 +272,11 @@ sub determineConfigurationProductDir
if (isAppleWinWebKit() && !isWx()) {
$configurationProductDir = "$baseProductDir/bin";
} else {
# [Gtk] We don't have Release/Debug configurations in straight
# [Gtk][Efl] We don't have Release/Debug configurations in straight
# autotool builds (non build-webkit). In this case and if
# WEBKITOUTPUTDIR exist, use that as our configuration dir. This will
# allows us to run run-webkit-tests without using build-webkit.
if ($ENV{"WEBKITOUTPUTDIR"} && isGtk()) {
if ($ENV{"WEBKITOUTPUTDIR"} && (isGtk() || isEfl())) {
$configurationProductDir = "$baseProductDir";
} else {
$configurationProductDir = "$baseProductDir/$configuration";
@@ -325,7 +327,7 @@ sub jscProductDir
my $productDir = productDir();
$productDir .= "/JavaScriptCore" if isQt();
$productDir .= "/$configuration" if (isQt() && isWindows());
$productDir .= "/Programs" if isGtk();
$productDir .= "/Programs" if (isGtk() || isEfl());

return $productDir;
}
@@ -563,6 +565,9 @@ sub builtDylibPathForName
if (isGtk()) {
return "$configurationProductDir/$libraryName/../.libs/libwebkit-1.0.so";
}
if (isEfl()) {
return "$configurationProductDir/$libraryName/../.libs/libewebkit.so";
}
if (isAppleMacWebKit()) {
return "$configurationProductDir/$libraryName.framework/Versions/A/$libraryName";
}
@@ -662,8 +667,8 @@ sub determineIsQt()
return;
}

# The presence of QTDIR only means Qt if --gtk is not on the command-line
if (isGtk() || isWx()) {
# The presence of QTDIR only means Qt if --gtk or --wx or --efl are not on the command-line
if (isGtk() || isWx() || isEfl()) {
$isQt = 0;
return;
}
@@ -683,6 +688,18 @@ sub determineIsSymbian()
$isSymbian = defined($ENV{'EPOCROOT'});
}

sub determineIsEfl()
{
return if defined($isEfl);
$isEfl = checkForArgumentAndRemoveFromARGV("--efl");
}

sub isEfl()
{
determineIsEfl();
return $isEfl;
}

sub isGtk()
{
determineIsGtk();
@@ -774,7 +791,7 @@ sub isLinux()

sub isAppleWebKit()
{
return !(isQt() or isGtk() or isWx() or isChromium());
return !(isQt() or isGtk() or isWx() or isChromium() or isEfl());
}

sub isAppleMacWebKit()
@@ -861,7 +878,7 @@ sub relativeScriptsDir()
sub launcherPath()
{
my $relativeScriptsPath = relativeScriptsDir();
if (isGtk() || isQt() || isWx()) {
if (isGtk() || isQt() || isWx() || isEfl()) {
return "$relativeScriptsPath/run-launcher";
} elsif (isAppleWebKit()) {
return "$relativeScriptsPath/run-safari";
@@ -878,6 +895,8 @@ sub launcherName()
return "wxBrowser";
} elsif (isAppleWebKit()) {
return "Safari";
} elsif (isEfl()) {
return "EWebLauncher";
}
}

@@ -900,7 +919,7 @@ sub checkRequiredSystemConfig
print "http://developer.apple.com/tools/xcode\n";
print "*************************************************************\n";
}
} elsif (isGtk() or isQt() or isWx()) {
} elsif (isGtk() or isQt() or isWx() or isEfl()) {
my @cmds = qw(flex bison gperf);
my @missing = ();
foreach my $cmd (@cmds) {
@@ -1045,6 +1064,9 @@ sub copyInspectorFrontendFiles
} elsif (isQt() || isGtk()) {
my $prefix = $ENV{"WebKitInstallationPrefix"};
$inspectorResourcesDirPath = (defined($prefix) ? $prefix : "/usr/share") . "/webkit-1.0/webinspector";
} elsif (isEfl()) {
my $prefix = $ENV{"WebKitInstallationPrefix"};
$inspectorResourcesDirPath = (defined($prefix) ? $prefix : "/usr/share") . "/ewebkit/webinspector";
}

if (! -d $inspectorResourcesDirPath) {

0 comments on commit 2a6893b

Please sign in to comment.