Bug 189553 - SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Summary: SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Jer Noble
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2018-09-12 10:59 PDT by Jer Noble
Modified: 2019-01-18 14:53 PST (History)
17 users (show)

See Also:


Attachments
Patch (93.36 KB, patch)
2018-09-12 11:02 PDT, Jer Noble
no flags Details | Formatted Diff | Diff
Patch (93.51 KB, patch)
2018-09-12 15:27 PDT, Jer Noble
no flags Details | Formatted Diff | Diff
Archive of layout-test-results from ews121 for ios-simulator-wk2 (2.44 MB, application/zip)
2018-09-12 17:06 PDT, EWS Watchlist
no flags Details
Archive of layout-test-results from ews104 for mac-sierra-wk2 (3.76 MB, application/zip)
2018-09-12 17:58 PDT, EWS Watchlist
no flags Details
Patch (93.51 KB, patch)
2018-10-31 13:56 PDT, Jer Noble
no flags Details | Formatted Diff | Diff
Patch (100.76 KB, patch)
2018-10-31 15:09 PDT, Jer Noble
no flags Details | Formatted Diff | Diff
Patch (100.92 KB, patch)
2018-10-31 16:36 PDT, Jer Noble
no flags Details | Formatted Diff | Diff
Patch (101.01 KB, patch)
2019-01-11 16:43 PST, Jer Noble
no flags Details | Formatted Diff | Diff
Patch for landing (100.84 KB, patch)
2019-01-17 07:59 PST, Jer Noble
no flags Details | Formatted Diff | Diff
Patch for landing (100.97 KB, patch)
2019-01-18 12:40 PST, Jer Noble
no flags Details | Formatted Diff | Diff
Patch for landing (100.97 KB, patch)
2019-01-18 12:40 PST, Jer Noble
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jer Noble 2018-09-12 10:59:25 PDT
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Comment 1 Jer Noble 2018-09-12 11:02:53 PDT
Created attachment 349561 [details]
Patch
Comment 2 EWS Watchlist 2018-09-12 11:06:44 PDT
Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE
Comment 3 Tim Horton 2018-09-12 11:57:11 PDT
Comment on attachment 349561 [details]
Patch

