Changeset 248106 in webkit
- Timestamp:
- Aug 1, 2019 10:52:01 AM (5 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r248104 r248106 1 2019-08-01 Keith Rollin <krollin@apple.com> 2 3 Update TestWebKitAPI for XCBuild 4 https://bugs.webkit.org/show_bug.cgi?id=200311 5 <rdar://problem/53773804> 6 7 Reviewed by Alex Christensen. 8 9 Bug 199728 (svn 247402) updated TestWebKitAPI to use the unified-build 10 technique. Now update WebKitLegacy to build under XCBuild after those 11 changes. This work involves adding an "Apply Configuration to 12 XCFileLists" build target, adding a check-xcfilelists.sh script, 13 adding a "Check xcfilelists" build phase that calls that script, 14 adding knowledge of the project to the generate-xcfilelists script, 15 creating new .xcfilelist files, and adding those to the project. 16 17 * Scripts/webkitpy/generate_xcfilelists_lib/application.py: 18 (Application.__init__): 19 * Scripts/webkitpy/generate_xcfilelists_lib/generators.py: 20 (WebKitTestRunnerGenerator._get_generate_derived_sources_script): 21 (TestWebKitAPIGenerator): 22 (TestWebKitAPIGenerator._get_project_file_path): 23 (TestWebKitAPIGenerator._get_generate_unified_sources_script): 24 * TestWebKitAPI/Scripts/check-xcfilelists.sh: Added. 25 * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: 26 * TestWebKitAPI/UnifiedSources-output.xcfilelist: Added. 27 1 28 2019-08-01 Youenn Fablet <youenn@apple.com> 2 29 -
trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py
r248051 r248106 99 99 "DumpRenderTree": Generators.DumpRenderTreeGenerator, 100 100 "WebKitTestRunner": Generators.WebKitTestRunnerGenerator, 101 "TestWebKitAPI": Generators.TestWebKitAPIGenerator, 101 102 } 102 103 -
trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py
r248051 r248106 740 740 def _get_generate_derived_sources_script(self): 741 741 return os.path.join(self._get_project_dir(), "Scripts", "generate-derived-sources.sh") 742 743 744 class TestWebKitAPIGenerator(BaseGenerator): 745 VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator") 746 VALID_CONFIGURATIONS = ("Debug", "Release", "Production") 747 748 @util.LogEntryExit 749 def _get_project_file_path(self): 750 return os.path.join(self.application.get_opensource_dir(), "Tools", "TestWebKitAPI", "TestWebKitAPI.xcodeproj") 751 752 @util.LogEntryExit 753 def _get_generate_unified_sources_script(self): 754 return os.path.join(self._get_project_dir(), "Scripts", "generate-unified-sources.sh") -
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
r248104 r248106 4 4 classes = { 5 5 }; 6 objectVersion = 46;6 objectVersion = 51; 7 7 objects = { 8 8 9 9 /* Begin PBXAggregateTarget section */ 10 537CF84322EFD64100C6EBB3 /* Apply Configuration to XCFileLists */ = { 11 isa = PBXAggregateTarget; 12 buildConfigurationList = 537CF84622EFD64100C6EBB3 /* Build configuration list for PBXAggregateTarget "Apply Configuration to XCFileLists" */; 13 buildPhases = ( 14 537CF84722EFD65000C6EBB3 /* ShellScript */, 15 ); 16 dependencies = ( 17 ); 18 name = "Apply Configuration to XCFileLists"; 19 productName = "Apply Configuration to XCFileLists"; 20 }; 10 21 5C9D921422D7DA02008E9266 /* Generate Unified Sources */ = { 11 22 isa = PBXAggregateTarget; … … 23 34 buildConfigurationList = 7C83E02C1D0A5E1000FEBCF3 /* Build configuration list for PBXAggregateTarget "All" */; 24 35 buildPhases = ( 36 537CF84822EFD72000C6EBB3 /* Check .xcfilelists */, 25 37 ); 26 38 dependencies = ( … … 4068 4080 LastUpgradeCheck = 1000; 4069 4081 TargetAttributes = { 4082 537CF84322EFD64100C6EBB3 = { 4083 CreatedOnToolsVersion = 11.0; 4084 }; 4070 4085 7C83E02B1D0A5E1000FEBCF3 = { 4071 4086 CreatedOnToolsVersion = 8.0; … … 4107 4122 BC57597F126E74AF006F0F12 /* InjectedBundleTestWebKitAPI */, 4108 4123 A13EBB481B87339E00097110 /* WebProcessPlugIn */, 4124 537CF84322EFD64100C6EBB3 /* Apply Configuration to XCFileLists */, 4109 4125 ); 4110 4126 }; … … 4122 4138 4123 4139 /* Begin PBXShellScriptBuildPhase section */ 4140 537CF84722EFD65000C6EBB3 /* ShellScript */ = { 4141 isa = PBXShellScriptBuildPhase; 4142 buildActionMask = 2147483647; 4143 files = ( 4144 ); 4145 inputFileListPaths = ( 4146 ); 4147 inputPaths = ( 4148 ); 4149 outputFileListPaths = ( 4150 ); 4151 outputPaths = ( 4152 ); 4153 runOnlyForDeploymentPostprocessing = 0; 4154 shellPath = /bin/sh; 4155 shellScript = "eval \"${WK_SUBLAUNCH_SCRIPT_PARAMETERS[@]}\"\n"; 4156 }; 4157 537CF84822EFD72000C6EBB3 /* Check .xcfilelists */ = { 4158 isa = PBXShellScriptBuildPhase; 4159 buildActionMask = 2147483647; 4160 files = ( 4161 ); 4162 inputFileListPaths = ( 4163 ); 4164 inputPaths = ( 4165 ); 4166 name = "Check .xcfilelists"; 4167 outputFileListPaths = ( 4168 ); 4169 outputPaths = ( 4170 ); 4171 runOnlyForDeploymentPostprocessing = 0; 4172 shellPath = /bin/sh; 4173 shellScript = "Scripts/check-xcfilelists.sh\n"; 4174 }; 4124 4175 5C9D921C22D7DA33008E9266 /* ShellScript */ = { 4125 4176 isa = PBXShellScriptBuildPhase; … … 4135 4186 ); 4136 4187 outputFileListPaths = ( 4188 "$(SRCROOT)/UnifiedSources-output.xcfilelist", 4137 4189 ); 4138 4190 outputPaths = ( 4139 "$(SRCROOT)/UnifiedSources-output.xcfilelist",4140 4191 ); 4141 4192 runOnlyForDeploymentPostprocessing = 0; … … 4901 4952 name = Release; 4902 4953 }; 4954 537CF84422EFD64100C6EBB3 /* Debug */ = { 4955 isa = XCBuildConfiguration; 4956 buildSettings = { 4957 CODE_SIGN_STYLE = Automatic; 4958 PRODUCT_NAME = "$(TARGET_NAME)"; 4959 }; 4960 name = Debug; 4961 }; 4962 537CF84522EFD64100C6EBB3 /* Release */ = { 4963 isa = XCBuildConfiguration; 4964 buildSettings = { 4965 CODE_SIGN_STYLE = Automatic; 4966 PRODUCT_NAME = "$(TARGET_NAME)"; 4967 }; 4968 name = Release; 4969 }; 4903 4970 5C9D921A22D7DA02008E9266 /* Debug */ = { 4904 4971 isa = XCBuildConfiguration; … … 5020 5087 defaultConfigurationName = Release; 5021 5088 }; 5089 537CF84622EFD64100C6EBB3 /* Build configuration list for PBXAggregateTarget "Apply Configuration to XCFileLists" */ = { 5090 isa = XCConfigurationList; 5091 buildConfigurations = ( 5092 537CF84422EFD64100C6EBB3 /* Debug */, 5093 537CF84522EFD64100C6EBB3 /* Release */, 5094 ); 5095 defaultConfigurationIsVisible = 0; 5096 defaultConfigurationName = Release; 5097 }; 5022 5098 5C9D921922D7DA02008E9266 /* Build configuration list for PBXAggregateTarget "Generate Unified Sources" */ = { 5023 5099 isa = XCConfigurationList;
Note: See TracChangeset
for help on using the changeset viewer.