Bug 207155 – Centralize Cocoa ENABLES (Part 1): Move trivial definitions from FeatureDefines.xcconfig to PlatformEnableCocoa.h

• Status: RESOLVED
• Resolution: CONFIGURATION CHANGED
• Component: New Bugs

[Sam Weinig]

Move trivial definitions from FeatureDefines.xcconfig to PlatformEnableCocoa.h

[Sam Weinig]

Created attachment 389594 [details]
Patch

[Sam Weinig]

Created attachment 389621 [details]
Patch

[Sam Weinig]

Created attachment 389623 [details]
Patch

[Sam Weinig]

Created attachment 389763 [details]
Patch

[Tim Horton]

Comment on attachment 389763 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=389763&action=review

> Source/WebCore/DerivedSources.make:1506
>      HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO_TRACK=0

Confused, why is this a 0

[Sam Weinig]

(In reply to Tim Horton from comment #5)
> Comment on attachment 389763 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=389763&action=review
> 
> > Source/WebCore/DerivedSources.make:1506
> >      HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO_TRACK=0
> 
> Confused, why is this a 0

Wasn't it already 0? It does seem wrong though.

[Tim Horton]

Twas, but it's very confusing

[Sam Weinig]

Created attachment 389871 [details]
Patch

[Sam Weinig]

Created attachment 389904 [details]
Patch

[Sam Weinig]

Created attachment 389952 [details]
Patch

[Sam Weinig]

Created attachment 390021 [details]
Patch

[Sam Weinig]

Created attachment 390031 [details]
Patch

[Sam Weinig]

Created attachment 390056 [details]
Patch

[Sam Weinig]

Created attachment 390085 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 390085 [details]
Patch

Rejecting attachment 390085 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 390085, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 5000 characters of output:
it/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Tim Horton']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Parsed 25 diffs from patch file(s).
patching file Source/JavaScriptCore/ChangeLog
patching file Source/JavaScriptCore/DerivedSources.make
patching file Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Hunk #2 succeeded at 61 with fuzz 2 (offset 6 lines).
Hunk #3 succeeded at 71 (offset 6 lines).
Hunk #4 succeeded at 83 (offset 6 lines).
Hunk #5 succeeded at 125 (offset 6 lines).
Hunk #6 succeeded at 152 (offset 6 lines).
Hunk #7 succeeded at 184 (offset 6 lines).
Hunk #8 succeeded at 208 (offset 6 lines).
Hunk #9 succeeded at 253 (offset 6 lines).
Hunk #10 succeeded at 268 (offset 6 lines).
Hunk #11 FAILED at 290.
1 out of 11 hunks FAILED -- saving rejects to file Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig.rej
patching file Source/WTF/ChangeLog
patching file Source/WTF/wtf/PlatformEnable.h
patching file Source/WTF/wtf/PlatformEnableCocoa.h
patching file Source/WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebCore/DerivedSources.make
patching file Source/WebCore/Configurations/FeatureDefines.xcconfig
Hunk #2 succeeded at 61 with fuzz 2 (offset 6 lines).
Hunk #3 succeeded at 71 (offset 6 lines).
Hunk #4 succeeded at 83 (offset 6 lines).
Hunk #5 succeeded at 125 (offset 6 lines).
Hunk #6 succeeded at 152 (offset 6 lines).
Hunk #7 succeeded at 184 (offset 6 lines).
Hunk #8 succeeded at 208 (offset 6 lines).
Hunk #9 succeeded at 253 (offset 6 lines).
Hunk #10 succeeded at 268 (offset 6 lines).
Hunk #11 FAILED at 290.
1 out of 11 hunks FAILED -- saving rejects to file Source/WebCore/Configurations/FeatureDefines.xcconfig.rej
patching file Source/WebCore/Configurations/WebCore.xcconfig
patching file Source/WebCore/PAL/ChangeLog
patching file Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Hunk #2 succeeded at 61 with fuzz 2 (offset 6 lines).
Hunk #3 succeeded at 71 (offset 6 lines).
Hunk #4 succeeded at 83 (offset 6 lines).
Hunk #5 succeeded at 125 (offset 6 lines).
Hunk #6 succeeded at 152 (offset 6 lines).
Hunk #7 succeeded at 184 (offset 6 lines).
Hunk #8 succeeded at 208 (offset 6 lines).
Hunk #9 succeeded at 253 (offset 6 lines).
Hunk #10 succeeded at 268 (offset 6 lines).
Hunk #11 FAILED at 290.
1 out of 11 hunks FAILED -- saving rejects to file Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig.rej
patching file Source/WebCore/PAL/Configurations/PAL.xcconfig
patching file Source/WebCore/Scripts/generate-unified-sources.sh
patching file Source/WebKit/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKit/DerivedSources.make
patching file Source/WebKit/Configurations/FeatureDefines.xcconfig
Hunk #2 succeeded at 61 with fuzz 2 (offset 6 lines).
Hunk #3 succeeded at 71 (offset 6 lines).
Hunk #4 succeeded at 83 (offset 6 lines).
Hunk #5 succeeded at 125 (offset 6 lines).
Hunk #6 succeeded at 152 (offset 6 lines).
Hunk #7 succeeded at 184 (offset 6 lines).
Hunk #8 succeeded at 208 (offset 6 lines).
Hunk #9 succeeded at 253 (offset 6 lines).
Hunk #10 succeeded at 268 (offset 6 lines).
Hunk #11 FAILED at 290.
1 out of 11 hunks FAILED -- saving rejects to file Source/WebKit/Configurations/FeatureDefines.xcconfig.rej
patching file Source/WebKit/Scripts/generate-unified-sources.sh
patching file Source/WebKitLegacy/ChangeLog
patching file Source/WebKitLegacy/mac/ChangeLog
patching file Source/WebKitLegacy/mac/MigrateHeaders.make
patching file Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Hunk #2 succeeded at 61 with fuzz 2 (offset 6 lines).
Hunk #3 succeeded at 71 (offset 6 lines).
Hunk #4 succeeded at 83 (offset 6 lines).
Hunk #5 succeeded at 125 (offset 6 lines).
Hunk #6 succeeded at 152 (offset 6 lines).
Hunk #7 succeeded at 184 (offset 6 lines).
Hunk #8 succeeded at 208 (offset 6 lines).
Hunk #9 succeeded at 253 (offset 6 lines).
Hunk #10 succeeded at 268 (offset 6 lines).
Hunk #11 FAILED at 290.
1 out of 11 hunks FAILED -- saving rejects to file Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig.rej
patching file Source/WebKitLegacy/scripts/generate-unified-sources.sh
patching file Tools/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
Hunk #2 succeeded at 61 with fuzz 2 (offset 6 lines).
Hunk #3 succeeded at 71 (offset 6 lines).
Hunk #4 succeeded at 83 (offset 6 lines).
Hunk #5 succeeded at 125 (offset 6 lines).
Hunk #6 succeeded at 152 (offset 6 lines).
Hunk #7 succeeded at 184 (offset 6 lines).
Hunk #8 succeeded at 208 (offset 6 lines).
Hunk #9 succeeded at 253 (offset 6 lines).
Hunk #10 succeeded at 268 (offset 6 lines).
Hunk #11 FAILED at 290.
1 out of 11 hunks FAILED -- saving rejects to file Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig.rej

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Tim Horton']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: https://webkit-queues.webkit.org/results/13318684

[Sam Weinig]

Committed r256051: <https://trac.webkit.org/changeset/256051>

[Radar WebKit Bug Importer]

<rdar://problem/59269578>

[Ryan Haddad]

Reverted r256051 for reason:

Broke internal builds.

Committed r256066: <https://trac.webkit.org/changeset/256066>

[Sam Weinig]

(In reply to Ryan Haddad from comment #18)
> Reverted r256051 for reason:
> 
> Broke internal builds.
> 
> Committed r256066: <https://trac.webkit.org/changeset/256066>

Want to give me a hint as to what broke?

[Ryan Haddad]

(In reply to Sam Weinig from comment #19)
> (In reply to Ryan Haddad from comment #18)
> > Reverted r256051 for reason:
> > 
> > Broke internal builds.
> > 
> > Committed r256066: <https://trac.webkit.org/changeset/256066>
> 
> Want to give me a hint as to what broke?
The build log is in the radar.

[Sam Weinig]

Created attachment 390172 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 390172 [details]
Patch

Clearing flags on attachment: 390172

Committed r256091: <https://trac.webkit.org/changeset/256091>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Truitt Savell]

Reverted r256091 for reason:

Broke internal builds

Committed r256184: <https://trac.webkit.org/changeset/256184>

[Alexey Proskuryakov]

This also makes the build ~5% slower. Need to find a way to avoid that before re-landing.

[Sam Weinig]

(In reply to Alexey Proskuryakov from comment #25)
> This also makes the build ~5% slower. Need to find a way to avoid that
> before re-landing.

5% slower doing what? Clean build? Building which port?

[Sam Weinig]

(In reply to Sam Weinig from comment #26)
> (In reply to Alexey Proskuryakov from comment #25)
> > This also makes the build ~5% slower. Need to find a way to avoid that
> > before re-landing.
> 
> 5% slower doing what? Clean build? Building which port?

I mean whatever it was, yowzers. Obviously needs to be fixed. Can't quite imagine what I did yet though.

[Alexey Proskuryakov]

Internal Mac production build was a where I saw it. Probably same thing with a clean release build.

[Tim Horton]

Regression seems to be all in WebCore (~30%)

[Sam Weinig]

Going to take a different approach, and not move any of the ENABLE_* flags that are used by scripts for now. Eventually, we should also consider fixing the scripts not to rely on ENABLE_* flags at all, but that will take time.

[Sam Weinig]

Created attachment 390492 [details]
Patch

[Sam Weinig]

Created attachment 390550 [details]
Patch

[Sam Weinig]

Created attachment 391413 [details]
Patch

[Sam Weinig]

Created attachment 391439 [details]
Patch

[Sam Weinig]

Created attachment 391441 [details]
Patch

[Darin Adler]

I’m tackling these problems in bug 212451, bug 212389, bug 212418.

[Sam Weinig]

Darin completed this.