Title: [152191] trunk/Tools
- Revision
- 152191
- Author
- [email protected]
- Date
- 2013-06-28 15:21:03 -0700 (Fri, 28 Jun 2013)
Log Message
[Tools] Add support for "webKitBranchBuild" git option when calculating jhbuildPath
https://bugs.webkit.org/show_bug.cgi?id=118195
Patch by Nick Diego Yamane <[email protected]> on 2013-06-28
Reviewed by Daniel Bates.
Currently, ports that use jhbuild fail to determine jhbuild directory
when "webKitBranchBuild" git configuration property is enabled. To reproduce
that issue in Efl port, enable that flag in .git/config, switch to a git branch
other than "master" and try to build webkit. The build will fail to
locate dependencies due to lack of pkg-config paths which should be set
by jhbuild.
For more details about "webKitBranchBuild" option, see:
https://trac.webkit.org/wiki/UsingGitWithWebKit
* Scripts/webkitdirs.pm:
(getJhbuildPath):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (152190 => 152191)
--- trunk/Tools/ChangeLog 2013-06-28 22:15:53 UTC (rev 152190)
+++ trunk/Tools/ChangeLog 2013-06-28 22:21:03 UTC (rev 152191)
@@ -1,3 +1,23 @@
+2013-06-28 Nick Diego Yamane <[email protected]>
+
+ [Tools] Add support for "webKitBranchBuild" git option when calculating jhbuildPath
+ https://bugs.webkit.org/show_bug.cgi?id=118195
+
+ Reviewed by Daniel Bates.
+
+ Currently, ports that use jhbuild fail to determine jhbuild directory
+ when "webKitBranchBuild" git configuration property is enabled. To reproduce
+ that issue in Efl port, enable that flag in .git/config, switch to a git branch
+ other than "master" and try to build webkit. The build will fail to
+ locate dependencies due to lack of pkg-config paths which should be set
+ by jhbuild.
+
+ For more details about "webKitBranchBuild" option, see:
+ https://trac.webkit.org/wiki/UsingGitWithWebKit
+
+ * Scripts/webkitdirs.pm:
+ (getJhbuildPath):
+
2013-06-28 Jessie Berlin <[email protected]>
WebKitTestRunner should disable automatic quote and dash substitution like DumpRenderTree does
Modified: trunk/Tools/Scripts/webkitdirs.pm (152190 => 152191)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-06-28 22:15:53 UTC (rev 152190)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-06-28 22:21:03 UTC (rev 152191)
@@ -1879,7 +1879,12 @@
sub getJhbuildPath()
{
- return join('/', baseProductDir(), "Dependencies");
+ my @jhbuildPath = File::Spec->splitdir(baseProductDir());
+ if (isGit() && isGitBranchBuild() && gitBranch()) {
+ pop(@jhbuildPath);
+ }
+ push(@jhbuildPath, "Dependencies");
+ return File::Spec->catdir(@jhbuildPath);
}
sub mustReRunAutogen($@)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
