Bug 155796 - Ninja build path is incorrect when git branch name is appended to WebKitBuild
Summary: Ninja build path is incorrect when git branch name is appended to WebKitBuild
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: All All
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-03-23 09:54 PDT by Bill Ming
Modified: 2016-03-23 22:13 PDT (History)
2 users (show)

See Also:

Attachments
Patch (1.20 MB, patch)
2016-03-23 10:04 PDT, Bill Ming 		no flags Details | Formatted Diff | Diff
Patch (1.50 KB, patch)
2016-03-23 10:11 PDT, Bill Ming 		no flags Details | Formatted Diff | Diff
Patch (1.15 KB, patch)
2016-03-23 18:58 PDT, Bill Ming 		no flags Details | Formatted Diff | Diff
Show Obsolete (2) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Bill Ming 2016-03-23 09:54:59 PDT 
Executing ./Tools/Scripts/webkit-patch setup-git-clone and when it comes to the last step:
"Do you want to append the git branch name to every build? (e.g. WebKitBuild/mybranch/; y/n)"
Answer yes.
run ./Tools/Scripts/build-webkit --wincairo --release
(I'm testing on windows)
Build will fail because ninja is still given a path without branch name.
Comment 1 Bill Ming 2016-03-23 10:04:05 PDT 
Created attachment 274752 [details]
Patch
Comment 2 Bill Ming 2016-03-23 10:11:07 PDT 
Created attachment 274753 [details]
Patch
Comment 3 Alex Christensen 2016-03-23 13:44:04 PDT 
Comment on attachment 274753 [details]
Patch

I'm glad to hear from people building with different configurations!

Would it work to use determineBaseProductDir(); and chdir $baseProductDir ?  That would probably be cleaner, so we don't have to add the same git checks in two different places.
Comment 4 Bill Ming 2016-03-23 18:58:29 PDT 
Created attachment 274810 [details]
Patch
Comment 5 Bill Ming 2016-03-23 19:01:05 PDT 
(In reply to comment #3)
> Comment on attachment 274753 [details]
> Patch
> 
> I'm glad to hear from people building with different configurations!
> 
> Would it work to use determineBaseProductDir(); and chdir $baseProductDir ? 
> That would probably be cleaner, so we don't have to add the same git checks
> in two different places.

Thanks for the review. The patch is updated.
Comment 6 WebKit Commit Bot 2016-03-23 22:13:37 PDT 
Comment on attachment 274810 [details]
Patch

Clearing flags on attachment: 274810

Committed r198616: <http://trac.webkit.org/changeset/198616>
Comment 7 WebKit Commit Bot 2016-03-23 22:13:40 PDT 
All reviewed patches have been landed.  Closing bug.