RESOLVED FIXED 149718
[Win] Fix behavior of webkit-build-directory script 
https://bugs.webkit.org/show_bug.cgi?id=149718
Summary [Win] Fix behavior of webkit-build-directory script
Brent Fulgham
Reported 2015-10-01 12:24:03 PDT
The behavior of webkit-build-directory is wrong on Windows. It should be returning: $ webkit-build-directory /cygdrive/c/Projects/WebKit/OpenSource/WebKitBuild /cygdrive/c/Projects/WebKit/OpenSource/WebKitBuild/Release Instead, it is returning: $ ../Scripts/webkit-build-directory /cygdrive/c/Projects/WebKit/OpenSource/WebKitBuild /cygdrive/c/Projects/WebKit/OpenSource/WebKitBuild/Release/bin32 This causes other scripts to break. This patch corrects this behavior, and modifies scripts that had relied on the old improper behavior.
Attachments
Patch (4.19 KB, patch)
2015-10-01 12:27 PDT, Brent Fulgham 		no flags
DetailsFormatted DiffDiff
Patch (3.94 KB, patch)
2015-10-01 12:30 PDT, Brent Fulgham 		achristensen: review+
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Brent Fulgham
Comment 1 2015-10-01 12:27:57 PDT
Created attachment 262275 [details] Patch
Brent Fulgham
Comment 2 2015-10-01 12:30:25 PDT
Created attachment 262277 [details] Patch
Alex Christensen
Comment 3 2015-10-01 12:35:32 PDT
Comment on attachment 262277 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262277&action=review > Tools/Scripts/webkitdirs.pm:2003 > + my $binDir = isWin64() ? "bin64" : "bin32"; > + my $productBinaryDir = File::Spec->catdir(productDir(), $binDir); these two lines could be before the if, then you could remove the duplicate code.
Brent Fulgham
Comment 4 2015-10-01 12:39:12 PDT
Committed r190424: <http://trac.webkit.org/changeset/190424>
Brent Fulgham
Comment 5 2015-10-01 12:43:00 PDT
(In reply to comment #3) > Comment on attachment 262277 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=262277&action=review > > > Tools/Scripts/webkitdirs.pm:2003 > > + my $binDir = isWin64() ? "bin64" : "bin32"; > > + my $productBinaryDir = File::Spec->catdir(productDir(), $binDir); > > these two lines could be before the if, then you could remove the duplicate > code. Good idea. Fixed.
Note You need to log in before you can comment on or make changes to this bug.