Bug 197116 - Add Xcode version check for Header post-processing scripts
Summary: Add Xcode version check for Header post-processing scripts
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Keith Rollin
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2019-04-19 14:11 PDT by Keith Rollin
Modified: 2019-04-23 17:52 PDT (History)
11 users (show)

See Also:


Attachments
Patch (12.01 KB, patch)
2019-04-23 16:18 PDT, Keith Rollin
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Keith Rollin 2019-04-19 14:11:25 PDT
There are several places in our Xcode projects that post-process header files after they've been exported. Because of XCBuild, we're moving to a model where the post-processing is performed at the same time the header files are exported, rather than as a distinct post-processing step. This patch disables the distinct step when the inline processing is available.

In practice, this means prefixing appropriate post-processing Custom Build phases with:

if [ "${XCODE_VERSION_MAJOR}" -ge "1100" -a "${APPLY_RULES_IN_COPY_HEADERS}" = "YES" ]; then
    # In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.
    exit 0
fi
Comment 1 Radar WebKit Bug Importer 2019-04-19 14:12:08 PDT
<rdar://problem/50058968>
Comment 2 Keith Rollin 2019-04-23 16:18:03 PDT
Created attachment 368078 [details]
Patch
Comment 3 Brent Fulgham 2019-04-23 16:35:41 PDT
Comment on attachment 368078 [details]
Patch

Looks reasonable. r=me (if EWS is happy)
Comment 4 WebKit Commit Bot 2019-04-23 17:16:47 PDT
Comment on attachment 368078 [details]
Patch

Rejecting attachment 368078 [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-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 368078, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as commit-queue@webkit.org...
Fetching: https://bugs.webkit.org/attachment.cgi?id=368078&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=197116&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Updating working directory
Failed to run "['Tools/Scripts/update-webkit']" exit_code: 1

Updating OpenSource
From https://git.webkit.org/git/WebKit
   165bf4efab5..908452fed98  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 244570 = 165bf4efab5cfcf64ee0183401b1003be50e82f5
r244571 = fd4abbc1ad1f0f8c99119c1d366e7c04bf46d69b
r244572 = 908452fed98f80ee058f1b2535fc24e5a6efa3da
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
Can't create session: Unable to connect to a repository at URL 'http://svn.webkit.org/repository/webkit': Error running context: The server unexpectedly closed the connection. at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN.pm line 717.

Died at /Volumes/Data/EWS/WebKit/Tools/Scripts/webkitdirs.pm line 2920.

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 1

Updating OpenSource
From https://git.webkit.org/git/WebKit
   165bf4efab5..908452fed98  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 244570 = 165bf4efab5cfcf64ee0183401b1003be50e82f5
r244571 = fd4abbc1ad1f0f8c99119c1d366e7c04bf46d69b
r244572 = 908452fed98f80ee058f1b2535fc24e5a6efa3da
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
Can't create session: Unable to connect to a repository at URL 'http://svn.webkit.org/repository/webkit': Error running context: The server unexpectedly closed the connection. at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN.pm line 717.

Died at /Volumes/Data/EWS/WebKit/Tools/Scripts/webkitdirs.pm line 2920.

Failed to run "['Tools/Scripts/update-webkit']" exit_code: 1
Updating OpenSource
From https://git.webkit.org/git/WebKit
   165bf4efab5..908452fed98  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 244570 = 165bf4efab5cfcf64ee0183401b1003be50e82f5
r244571 = fd4abbc1ad1f0f8c99119c1d366e7c04bf46d69b
r244572 = 908452fed98f80ee058f1b2535fc24e5a6efa3da
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
Can't create session: Unable to connect to a repository at URL 'http://svn.webkit.org/repository/webkit': Error running context: The server unexpectedly closed the connection. at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN.pm line 717.

Died at /Volumes/Data/EWS/WebKit/Tools/Scripts/webkitdirs.pm line 2920.

Full output: https://webkit-queues.webkit.org/results/11976963
Comment 5 Keith Rollin 2019-04-23 17:28:19 PDT
I refuse to accept that error as mine.
Comment 6 WebKit Commit Bot 2019-04-23 17:52:47 PDT
Comment on attachment 368078 [details]
Patch

Clearing flags on attachment: 368078

Committed r244575: <https://trac.webkit.org/changeset/244575>
Comment 7 WebKit Commit Bot 2019-04-23 17:52:48 PDT
All reviewed patches have been landed.  Closing bug.