Can you make these all identical and add them to sync-feature-defines??? It's SO helpful.
Comment 4 Tim Horton 2018-09-12 11:57:42 PDT
(I realize they're not feature defines, maybe we can rename the script... sync-shared-xcconfigs?)
Comment 5 Jer Noble 2018-09-12 12:49:25 PDT
(In reply to Tim Horton from comment #3)
> Comment on attachment 349561 [details]
> Patch
> 
> Can you make these all identical and add them to sync-feature-defines???
> It's SO helpful.
>
> (I realize they're not feature defines, maybe we can rename the script...
> sync-shared-xcconfigs?)

Well, all the SDKVariant.xcconfig files are identical. I'll look into it though!
Comment 6 Jer Noble 2018-09-12 15:27:57 PDT
Created attachment 349588 [details]
Patch
Comment 7 EWS Watchlist 2018-09-12 17:06:15 PDT Comment hidden (obsolete)
Comment 8 EWS Watchlist 2018-09-12 17:06:17 PDT Comment hidden (obsolete)
Comment 9 EWS Watchlist 2018-09-12 17:57:58 PDT Comment hidden (obsolete)
Comment 10 EWS Watchlist 2018-09-12 17:58:00 PDT Comment hidden (obsolete)
Comment 11 Jer Noble 2018-10-31 13:56:34 PDT
Created attachment 353528 [details]
Patch
Comment 12 Tim Horton 2018-10-31 14:29:20 PDT
Comment on attachment 353528 [details]
Patch

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

> Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig:2
> +#include "SDKVariant.xcconfign"

I think you have an extra "n"
Comment 13 Tim Horton 2018-10-31 14:29:44 PDT
(In reply to Jer Noble from comment #5)
> (In reply to Tim Horton from comment #3)
> > Comment on attachment 349561 [details]
> > Patch
> > 
> > Can you make these all identical and add them to sync-feature-defines???
> > It's SO helpful.
> >
> > (I realize they're not feature defines, maybe we can rename the script...
> > sync-shared-xcconfigs?)
> 
> Well, all the SDKVariant.xcconfig files are identical.

Right, that's literally the point. To make sure they stay that way.

> I'll look into it though!
Comment 14 Jer Noble 2018-10-31 14:35:11 PDT
(In reply to Tim Horton from comment #12)
> Comment on attachment 353528 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=353528&action=review
> 
> > Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig:2
> > +#include "SDKVariant.xcconfign"
> 
> I think you have an extra "n"

Ack!
Comment 15 Jer Noble 2018-10-31 15:09:38 PDT
Created attachment 353536 [details]
Patch
Comment 16 Tim Horton 2018-10-31 15:19:34 PDT
Comment on attachment 353536 [details]
Patch

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

> PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig:43
> +EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)

Isn't this missing a close paren and semicolon
Comment 17 Jer Noble 2018-10-31 16:29:28 PDT
(In reply to Tim Horton from comment #16)
> Comment on attachment 353536 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=353536&action=review
> 
> > PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig:43
> > +EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME)
> 
> Isn't this missing a close paren and semicolon

Apparently not, since that line is what controls the build directory and the build directory is set as you'd expect when you build with SDK_VARIANT=. But yes, I'll fix it.
Comment 18 Jer Noble 2018-10-31 16:36:35 PDT
Created attachment 353552 [details]
Patch
Comment 19 Radar WebKit Bug Importer 2018-11-01 06:21:17 PDT
<rdar://problem/45727881>
Comment 20 Jer Noble 2019-01-11 16:43:07 PST
Created attachment 358965 [details]
Patch
Comment 21 Tim Horton 2019-01-16 12:29:54 PST
Comment on attachment 358965 [details]
Patch

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

I don't love the new xcconfigs.

> Tools/ChangeLog:22
> +        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds

Double changelog

> Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig:1
> +// Copyright (C) 2018 Apple Inc. All rights reserved.

The year has changed
Comment 22 Jer Noble 2019-01-16 14:15:52 PST
(In reply to Tim Horton from comment #21)
> Comment on attachment 358965 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=358965&action=review
> 
> I don't love the new xcconfigs.

I'm hopeful we can unify all the "same for every subproject xcconfig" files into a smaller set of xcconfig files.

> > Tools/ChangeLog:22
> > +        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
> 
> Double changelog

Will fix.

> > Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig:1
> > +// Copyright (C) 2018 Apple Inc. All rights reserved.
> 
> The year has changed

It's 2019 and I'm still writing 2018 on all my copyright statements.
Comment 23 Jer Noble 2019-01-17 07:59:04 PST
Created attachment 359375 [details]
Patch for landing
Comment 24 WebKit Commit Bot 2019-01-17 12:46:11 PST
Comment on attachment 359375 [details]
Patch for landing

Clearing flags on attachment: 359375

Committed r240124: <https://trac.webkit.org/changeset/240124>
Comment 25 WebKit Commit Bot 2019-01-17 12:46:13 PST
All reviewed patches have been landed.  Closing bug.
Comment 26 Truitt Savell 2019-01-17 16:43:33 PST
Reverted r240124 for reason:

This commit broke an internal build.

Committed r240136: <https://trac.webkit.org/changeset/240136>
Comment 27 Jer Noble 2019-01-18 12:40:20 PST
Created attachment 359526 [details]
Patch for landing
Comment 28 Jer Noble 2019-01-18 12:40:43 PST
Created attachment 359527 [details]
Patch for landing
Comment 29 WebKit Commit Bot 2019-01-18 14:53:56 PST
Comment on attachment 359527 [details]
Patch for landing

Clearing flags on attachment: 359527

Committed r240176: <https://trac.webkit.org/changeset/240176>
Comment 30 WebKit Commit Bot 2019-01-18 14:53:58 PST
All reviewed patches have been landed.  Closing bug.