Bug 29907

Summary:

[Chromium] Incorrect conditions in WebCore.gyp

Product:

WebKit

Reporter:

Chris Hawk <hawk>

Component:

WebCore Misc.

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

commit-queue, yaar

Priority:

Version:

528+ (Nightly build)

Hardware:

All

OS:

All

Attachments:

Description	Flags
Patch the collapses the two condition sections into one	dglazkov: review-
Previous patch + bug URL	none

Chris Hawk

Reported 2009-09-29 17:31:30 PDT

/trunk/WebCore/WebCore.gyp/WebCore.gyp has a single target ('webcore') with two 'conditions' values. The first one is ignored leaving out some needed definitions (namely, WEBCORE_NAVIGATOR_PLATFORM for Mac, Windows, and Linux). The problem stems from a merge at http://codereview.chromium.org/208029

Attachments
Patch the collapses the two condition sections into one (5.77 KB, patch) 2009-09-29 17:33 PDT, Chris Hawk	dglazkov: review-	Details Formatted Diff Diff
Previous patch + bug URL (5.82 KB, patch) 2009-09-30 11:41 PDT, Chris Hawk	no flags	Details Formatted Diff Diff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.

Chris Hawk

Comment 1 2009-09-29 17:33:58 PDT

Created attachment 40336 [details] Patch the collapses the two condition sections into one

Eric Seidel (no email)

Comment 2 2009-09-29 18:27:52 PDT

Comment on attachment 40336 [details] Patch the collapses the two condition sections into one Forgot to click the "patch" checkbox. Tools like "bugzilla-tool post-diff" will do all that for you. Also your ChangeLog should really have the bug number in it. prepare-ChangeLog --bug will do that. This is covered in http://webkit.org/coding/contributing.html

Dimitri Glazkov (Google)

Comment 3 2009-09-30 09:14:16 PDT

Comment on attachment 40336 [details] Patch the collapses the two condition sections into one This looks great, except: > + Fix for conditionals in the WebCore gyp file, which contained two separate > + 'conditions' values for the webcore target. The first entry was ignored, > + resulting in some missine defines. Need bug URL.

Chris Hawk

Comment 4 2009-09-30 11:41:31 PDT

Created attachment 40385 [details] Previous patch + bug URL

Dimitri Glazkov (Google)

Comment 5 2009-09-30 11:42:53 PDT

Comment on attachment 40385 [details] Previous patch + bug URL r=me.

WebKit Commit Bot

Comment 6 2009-09-30 12:01:21 PDT

Comment on attachment 40385 [details] Previous patch + bug URL Clearing flags on attachment: 40385 Committed r48940: <http://trac.webkit.org/changeset/48940>

WebKit Commit Bot

Comment 7 2009-09-30 12:01:25 PDT

All reviewed patches have been landed. Closing bug.

Note You need to log in before you can comment on or make changes to this bug.