WebKit Bugzilla
Attachment 360181 Details for
Bug 193792
: Add .xcfilelists to Run Script build phases
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193792-20190125155829.patch (text/plain), 14.44 KB, created by
Keith Rollin
on 2019-01-25 15:58:29 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Keith Rollin
Created:
2019-01-25 15:58:29 PST
Size:
14.44 KB
patch
obsolete
>Subversion Revision: 240525 >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index f91a7e8d7335399831499b347513c89b8cbeb6ab..f449bffd84b38f621604656c908a03a339e59466 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,24 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Add .xcfilelists to Run Script build phases >+ https://bugs.webkit.org/show_bug.cgi?id=193792 >+ <rdar://problem/47201785> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ As part of supporting XCBuild, update the necessary Run Script build >+ phases in their Xcode projects to refer to their associated >+ .xcfilelist files. >+ >+ Note that the addition of these files bumps the Xcode project version >+ number to something that's Xcode 10 compatible. This change means that >+ older versions of the Xcode IDE can't read these projects. Nor can it >+ fully load workspaces that refer to these projects (the updated >+ projects are shown as non-expandable placeholders). `xcodebuild` can >+ still build these projects; it's just that the IDE can't open them. >+ >+ * JavaScriptCore.xcodeproj/project.pbxproj: >+ > 2019-01-25 Keith Rollin <krollin@apple.com> > > Update Xcode projects with "Check .xcfilelists" build phase >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 4e47655e31b9fe6e36350e22a0d46dd49bc1476f..9dbd3f4972941fe19c73c9cd2bfac5fae5952247 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,31 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Add .xcfilelists to Run Script build phases >+ https://bugs.webkit.org/show_bug.cgi?id=193792 >+ <rdar://problem/47201785> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ As part of supporting XCBuild, update the necessary Run Script build >+ phases in their Xcode projects to refer to their associated >+ .xcfilelist files. >+ >+ Note that the addition of these files bumps the Xcode project version >+ number to something that's Xcode 10 compatible. This change means that >+ older versions of the Xcode IDE can't read these projects. Nor can it >+ fully load workspaces that refer to these projects (the updated >+ projects are shown as non-expandable placeholders). `xcodebuild` can >+ still build these projects; it's just that the IDE can't open them. >+ >+ Make special accommodations for incorporating .xcfilelists from >+ WebKitAdditions. >+ >+ No new tests since there should be no observable behavior difference. >+ >+ * Configurations/Base.xcconfig: >+ * Configurations/DebugRelease.xcconfig: >+ * WebCore.xcodeproj/project.pbxproj: >+ > 2019-01-25 Keith Rollin <krollin@apple.com> > > Update Xcode projects with "Check .xcfilelists" build phase >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index e007ba6bb8d119130128c479232bfcfd27609f60..b10d1bdc2649be490e245161ad39386fceda794a 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,29 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Add .xcfilelists to Run Script build phases >+ https://bugs.webkit.org/show_bug.cgi?id=193792 >+ <rdar://problem/47201785> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ As part of supporting XCBuild, update the necessary Run Script build >+ phases in their Xcode projects to refer to their associated >+ .xcfilelist files. >+ >+ Note that the addition of these files bumps the Xcode project version >+ number to something that's Xcode 10 compatible. This change means that >+ older versions of the Xcode IDE can't read these projects. Nor can it >+ fully load workspaces that refer to these projects (the updated >+ projects are shown as non-expandable placeholders). `xcodebuild` can >+ still build these projects; it's just that the IDE can't open them. >+ >+ Make special accommodations for incorporating .xcfilelists from >+ WebKitAdditions. >+ >+ * Configurations/Base.xcconfig: >+ * Configurations/DebugRelease.xcconfig: >+ * WebKit.xcodeproj/project.pbxproj: >+ > 2019-01-25 Keith Rollin <krollin@apple.com> > > Update Xcode projects with "Check .xcfilelists" build phase >diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >index d5f115a94d1231373165f54aa68a4419f5de9db2..18dd97ebcf46e2aeed00472748f16edacae333aa 100644 >--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >@@ -3,7 +3,7 @@ > archiveVersion = 1; > classes = { > }; >- objectVersion = 46; >+ objectVersion = 51; > objects = { > > /* Begin PBXAggregateTarget section */ >@@ -10371,10 +10371,14 @@ > buildActionMask = 2147483647; > files = ( > ); >+ inputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-input.xcfilelist", >+ ); > inputPaths = ( > ); > name = "Generate Derived Sources"; > outputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-output.xcfilelist", > ); > outputPaths = ( > ); >diff --git a/Source/WebCore/Configurations/Base.xcconfig b/Source/WebCore/Configurations/Base.xcconfig >index 30519ba38b0ccfd02d241e87f59101be32e8aa1a..97e5509d29c9c0414c0aee8901125bbd5015f5a1 100644 >--- a/Source/WebCore/Configurations/Base.xcconfig >+++ b/Source/WebCore/Configurations/Base.xcconfig >@@ -138,6 +138,11 @@ WK_COCOA_TOUCH_appletvos = cocoatouch; > WK_COCOA_TOUCH_appletvsimulator = cocoatouch; > WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH))); > >+WK_WEBKITADDITIONS_INSTALL_PATH = /usr/local/include/WebKitAdditions >+WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(SDKROOT)/$(WK_WEBKITADDITIONS_INSTALL_PATH) >+WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebCore/DerivedSources-input.xcfilelist >+WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebCore/DerivedSources-output.xcfilelist >+ > // Attempting to build WebCore with full LTO for i386 results in the following > // linker error, so we drop down to "thin" for that architecture if we were to > // otherwise attempt to use "full". >diff --git a/Source/WebCore/Configurations/DebugRelease.xcconfig b/Source/WebCore/Configurations/DebugRelease.xcconfig >index 5f26ed0d247b6366d44c587d260b43505e2f434a..5b5501b793189d58399f5620d77132dfd96397be 100644 >--- a/Source/WebCore/Configurations/DebugRelease.xcconfig >+++ b/Source/WebCore/Configurations/DebugRelease.xcconfig >@@ -49,3 +49,11 @@ WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none); > > WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache; > #include "../../../Tools/ccache/ccache.xcconfig" >+ >+WK_WEBCORE_ADDITIONS_PATH = ../../../Internal/WebKit/WebKitAdditions/Additions/WebCore >+WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_$(USE_INTERNAL_SDK)) >+WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_ = >+WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_YES = $(WK_WEBCORE_ADDITIONS_PATH)/DerivedSources-input.xcfilelist >+WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_$(USE_INTERNAL_SDK)) >+WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_ = >+WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_YES = $(WK_WEBCORE_ADDITIONS_PATH)/DerivedSources-output.xcfilelist >diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >index 990dcda9bf0105b613b670e1d0f12efe8a83f1ac..fa7aa053cd0e4443c1e86702976b4443c437ec76 100644 >--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj >+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >@@ -3,7 +3,7 @@ > archiveVersion = 1; > classes = { > }; >- objectVersion = 46; >+ objectVersion = 51; > objects = { > > /* Begin PBXAggregateTarget section */ >@@ -32714,10 +32714,16 @@ > buildActionMask = 2147483647; > files = ( > ); >+ inputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-input.xcfilelist", >+ "$(WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS)", >+ ); > inputPaths = ( > ); > name = "Generate Derived Sources"; > outputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-output.xcfilelist", >+ "$(WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS)", > ); > outputPaths = ( > ); >diff --git a/Source/WebKit/Configurations/Base.xcconfig b/Source/WebKit/Configurations/Base.xcconfig >index 623f6b16632bfcc1dcf7b5c202f0185ec7e8dfae..83962ec35da3e2c114e7804cb817e1f7b2181b68 100644 >--- a/Source/WebKit/Configurations/Base.xcconfig >+++ b/Source/WebKit/Configurations/Base.xcconfig >@@ -152,6 +152,11 @@ WK_MACOS_WEAK_FRAMEWORK_ = -weak_framework > > WK_USE_RESTRICTED_ENTITLEMENTS = $(USE_INTERNAL_SDK); > >+WK_WEBKITADDITIONS_INSTALL_PATH = /usr/local/include/WebKitAdditions >+WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(SDKROOT)/$(WK_WEBKITADDITIONS_INSTALL_PATH) >+WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebKit/DerivedSources-input.xcfilelist >+WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebKit/DerivedSources-output.xcfilelist >+ > LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO)); > WK_LLVM_LTO_NO = NO; > WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE); >diff --git a/Source/WebKit/Configurations/DebugRelease.xcconfig b/Source/WebKit/Configurations/DebugRelease.xcconfig >index 2e743916f17eb759acdaaadb058fc754d68e5047..850afa2857dcc744db5055cd39880969a9cf8579 100644 >--- a/Source/WebKit/Configurations/DebugRelease.xcconfig >+++ b/Source/WebKit/Configurations/DebugRelease.xcconfig >@@ -60,3 +60,11 @@ WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none); > > WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache; > #include "../../../Tools/ccache/ccache.xcconfig" >+ >+WK_WEBKIT_ADDITIONS_PATH = ../../../Internal/WebKit/WebKitAdditions/Additions/WebKit >+WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_$(USE_INTERNAL_SDK)) >+WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_ = >+WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS_YES = $(WK_WEBKIT_ADDITIONS_PATH)/DerivedSources-input.xcfilelist >+WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_$(USE_INTERNAL_SDK)) >+WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_ = >+WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS_YES = $(WK_WEBKIT_ADDITIONS_PATH)/DerivedSources-output.xcfilelist >diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >index 46eab2b89f639b5220efd4c7add12f27e0827ffd..886975808e61b76f6e48ace2ae6c496e6e625bbc 100644 >--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj >+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >@@ -3,7 +3,7 @@ > archiveVersion = 1; > classes = { > }; >- objectVersion = 46; >+ objectVersion = 51; > objects = { > > /* Begin PBXAggregateTarget section */ >@@ -10701,9 +10701,17 @@ > buildActionMask = 2147483647; > files = ( > ); >+ inputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-input.xcfilelist", >+ "$(WK_WEBKIT_INPUT_XCFILELIST_ADDITIONS)", >+ ); > inputPaths = ( > ); > name = "Generate Derived Sources"; >+ outputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-output.xcfilelist", >+ "$(WK_WEBKIT_OUTPUT_XCFILELIST_ADDITIONS)", >+ ); > outputPaths = ( > ); > runOnlyForDeploymentPostprocessing = 0; >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 5a092e23fdfda77d5fe5b9342a48ec5c6a6e7d61..60bcdf4ec9fe7f534de7c9d47e4d7b8db23e72d4 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,25 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Add .xcfilelists to Run Script build phases >+ https://bugs.webkit.org/show_bug.cgi?id=193792 >+ <rdar://problem/47201785> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ As part of supporting XCBuild, update the necessary Run Script build >+ phases in their Xcode projects to refer to their associated >+ .xcfilelist files. >+ >+ Note that the addition of these files bumps the Xcode project version >+ number to something that's Xcode 10 compatible. This change means that >+ older versions of the Xcode IDE can't read these projects. Nor can it >+ fully load workspaces that refer to these projects (the updated >+ projects are shown as non-expandable placeholders). `xcodebuild` can >+ still build these projects; it's just that the IDE can't open them. >+ >+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: >+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: >+ > 2019-01-25 Keith Rollin <krollin@apple.com> > > Update Xcode projects with "Check .xcfilelists" build phase >diff --git a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >index a3b6598369326c82a07478cda5f185ac4018dfe4..80b3175d79696d92d5ae6097d9f19a8822bd11ff 100644 >--- a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >+++ b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >@@ -3,7 +3,7 @@ > archiveVersion = 1; > classes = { > }; >- objectVersion = 46; >+ objectVersion = 51; > objects = { > > /* Begin PBXAggregateTarget section */ >@@ -1030,8 +1030,14 @@ > buildActionMask = 2147483647; > files = ( > ); >+ inputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-input.xcfilelist", >+ ); > inputPaths = ( > ); >+ outputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-output.xcfilelist", >+ ); > outputPaths = ( > ); > runOnlyForDeploymentPostprocessing = 0; >diff --git a/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj b/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj >index 84ce7e1ec8cf3a80b8200fbfe44b9417b580c836..b494d249f39c65bcdcf184722bb6157932000cb8 100644 >--- a/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj >+++ b/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj >@@ -3,7 +3,7 @@ > archiveVersion = 1; > classes = { > }; >- objectVersion = 45; >+ objectVersion = 51; > objects = { > > /* Begin PBXAggregateTarget section */ >@@ -1083,9 +1083,15 @@ > buildActionMask = 2147483647; > files = ( > ); >+ inputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-input.xcfilelist", >+ ); > inputPaths = ( > ); > name = "Generate Derived Sources"; >+ outputFileListPaths = ( >+ "$(SRCROOT)/DerivedSources-output.xcfilelist", >+ ); > outputPaths = ( > ); > runOnlyForDeploymentPostprocessing = 0;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=360181">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193792
:
360181
|
360394