Diff
Modified: trunk/Source/WebKitLegacy/ChangeLog (248050 => 248051)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-07-31 19:01:32 UTC (rev 248050)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-07-31 20:34:50 UTC (rev 248051)
@@ -1,3 +1,23 @@
+2019-07-31 Keith Rollin <[email protected]>
+
+ Update WebKitLegacy for XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=200310
+ <rdar://problem/53773708>
+
+ Reviewed by Alex Christensen.
+
+ Bug 199771 (svn r247570) updated WebKitLegacy to use the unified-build
+ technique. Now update WebKitLegacy to build under XCBuild after those
+ changes. This work involves adding an "Apply Configuration to
+ XCFileLists" build target, adding a check-xcfilelists.sh script,
+ adding a "Check xcfilelists" build phase that calls that script,
+ adding knowledge of the project to the generate-xcfilelists script,
+ creating new .xcfilelist files, and adding those to the project.
+
+ * UnifiedSources-output.xcfilelist: Added.
+ * WebKitLegacy.xcodeproj/project.pbxproj:
+ * scripts/check-xcfilelists.sh: Added.
+
2019-07-18 Alex Christensen <[email protected]>
Unify builds in WebKitLegacy/mac/DOM
Added: trunk/Source/WebKitLegacy/UnifiedSources-output.xcfilelist (0 => 248051)
--- trunk/Source/WebKitLegacy/UnifiedSources-output.xcfilelist (rev 0)
+++ trunk/Source/WebKitLegacy/UnifiedSources-output.xcfilelist 2019-07-31 20:34:50 UTC (rev 248051)
@@ -0,0 +1,24 @@
+# This file is generated by the generate-xcfilelists script.
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource1-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource1.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource10-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource11-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource12-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource13-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource14-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource15-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource16-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource17-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource18-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource2-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource2.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource3-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource3.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource4-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource4.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource5-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource5.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource6-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource7-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource8-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource9-mm.mm
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (248050 => 248051)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2019-07-31 19:01:32 UTC (rev 248050)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2019-07-31 20:34:50 UTC (rev 248051)
@@ -3,10 +3,21 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 51;
objects = {
/* Begin PBXAggregateTarget section */
+ 537CF83D22EFC4C900C6EBB3 /* Apply Configuration to XCFileLists */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = 537CF83E22EFC4C900C6EBB3 /* Build configuration list for PBXAggregateTarget "Apply Configuration to XCFileLists" */;
+ buildPhases = (
+ 537CF84222EFC4E400C6EBB3 /* ShellScript */,
+ );
+ dependencies = (
+ );
+ name = "Apply Configuration to XCFileLists";
+ productName = "Apply Configuration to XCFileLists";
+ };
5C9D925022D7E835008E9266 /* Generate Unified Sources */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 5C9D925422D7E836008E9266 /* Build configuration list for PBXAggregateTarget "Generate Unified Sources" */;
@@ -152,6 +163,7 @@
535E08CE225463B200DF00CA /* WebKitPluginClient.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588C0EDCCEA3008D883D /* WebKitPluginClient.defs */; };
535E08CF225463B200DF00CA /* WebKitPluginHost.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588D0EDCCEA3008D883D /* WebKitPluginHost.defs */; };
535E08D0225463B200DF00CA /* WebKitPluginHostTypes.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588E0EDCCEA3008D883D /* WebKitPluginHostTypes.defs */; };
+ 537CF83C22EFC13D00C6EBB3 /* check-xcfilelists.sh in Resources */ = {isa = PBXBuildFile; fileRef = 537CF83B22EFC13D00C6EBB3 /* check-xcfilelists.sh */; };
598AD91A1201CEC900ABAE4E /* WebDeviceOrientationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */; };
598AD91E1201CECF00ABAE4E /* WebDeviceOrientationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */; };
598AD9201201CF0700ABAE4E /* WebDeviceOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD91F1201CF0700ABAE4E /* WebDeviceOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -920,6 +932,7 @@
5241ADF30B1BC48A004012BD /* WebCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCache.h; sourceTree = "<group>"; };
5241ADF40B1BC48A004012BD /* WebCache.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCache.mm; sourceTree = "<group>"; };
535E08C52254604E00DF00CA /* postprocess-header-rule */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "postprocess-header-rule"; path = "scripts/postprocess-header-rule"; sourceTree = "<group>"; };
+ 537CF83B22EFC13D00C6EBB3 /* check-xcfilelists.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "check-xcfilelists.sh"; path = "scripts/check-xcfilelists.sh"; sourceTree = "<group>"; };
598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDeviceOrientationClient.h; sourceTree = "<group>"; };
598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDeviceOrientationClient.mm; sourceTree = "<group>"; };
598AD91F1201CF0700ABAE4E /* WebDeviceOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDeviceOrientation.h; sourceTree = "<group>"; };
@@ -1596,6 +1609,7 @@
0867D691FE84028FC02AAC07 /* WebKit */ = {
isa = PBXGroup;
children = (
+ 537CF83B22EFC13D00C6EBB3 /* check-xcfilelists.sh */,
5C9D925822D7E8AD008E9266 /* Sources.txt */,
5C9D925922D7E8AD008E9266 /* SourcesCocoa.txt */,
1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */,
@@ -3156,6 +3170,7 @@
5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */,
3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */,
1A3193D5191856E500E1CF89 /* Symlink WebKitPluginHost */,
+ 537CF83A22EFBFB100C6EBB3 /* Check .xcfilelists */,
);
buildRules = (
535E08C322545B4C00DF00CA /* PBXBuildRule */,
@@ -3179,6 +3194,9 @@
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
+ 537CF83D22EFC4C900C6EBB3 = {
+ CreatedOnToolsVersion = 11.0;
+ };
5C9D925022D7E835008E9266 = {
CreatedOnToolsVersion = 11.0;
ProvisioningStyle = Automatic;
@@ -3206,6 +3224,7 @@
targets = (
9398100A0824BF01008DF038 /* WebKitLegacy */,
5C9D925022D7E835008E9266 /* Generate Unified Sources */,
+ 537CF83D22EFC4C900C6EBB3 /* Apply Configuration to XCFileLists */,
);
};
/* End PBXProject section */
@@ -3219,6 +3238,7 @@
5C9D925A22D7E8AD008E9266 /* Sources.txt in Resources */,
5C9D925B22D7E8AD008E9266 /* SourcesCocoa.txt in Resources */,
939810B70824BF01008DF038 /* url_icon.tiff in Resources */,
+ 537CF83C22EFC13D00C6EBB3 /* check-xcfilelists.sh in Resources */,
939810B50824BF01008DF038 /* WebAuthenticationPanel.xib in Resources */,
5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib in Resources */,
);
@@ -3286,6 +3306,41 @@
shellPath = /bin/sh;
shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names DOM Web _Web || exit $?\nfi";
};
+ 537CF83A22EFBFB100C6EBB3 /* 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";
+ };
+ 537CF84222EFC4E400C6EBB3 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "eval \"${WK_SUBLAUNCH_SCRIPT_PARAMETERS[@]}\"\n";
+ };
5C9D925722D7E849008E9266 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -3299,9 +3354,9 @@
"$(SRCROOT)/SourcesCocoa.txt",
);
outputFileListPaths = (
+ "$(SRCROOT)/UnifiedSources-output.xcfilelist",
);
outputPaths = (
- "$(SRCROOT)/UnifiedSources-output.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
@@ -3650,6 +3705,30 @@
};
name = Production;
};
+ 537CF83F22EFC4C900C6EBB3 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CODE_SIGN_STYLE = Automatic;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ 537CF84022EFC4C900C6EBB3 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CODE_SIGN_STYLE = Automatic;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
+ 537CF84122EFC4C900C6EBB3 /* Production */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CODE_SIGN_STYLE = Automatic;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Production;
+ };
5C9D925122D7E836008E9266 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -3697,6 +3776,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
+ 537CF83E22EFC4C900C6EBB3 /* Build configuration list for PBXAggregateTarget "Apply Configuration to XCFileLists" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 537CF83F22EFC4C900C6EBB3 /* Debug */,
+ 537CF84022EFC4C900C6EBB3 /* Release */,
+ 537CF84122EFC4C900C6EBB3 /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
5C9D925422D7E836008E9266 /* Build configuration list for PBXAggregateTarget "Generate Unified Sources" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Added: trunk/Source/WebKitLegacy/scripts/check-xcfilelists.sh (0 => 248051)
--- trunk/Source/WebKitLegacy/scripts/check-xcfilelists.sh (rev 0)
+++ trunk/Source/WebKitLegacy/scripts/check-xcfilelists.sh 2019-07-31 20:34:50 UTC (rev 248051)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ "${WK_DISABLE_CHECK_XCFILELISTS}" == "1" ] && { echo "### Not running because WK_DISABLE_CHECK_XCFILELISTS is 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}/../../../${WK_ADDITIONAL_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 WebKitLegacy --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
Property changes on: trunk/Source/WebKitLegacy/scripts/check-xcfilelists.sh
___________________________________________________________________
Added: svn:executable
+*
\ No newline at end of property
Modified: trunk/Tools/ChangeLog (248050 => 248051)
--- trunk/Tools/ChangeLog 2019-07-31 19:01:32 UTC (rev 248050)
+++ trunk/Tools/ChangeLog 2019-07-31 20:34:50 UTC (rev 248051)
@@ -1,3 +1,30 @@
+2019-07-31 Keith Rollin <[email protected]>
+
+ Update WebKitLegacy for XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=200310
+ <rdar://problem/53773708>
+
+ Reviewed by Alex Christensen.
+
+ Bug 199771 (svn r247570) updated WebKitLegacy to use the unified-build
+ technique. Now update WebKitLegacy to build under XCBuild after those
+ changes. This work involves adding an "Apply Configuration to
+ XCFileLists" build target, adding a check-xcfilelists.sh script,
+ adding a "Check xcfilelists" build phase that calls that script,
+ adding knowledge of the project to the generate-xcfilelists script,
+ creating new .xcfilelist files, and adding those to the project.
+
+ * Scripts/webkitpy/generate_xcfilelists_lib/application.py:
+ (Application.__init__):
+ * Scripts/webkitpy/generate_xcfilelists_lib/generators.py:
+ (_javascript_CoreGenerator):
+ (WebCoreGenerator):
+ (WebKitGenerator):
+ (WebKitGenerator._get_generate_unified_sources_script):
+ (WebKitLegacyGenerator):
+ (WebKitLegacyGenerator._get_project_file_path):
+ (WebKitLegacyGenerator._get_generate_unified_sources_script):
+
2019-07-31 Chris Dumez <[email protected]>
REGRESSION (r247486?): Flaky API Test TestWebKitAPI.WKWebView.LocalStorageProcessSuspends
Modified: trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py (248050 => 248051)
--- trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py 2019-07-31 19:01:32 UTC (rev 248050)
+++ trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py 2019-07-31 20:34:50 UTC (rev 248051)
@@ -95,6 +95,7 @@
"_javascript_Core": Generators._javascript_CoreGenerator,
"WebCore": Generators.WebCoreGenerator,
"WebKit": Generators.WebKitGenerator,
+ "WebKitLegacy": Generators.WebKitLegacyGenerator,
"DumpRenderTree": Generators.DumpRenderTreeGenerator,
"WebKitTestRunner": Generators.WebKitTestRunnerGenerator,
}
Modified: trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py (248050 => 248051)
--- trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py 2019-07-31 19:01:32 UTC (rev 248050)
+++ trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py 2019-07-31 20:34:50 UTC (rev 248051)
@@ -648,7 +648,7 @@
class _javascript_CoreGenerator(BaseGenerator):
- VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+ VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
VALID_CONFIGURATIONS = ("Debug", "Release", "Production", "Profiling")
@util.LogEntryExit
@@ -665,7 +665,7 @@
class WebCoreGenerator(BaseGenerator):
- VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+ VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
@util.LogEntryExit
@@ -682,7 +682,7 @@
class WebKitGenerator(BaseGenerator):
- VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+ VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
@util.LogEntryExit
@@ -702,6 +702,19 @@
return os.path.join(self._get_project_dir(), "Scripts", "generate-unified-sources.sh")
+class WebKitLegacyGenerator(BaseGenerator):
+ VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+ VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
+
+ @util.LogEntryExit
+ def _get_project_file_path(self):
+ return os.path.join(self.application.get_opensource_dir(), "Source", "WebKitLegacy", "WebKitLegacy.xcodeproj")
+
+ @util.LogEntryExit
+ def _get_generate_unified_sources_script(self):
+ return os.path.join(self._get_project_dir(), "scripts", "generate-unified-sources.sh")
+
+
class DumpRenderTreeGenerator(BaseGenerator):
VALID_PLATFORMS = ("macosx", )
VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
