Bug 217584

Summary: Ignore deployment suffix and identifier when computing major OS version for macOS Big Sur and newer
Product: WebKit Reporter: Luming Yin <luming_yin>
Component: WebKit Misc.Assignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: ap, darin, dino, eric.carlson, ews-watchlist, graouts, hi, keith_miller, kondapallykalyan, krollin, mark.lam, msaboff, saam, thorton, tzagallo, webkit-bug-importer
Priority: P1 Keywords: InRadar
Version: Safari Technology Preview   
Hardware: Mac   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch
none
Patch
none
Patch
none
Patch none

Description Luming Yin 2020-10-11 13:28:21 PDT 
<rdar://problem/70168426>
Comment 1 Luming Yin 2020-10-11 14:21:17 PDT 
Created attachment 411064 [details]
Patch
Comment 2 EWS Watchlist 2020-10-11 14:22:26 PDT 
Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE
Comment 3 Darin Adler 2020-10-11 14:44:40 PDT 
Comment on attachment 411064 [details]
Patch

The build is not failing, but we know that this version is wrong.
Comment 4 Luming Yin 2020-10-11 14:58:20 PDT 
Created attachment 411066 [details]
Patch
Comment 5 Darin Adler 2020-10-11 15:20:59 PDT 
Comment on attachment 411066 [details]
Patch

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

> Source/JavaScriptCore/Configurations/Base.xcconfig:106
> +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = $(MACOSX_DEPLOYMENT_TARGET:identifier)

We just figured out this does not work!
Comment 6 Luming Yin 2020-10-11 15:23:14 PDT 
Created attachment 411070 [details]
Patch
Comment 7 Darin Adler 2020-10-11 15:25:32 PDT 
EWS is not going to tell us anything here, because these changes affect only Production builds. EWS does Debug and Release builds.
Comment 8 Darin Adler 2020-10-11 15:29:05 PDT 
Comment on attachment 411070 [details]
Patch

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

> Source/JavaScriptCore/Configurations/Base.xcconfig:106
> +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = $(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)

I think this should use "10" instead of "$(MACOSX_DEPLOYMENT_TARGET:base)"
Comment 9 Luming Yin 2020-10-11 15:37:50 PDT 
Created attachment 411072 [details]
Patch
Comment 10 Luming Yin 2020-10-11 15:38:08 PDT 
(In reply to Darin Adler from comment #8)
> Comment on attachment 411070 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=411070&action=review
> 
> > Source/JavaScriptCore/Configurations/Base.xcconfig:106
> > +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = $(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
> 
> I think this should use "10" instead of "$(MACOSX_DEPLOYMENT_TARGET:base)"

Good idea. Patch updated to use "10" instead.
Comment 11 Keith Rollin 2020-10-11 15:44:57 PDT 
Comment on attachment 411072 [details]
Patch

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

> Source/JavaScriptCore/Configurations/Base.xcconfig:106
> +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)

I've never seen "a = b = c" in an xcconfig file before. Especially when it's "a = a = c". Is this correct, or a copy/paste error?
Comment 12 Luming Yin 2020-10-11 15:45:48 PDT 
(In reply to Keith Rollin from comment #11)
> Comment on attachment 411072 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=411072&action=review
> 
> > Source/JavaScriptCore/Configurations/Base.xcconfig:106
> > +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
> 
> I've never seen "a = b = c" in an xcconfig file before. Especially when it's
> "a = a = c". Is this correct, or a copy/paste error?

Uh-oh. Copy/paste error. Uploading another patch.
Comment 13 Darin Adler 2020-10-11 15:47:05 PDT 
Comment on attachment 411072 [details]
Patch

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

>>> Source/JavaScriptCore/Configurations/Base.xcconfig:106
>>> +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
>> 
>> I've never seen "a = b = c" in an xcconfig file before. Especially when it's "a = a = c". Is this correct, or a copy/paste error?
> 
> Uh-oh. Copy/paste error. Uploading another patch.

Good catch! It’s right in ANGLE but wrong in the others.
Comment 14 Luming Yin 2020-10-11 15:47:59 PDT 
Created attachment 411073 [details]
Patch
Comment 15 EWS 2020-10-11 16:34:16 PDT 
Committed r268327: <https://trac.webkit.org/changeset/268327>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 411073 [details].