Changeset 152191 in webkit

Timestamp:

Jun 28, 2013 3:21:03 PM (11 years ago)

Author:

commit-queue@webkit.org

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 <​nick.yamane@openbossa.org> 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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-06-28  Nick Diego Yamane  <nick.yamane@openbossa.org>
+
+        [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  <jberlin@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1880 +1880 @@
 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);
 }