WebKit Bugzilla
Attachment 360175 Details for
Bug 193790
: Update Xcode projects with "Check .xcfilelists" build phase
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193790-20190125152406.patch (text/plain), 18.61 KB, created by
Keith Rollin
on 2019-01-25 15:24:07 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Keith Rollin
Created:
2019-01-25 15:24:07 PST
Size:
18.61 KB
patch
obsolete
>Subversion Revision: 240517 >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index 9f3c1f4f3db710382cd522c7ddb80e7e698c6e87..51391f0886b28a29f884ec99917cc9b774bb6671 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,30 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Update Xcode projects with "Check .xcfilelists" build phase >+ https://bugs.webkit.org/show_bug.cgi?id=193790 >+ <rdar://problem/47201374> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Support for XCBuild includes specifying inputs and outputs to various >+ Run Script build phases. These inputs and outputs are specified as >+ .xcfilelist files. Once created, these .xcfilelist files need to be >+ kept up-to-date. In order to check that they are up-to-date or not, >+ add an Xcode build step that invokes an external script that performs >+ the checking. If the .xcfilelists are found to be out-of-date, update >+ them, halt the build, and instruct the developer to restart the build >+ with up-to-date files. >+ >+ At this time, the checking and regenerating is performed only if the >+ WK_ENABLE_CHECK_XCFILELISTS environment variable is set to 1. People >+ who want to use this facility can set this variable and test out the >+ checking/regenerating. Once it seems like there are no egregious >+ issues that upset a developer's workflow, we'll unconditionally enable >+ this facility. >+ >+ * JavaScriptCore.xcodeproj/project.pbxproj: >+ * Scripts/check-xcfilelists.sh: Added. >+ > 2019-01-25 Keith Rollin <krollin@apple.com> > > Update Xcode projects with "Apply Configuration to XCFileLists" build target >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index a9de4c414a3409c06b806011d024e11108e252bb..abc11e2f433d20e490f4af79e9ff66339f49597a 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,32 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Update Xcode projects with "Check .xcfilelists" build phase >+ https://bugs.webkit.org/show_bug.cgi?id=193790 >+ <rdar://problem/47201374> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Support for XCBuild includes specifying inputs and outputs to various >+ Run Script build phases. These inputs and outputs are specified as >+ .xcfilelist files. Once created, these .xcfilelist files need to be >+ kept up-to-date. In order to check that they are up-to-date or not, >+ add an Xcode build step that invokes an external script that performs >+ the checking. If the .xcfilelists are found to be out-of-date, update >+ them, halt the build, and instruct the developer to restart the build >+ with up-to-date files. >+ >+ At this time, the checking and regenerating is performed only if the >+ WK_ENABLE_CHECK_XCFILELISTS environment variable is set to 1. People >+ who want to use this facility can set this variable and test out the >+ checking/regenerating. Once it seems like there are no egregious >+ issues that upset a developer's workflow, we'll unconditionally enable >+ this facility. >+ >+ No new tests since there should be no observable behavior difference. >+ >+ * Scripts/check-xcfilelists.sh: Added. >+ * WebCore.xcodeproj/project.pbxproj: >+ > 2019-01-25 Keith Rollin <krollin@apple.com> > > Update Xcode projects with "Apply Configuration to XCFileLists" build target >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index db3404c4968f7f6186b508f92bcb5cc806c0dfa1..cca3f9868342ddddc6be7db0d741d0d864dfbad1 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,30 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Update Xcode projects with "Check .xcfilelists" build phase >+ https://bugs.webkit.org/show_bug.cgi?id=193790 >+ <rdar://problem/47201374> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Support for XCBuild includes specifying inputs and outputs to various >+ Run Script build phases. These inputs and outputs are specified as >+ .xcfilelist files. Once created, these .xcfilelist files need to be >+ kept up-to-date. In order to check that they are up-to-date or not, >+ add an Xcode build step that invokes an external script that performs >+ the checking. If the .xcfilelists are found to be out-of-date, update >+ them, halt the build, and instruct the developer to restart the build >+ with up-to-date files. >+ >+ At this time, the checking and regenerating is performed only if the >+ WK_ENABLE_CHECK_XCFILELISTS environment variable is set to 1. People >+ who want to use this facility can set this variable and test out the >+ checking/regenerating. Once it seems like there are no egregious >+ issues that upset a developer's workflow, we'll unconditionally enable >+ this facility. >+ >+ * Scripts/check-xcfilelists.sh: Added. >+ * WebKit.xcodeproj/project.pbxproj: >+ > 2019-01-25 Keith Rollin <krollin@apple.com> > > Update Xcode projects with "Apply Configuration to XCFileLists" build target >diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >index 970cee80db82e98a4935b168a857c4bffae5e0cc..d5f115a94d1231373165f54aa68a4419f5de9db2 100644 >--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj >@@ -10022,6 +10022,7 @@ > 3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */, > A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */, > 1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */, >+ 53609F9021DFFA9C008FA60A /* Check .xcfilelists */, > ); > buildRules = ( > ); >@@ -10238,6 +10239,24 @@ > shellPath = /bin/sh; > shellScript = "eval \"${WK_SUBLAUNCH_SCRIPT_PARAMETERS[@]}\"\n"; > }; >+ 53609F9021DFFA9C008FA60A /* Check .xcfilelists */ = { >+ isa = PBXShellScriptBuildPhase; >+ buildActionMask = 2147483647; >+ files = ( >+ ); >+ inputFileListPaths = ( >+ ); >+ inputPaths = ( >+ ); >+ name = "Check .xcfilelists"; >+ outputFileListPaths = ( >+ ); >+ outputPaths = ( >+ ); >+ runOnlyForDeploymentPostprocessing = 0; >+ shellPath = /bin/sh; >+ shellScript = "Scripts/check-xcfilelists.sh\n"; >+ }; > 53B4BD091F68AF8900D2BEA3 /* Generate Unified Sources */ = { > isa = PBXShellScriptBuildPhase; > buildActionMask = 2147483647; >diff --git a/Source/JavaScriptCore/Scripts/check-xcfilelists.sh b/Source/JavaScriptCore/Scripts/check-xcfilelists.sh >new file mode 100755 >index 0000000000000000000000000000000000000000..953dae273549424a79188b38b211b557d513201f >--- /dev/null >+++ b/Source/JavaScriptCore/Scripts/check-xcfilelists.sh >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+[ "${WK_ENABLE_CHECK_XCFILELISTS}" == "" ] && { echo "### Not running because WK_ENABLE_CHECK_XCFILELISTS is not set"; exit 0; } >+[ "${DEPLOYMENT_LOCATION}" == "YES" ] && { echo "### Not running because DEPLOYMENT_LOCATION is YES"; exit 0; } >+[ "${USE_INTERNAL_SDK}" == "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; } >+ >+SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; } >+ >+"${SCRIPT}" generate-xcode --project JavaScriptCore --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}" >diff --git a/Source/WebCore/Scripts/check-xcfilelists.sh b/Source/WebCore/Scripts/check-xcfilelists.sh >new file mode 100755 >index 0000000000000000000000000000000000000000..c669a7de60d175e1a1c1ac3a62ab849c98db962a >--- /dev/null >+++ b/Source/WebCore/Scripts/check-xcfilelists.sh >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+[ "${WK_ENABLE_CHECK_XCFILELISTS}" == "" ] && { echo "### Not running because WK_ENABLE_CHECK_XCFILELISTS is not set"; exit 0; } >+[ "${DEPLOYMENT_LOCATION}" == "YES" ] && { echo "### Not running because DEPLOYMENT_LOCATION is YES"; exit 0; } >+[ "${USE_INTERNAL_SDK}" == "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; } >+ >+SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; } >+ >+"${SCRIPT}" generate-xcode --project WebCore --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}" >diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >index 42975d70aba0d5bdc8f9e2b755ad87b96e838f71..990dcda9bf0105b613b670e1d0f12efe8a83f1ac 100644 >--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj >+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >@@ -32423,6 +32423,7 @@ > 37A1EAA3142699BC0087F425 /* Check For Inappropriate Objective-C Class Names */, > 5DF50887116F3077005202AB /* Check For Inappropriate Files In Framework */, > 71D6AA381DA4E69400B23969 /* Copy modern media controls code and assets */, >+ 5379C7AA21E5287100E4A8F6 /* Check .xcfilelists */, > ); > buildRules = ( > ); >@@ -32602,6 +32603,24 @@ > shellPath = /bin/sh; > shellScript = "Scripts/generate-unified-sources.sh\n"; > }; >+ 5379C7AA21E5287100E4A8F6 /* Check .xcfilelists */ = { >+ isa = PBXShellScriptBuildPhase; >+ buildActionMask = 2147483647; >+ files = ( >+ ); >+ inputFileListPaths = ( >+ ); >+ inputPaths = ( >+ ); >+ name = "Check .xcfilelists"; >+ outputFileListPaths = ( >+ ); >+ outputPaths = ( >+ ); >+ runOnlyForDeploymentPostprocessing = 0; >+ shellPath = /bin/sh; >+ shellScript = "Scripts/check-xcfilelists.sh\n"; >+ }; > 5D0D540D0E9862F60029E223 /* Check For Weak VTables and Externals */ = { > isa = PBXShellScriptBuildPhase; > buildActionMask = 2147483647; >diff --git a/Source/WebKit/Scripts/check-xcfilelists.sh b/Source/WebKit/Scripts/check-xcfilelists.sh >new file mode 100755 >index 0000000000000000000000000000000000000000..8e836f12599600eadee39dc414ea4cc4dfa85659 >--- /dev/null >+++ b/Source/WebKit/Scripts/check-xcfilelists.sh >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+[ "${WK_ENABLE_CHECK_XCFILELISTS}" == "" ] && { echo "### Not running because WK_ENABLE_CHECK_XCFILELISTS is not set"; exit 0; } >+[ "${DEPLOYMENT_LOCATION}" == "YES" ] && { echo "### Not running because DEPLOYMENT_LOCATION is YES"; exit 0; } >+[ "${USE_INTERNAL_SDK}" == "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; } >+ >+SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; } >+ >+"${SCRIPT}" generate-xcode --project WebKit --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}" >diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >index 26cc295a71bd4a827b855bb544c6aa6b994e10fa..46eab2b89f639b5220efd4c7add12f27e0827ffd 100644 >--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj >+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >@@ -10048,6 +10048,7 @@ > 5DF408D1131DDBEC00130071 /* Check For Inappropriate Files In Framework */, > A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */, > 1A2180161B5454620046AEC4 /* Add Symlink in /System/Library/PrivateFrameworks */, >+ 5379C7AC21E5288500E4A8F6 /* Check .xcfilelists */, > ); > buildRules = ( > ); >@@ -10483,6 +10484,24 @@ > shellPath = /bin/sh; > shellScript = "eval \"${WK_SUBLAUNCH_SCRIPT_PARAMETERS[@]}\"\n"; > }; >+ 5379C7AC21E5288500E4A8F6 /* Check .xcfilelists */ = { >+ isa = PBXShellScriptBuildPhase; >+ buildActionMask = 2147483647; >+ files = ( >+ ); >+ inputFileListPaths = ( >+ ); >+ inputPaths = ( >+ ); >+ name = "Check .xcfilelists"; >+ outputFileListPaths = ( >+ ); >+ outputPaths = ( >+ ); >+ runOnlyForDeploymentPostprocessing = 0; >+ shellPath = /bin/sh; >+ shellScript = "Scripts/check-xcfilelists.sh\n"; >+ }; > 5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = { > isa = PBXShellScriptBuildPhase; > buildActionMask = 2147483647; >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 8893820244c7116af8886e531ecf77e02b49bf26..7a3c05ad9233c0c3fd6518a4d4a13b655e93ac99 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,32 @@ >+2019-01-24 Keith Rollin <krollin@apple.com> >+ >+ Update Xcode projects with "Check .xcfilelists" build phase >+ https://bugs.webkit.org/show_bug.cgi?id=193790 >+ <rdar://problem/47201374> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Support for XCBuild includes specifying inputs and outputs to various >+ Run Script build phases. These inputs and outputs are specified as >+ .xcfilelist files. Once created, these .xcfilelist files need to be >+ kept up-to-date. In order to check that they are up-to-date or not, >+ add an Xcode build step that invokes an external script that performs >+ the checking. If the .xcfilelists are found to be out-of-date, update >+ them, halt the build, and instruct the developer to restart the build >+ with up-to-date files. >+ >+ At this time, the checking and regenerating is performed only if the >+ WK_ENABLE_CHECK_XCFILELISTS environment variable is set to 1. People >+ who want to use this facility can set this variable and test out the >+ checking/regenerating. Once it seems like there are no egregious >+ issues that upset a developer's workflow, we'll unconditionally enable >+ this facility. >+ >+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: >+ * DumpRenderTree/Scripts/check-xcfilelists.sh: Added. >+ * WebKitTestRunner/Scripts/check-xcfilelists.sh: Added. >+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: >+ > 2019-01-25 Keith Rollin <krollin@apple.com> > > Update Xcode projects with "Apply Configuration to XCFileLists" build target >diff --git a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >index 9dfe8b3be3827d542fcb251288d68cbe3812b81d..a3b6598369326c82a07478cda5f185ac4018dfe4 100644 >--- a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >+++ b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >@@ -953,6 +953,7 @@ > buildConfigurationList = A1321C9F188F9A3600125434 /* Build configuration list for PBXNativeTarget "DumpRenderTree (Library)" */; > buildPhases = ( > 9340994D08540CAE007F3BC8 /* Sources */, >+ 53A8193B21E52997000B93AB /* Check .xcfilelists */, > ); > buildRules = ( > ); >@@ -1054,6 +1055,24 @@ > shellPath = /bin/sh; > shellScript = "eval \"${WK_SUBLAUNCH_SCRIPT_PARAMETERS[@]}\"\n"; > }; >+ 53A8193B21E52997000B93AB /* Check .xcfilelists */ = { >+ isa = PBXShellScriptBuildPhase; >+ buildActionMask = 2147483647; >+ files = ( >+ ); >+ inputFileListPaths = ( >+ ); >+ inputPaths = ( >+ ); >+ name = "Check .xcfilelists"; >+ outputFileListPaths = ( >+ ); >+ outputPaths = ( >+ ); >+ runOnlyForDeploymentPostprocessing = 0; >+ shellPath = /bin/sh; >+ shellScript = "Scripts/check-xcfilelists.sh\n"; >+ }; > /* End PBXShellScriptBuildPhase section */ > > /* Begin PBXSourcesBuildPhase section */ >diff --git a/Tools/DumpRenderTree/Scripts/check-xcfilelists.sh b/Tools/DumpRenderTree/Scripts/check-xcfilelists.sh >new file mode 100755 >index 0000000000000000000000000000000000000000..8a087734d959e39880f7ffc9a16bf45303542de9 >--- /dev/null >+++ b/Tools/DumpRenderTree/Scripts/check-xcfilelists.sh >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+[ "${WK_ENABLE_CHECK_XCFILELISTS}" == "" ] && { echo "### Not running because WK_ENABLE_CHECK_XCFILELISTS is not set"; exit 0; } >+[ "${DEPLOYMENT_LOCATION}" == "YES" ] && { echo "### Not running because DEPLOYMENT_LOCATION is YES"; exit 0; } >+[ "${USE_INTERNAL_SDK}" == "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; } >+ >+SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; } >+ >+"${SCRIPT}" generate-xcode --project DumpRenderTree --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}" >diff --git a/Tools/WebKitTestRunner/Scripts/check-xcfilelists.sh b/Tools/WebKitTestRunner/Scripts/check-xcfilelists.sh >new file mode 100755 >index 0000000000000000000000000000000000000000..730145c46d6080ea0ba6ebea567754a484027340 >--- /dev/null >+++ b/Tools/WebKitTestRunner/Scripts/check-xcfilelists.sh >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+[ "${WK_ENABLE_CHECK_XCFILELISTS}" == "" ] && { echo "### Not running because WK_ENABLE_CHECK_XCFILELISTS is not set"; exit 0; } >+[ "${DEPLOYMENT_LOCATION}" == "YES" ] && { echo "### Not running because DEPLOYMENT_LOCATION is YES"; exit 0; } >+[ "${USE_INTERNAL_SDK}" == "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; } >+ >+SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists" >+[ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; } >+ >+"${SCRIPT}" generate-xcode --project WebKitTestRunner --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}" >diff --git a/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj b/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj >index e86bed1020b9f028f962aacdf8626684d0c72917..84ce7e1ec8cf3a80b8200fbfe44b9417b580c836 100644 >--- a/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj >+++ b/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj >@@ -952,6 +952,7 @@ > BC25185E11D15D54002EBC01 /* Resources */, > BC25185F11D15D54002EBC01 /* Sources */, > BC25186011D15D54002EBC01 /* Frameworks */, >+ 53A8193A21E52973000B93AB /* Check .xcfilelists */, > ); > buildRules = ( > ); >@@ -1059,6 +1060,24 @@ > shellPath = /bin/sh; > shellScript = "eval \"${WK_SUBLAUNCH_SCRIPT_PARAMETERS[@]}\"\n"; > }; >+ 53A8193A21E52973000B93AB /* Check .xcfilelists */ = { >+ isa = PBXShellScriptBuildPhase; >+ buildActionMask = 2147483647; >+ files = ( >+ ); >+ inputFileListPaths = ( >+ ); >+ inputPaths = ( >+ ); >+ name = "Check .xcfilelists"; >+ outputFileListPaths = ( >+ ); >+ outputPaths = ( >+ ); >+ runOnlyForDeploymentPostprocessing = 0; >+ shellPath = /bin/sh; >+ shellScript = "Scripts/check-xcfilelists.sh\n"; >+ }; > BC952D8211F3BF78003398B4 /* Generate Derived Sources */ = { > isa = PBXShellScriptBuildPhase; > buildActionMask = 2147483647;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=360175">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 193790
: 360175