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
<rdar://problem/50058968>
Created attachment 368078 [details] Patch
Comment on attachment 368078 [details] Patch Looks reasonable. r=me (if EWS is happy)
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
I refuse to accept that error as mine.
Comment on attachment 368078 [details] Patch Clearing flags on attachment: 368078 Committed r244575: <https://trac.webkit.org/changeset/244575>
All reviewed patches have been landed. Closing bug.