- Revision
- 125862
- Author
- [email protected]
- Date
- 2012-08-16 23:32:39 -0700 (Thu, 16 Aug 2012)
Log Message
[jhbuild] EFL now runs jhbuild update for every build
https://bugs.webkit.org/show_bug.cgi?id=94267
Patch by Gustavo Noronha Silva <[email protected]> on 2012-08-16
Reviewed by Dirk Pranke.
This change makes EFL's approach to jhbuild more in line with the one
used by WebKitGTK+. update-webkitefl-libs will only be called by build-
webkit if --update-efl is given explicitly. The EWS bot will do that
from now on.
* Scripts/webkitdirs.pm:
(jhbuildWrapperPrefixIfNeeded): return jhbuild wrapper only if the
Dependencies directory exists also for EFL
(generateBuildSystemFromCMakeProject): no longer run update-webkitefl-libs
(buildCMakeProjectOrExit): build update-webkitefl-libs if --update-efl is
given
* Scripts/webkitpy/common/config/ports.py:
(EflPort.build_webkit_command): make EWS bots pass --update-efl to build-webkit
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_efl_port): add unit testing for EFL port
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125861 => 125862)
--- trunk/Tools/ChangeLog 2012-08-17 06:23:50 UTC (rev 125861)
+++ trunk/Tools/ChangeLog 2012-08-17 06:32:39 UTC (rev 125862)
@@ -1,3 +1,26 @@
+2012-08-16 Gustavo Noronha Silva <[email protected]>
+
+ [jhbuild] EFL now runs jhbuild update for every build
+ https://bugs.webkit.org/show_bug.cgi?id=94267
+
+ Reviewed by Dirk Pranke.
+
+ This change makes EFL's approach to jhbuild more in line with the one
+ used by WebKitGTK+. update-webkitefl-libs will only be called by build-
+ webkit if --update-efl is given explicitly. The EWS bot will do that
+ from now on.
+
+ * Scripts/webkitdirs.pm:
+ (jhbuildWrapperPrefixIfNeeded): return jhbuild wrapper only if the
+ Dependencies directory exists also for EFL
+ (generateBuildSystemFromCMakeProject): no longer run update-webkitefl-libs
+ (buildCMakeProjectOrExit): build update-webkitefl-libs if --update-efl is
+ given
+ * Scripts/webkitpy/common/config/ports.py:
+ (EflPort.build_webkit_command): make EWS bots pass --update-efl to build-webkit
+ * Scripts/webkitpy/common/config/ports_unittest.py:
+ (DeprecatedPortTest.test_efl_port): add unit testing for EFL port
+
2012-08-16 Kent Tamura <[email protected]>
Add [email protected] as a contributor.
Modified: trunk/Tools/Scripts/webkitdirs.pm (125861 => 125862)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-08-17 06:23:50 UTC (rev 125861)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-08-17 06:32:39 UTC (rev 125862)
@@ -2070,15 +2070,15 @@
sub jhbuildWrapperPrefixIfNeeded()
{
- if (isEfl()) {
- return File::Spec->catfile(sourceDir(), "Tools", "efl", "run-with-jhbuild");
- } elsif (isGtk()) {
- if (-e getJhbuildPath()) {
+ if (-e getJhbuildPath()) {
+ if (isEfl()) {
+ return File::Spec->catfile(sourceDir(), "Tools", "efl", "run-with-jhbuild");
+ } elsif (isGtk()) {
return File::Spec->catfile(sourceDir(), "Tools", "gtk", "run-with-jhbuild");
}
- return "env";
}
- return "";
+
+ return "env";
}
sub removeCMakeCache()
@@ -2117,10 +2117,6 @@
$ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
}
- if (isEfl()) {
- system("perl", "$sourceDir/Tools/Scripts/update-webkitefl-libs") == 0 or die $!;
- }
-
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
# parsed for shell metacharacters.
my $wrapper = jhbuildWrapperPrefixIfNeeded() . " ";
@@ -2164,6 +2160,11 @@
exit(exitStatus(cleanCMakeGeneratedProject())) if $clean;
+ if (isEfl() && checkForArgumentAndRemoveFromARGV("--update-efl")) {
+ system("perl", "$sourceDir/Tools/Scripts/update-webkitefl-libs") == 0 or die $!;
+ }
+
+
$returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
exit($returnCode) if $returnCode;
$returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (125861 => 125862)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2012-08-17 06:23:50 UTC (rev 125861)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2012-08-17 06:32:39 UTC (rev 125862)
@@ -160,6 +160,7 @@
def build_webkit_command(self, build_style=None):
command = super(EflPort, self).build_webkit_command(build_style=build_style)
command.append("--efl")
+ command.append("--update-efl")
command.append(super(EflPort, self).makeArgs())
return command
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (125861 => 125862)
--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2012-08-17 06:23:50 UTC (rev 125861)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2012-08-17 06:32:39 UTC (rev 125862)
@@ -46,6 +46,11 @@
self.assertEquals(GtkPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
self.assertEquals(GtkPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
+ def test_efl_port(self):
+ self.assertEquals(EflPort().flag(), "--port=efl")
+ self.assertEquals(EflPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--efl", "--update-efl", DeprecatedPort().makeArgs()])
+ self.assertEquals(EflPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--efl", "--update-efl", DeprecatedPort().makeArgs()])
+
def test_qt_port(self):
self.assertEquals(QtPort().flag(), "--port=qt")
self.assertEquals(QtPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests"))
