Diff
Modified: trunk/ChangeLog (262307 => 262308)
--- trunk/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,18 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ * Makefile.shared:
+ * WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings:
+
2020-05-27 Kenneth Russell <k...@chromium.org>
Update MobileMiniBrowser project settings to current Xcode
Modified: trunk/Makefile.shared (262307 => 262308)
--- trunk/Makefile.shared 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Makefile.shared 2020-05-29 18:40:48 UTC (rev 262308)
@@ -47,8 +47,11 @@
ifeq ($(findstring UseNewBuildSystem,$(ARGS)),)
CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()')
ifeq ($(CAN_USE_XCBUILD),1)
- XCODE_OPTIONS += -UseNewBuildSystem=YES
- XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=YES
+ # Temporarily disable default use of XCBuild until issues with it are ironed out.
+ #XCODE_OPTIONS += -UseNewBuildSystem=YES
+ #XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=YES
+ XCODE_OPTIONS += -UseNewBuildSystem=NO
+ XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=NO
else
XCODE_OPTIONS += -UseNewBuildSystem=NO
XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=NO
Modified: trunk/Source/_javascript_Core/ChangeLog (262307 => 262308)
--- trunk/Source/_javascript_Core/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,18 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ * Configurations/_javascript_Core.xcconfig:
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
2020-05-29 Commit Queue <commit-qu...@webkit.org>
Unreviewed, reverting r262245.
Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (262307 => 262308)
--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2020-05-29 18:40:48 UTC (rev 262308)
@@ -53,7 +53,7 @@
INSTALLHDRS_SCRIPT_PHASE = YES;
APPLY_RULES_IN_COPY_HEADERS = $(WK_APPLY_RULES_IN_COPY_HEADERS_$(USE_NEW_BUILD_SYSTEM));
-WK_APPLY_RULES_IN_COPY_HEADERS_ = YES;
+WK_APPLY_RULES_IN_COPY_HEADERS_ = NO;
WK_APPLY_RULES_IN_COPY_HEADERS_NO = NO;
WK_APPLY_RULES_IN_COPY_HEADERS_YES = YES;
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (262307 => 262308)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-05-29 18:40:48 UTC (rev 262308)
@@ -10732,6 +10732,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1140;
TargetAttributes = {
@@ -10861,7 +10862,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n # 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.\n exit 0\nfi\n\nexec ${SRCROOT}/postprocess-headers.sh\n";
+ shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n # 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.\n exit 0\nfi\n\nexec ${SRCROOT}/postprocess-headers.sh\n";
};
374F95C9205F9975002BF68F /* Make libWTF.a Symbolic Link */ = {
isa = PBXShellScriptBuildPhase;
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (262307 => 262308)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-05-29 18:40:48 UTC (rev 262308)
@@ -3021,6 +3021,7 @@
FB39D0701200ED9200088E69 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1140;
};
@@ -3058,7 +3059,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n # 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.\n exit 0\nfi\n\nexec \"$SRCROOT/adjust-angle-include-paths.sh\"\n";
+ shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n # 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.\n exit 0\nfi\n\nexec \"$SRCROOT/adjust-angle-include-paths.sh\"\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (262307 => 262308)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,18 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/ANGLE.xcconfig:
+
2020-05-27 Keith Rollin <krol...@apple.com>
Enable the use of XCBuild by default in Apple builds
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig (262307 => 262308)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2020-05-29 18:40:48 UTC (rev 262308)
@@ -5,7 +5,7 @@
INSTALLHDRS_SCRIPT_PHASE = YES;
APPLY_RULES_IN_COPY_HEADERS = $(WK_APPLY_RULES_IN_COPY_HEADERS_$(USE_NEW_BUILD_SYSTEM));
-WK_APPLY_RULES_IN_COPY_HEADERS_ = YES;
+WK_APPLY_RULES_IN_COPY_HEADERS_ = NO;
WK_APPLY_RULES_IN_COPY_HEADERS_NO = NO;
WK_APPLY_RULES_IN_COPY_HEADERS_YES = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (262307 => 262308)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,17 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ * libwebrtc.xcodeproj/project.pbxproj:
+
2020-05-29 Youenn Fablet <you...@apple.com>
Enable VTB required low latency code path
Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (262307 => 262308)
--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2020-05-29 18:40:48 UTC (rev 262308)
@@ -16301,6 +16301,7 @@
FB39D0701200ED9200088E69 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
Modified: trunk/Source/WebCore/ChangeLog (262307 => 262308)
--- trunk/Source/WebCore/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebCore/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,19 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ No new tests -- build fix.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
2020-05-29 Myles C. Maxfield <mmaxfi...@apple.com>
REGRESSION(r261940): PLT5 is 2% regressed
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (262307 => 262308)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-05-29 18:40:48 UTC (rev 262308)
@@ -29968,6 +29968,7 @@
C330A22313EC196B0000B45B /* ColorChooser.h in Headers */,
C37CDEBD149EF2030042090D /* ColorChooserClient.h in Headers */,
F48D2AA52159740D00C6752B /* ColorCocoa.h in Headers */,
+ 7CAC6AF0247F411000E61D59 /* ColorComponents.h in Headers */,
3103B7DF1DB01567008BB890 /* ColorHash.h in Headers */,
F55B3DB41251F12D003EF269 /* ColorInputType.h in Headers */,
CE5169E721F1B84700EA4F78 /* ColorIOS.h in Headers */,
@@ -32798,7 +32799,6 @@
A5071E871C56D0E1009951BE /* ResourceUsageThread.h in Headers */,
418938B22429F9B4007FDC41 /* RetrieveRecordsOptions.h in Headers */,
FD3160A512B026F700C1A359 /* Reverb.h in Headers */,
- 7CAC6AF0247F411000E61D59 /* ColorComponents.h in Headers */,
FD3160A712B026F700C1A359 /* ReverbAccumulationBuffer.h in Headers */,
FD3160A912B026F700C1A359 /* ReverbConvolver.h in Headers */,
FD3160AB12B026F700C1A359 /* ReverbConvolverStage.h in Headers */,
@@ -33961,6 +33961,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1140;
TargetAttributes = {
Modified: trunk/Source/WebKit/ChangeLog (262307 => 262308)
--- trunk/Source/WebKit/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebKit/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,18 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ * Configurations/WebKit.xcconfig:
+ * WebKit.xcodeproj/project.pbxproj:
+
2020-05-29 Devin Rousso <drou...@apple.com>
Web Inspector: add ITML debuggable/target type
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (262307 => 262308)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-05-29 18:40:48 UTC (rev 262308)
@@ -161,7 +161,7 @@
INSTALLHDRS_SCRIPT_PHASE = YES;
APPLY_RULES_IN_COPY_HEADERS = $(WK_APPLY_RULES_IN_COPY_HEADERS_$(USE_NEW_BUILD_SYSTEM));
-WK_APPLY_RULES_IN_COPY_HEADERS_ = YES;
+WK_APPLY_RULES_IN_COPY_HEADERS_ = NO;
WK_APPLY_RULES_IN_COPY_HEADERS_NO = NO;
WK_APPLY_RULES_IN_COPY_HEADERS_YES = YES;
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (262307 => 262308)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-05-29 18:40:48 UTC (rev 262308)
@@ -12017,6 +12017,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1140;
TargetAttributes = {
@@ -12145,7 +12146,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n # 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.\n exit 0\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exec ${SRCROOT}/mac/postprocess-framework-headers.sh\nfi\n";
+ shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n # 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.\n exit 0\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exec ${SRCROOT}/mac/postprocess-framework-headers.sh\nfi\n";
};
1A2180161B5454620046AEC4 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
isa = PBXShellScriptBuildPhase;
@@ -12188,7 +12189,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n # 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.\n exit 0\nfi\n\nWKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ \"${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}\" == \"YES\" ]]; then\n UNIFDEF_OPTIONS=\"-UWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nelse\n UNIFDEF_OPTIONS=\"-DWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o \"${WKFOUNDATION_H}\".unifdef \"${WKFOUNDATION_H}\"\n\ncase $? in\n0)\n rm \"${WKFOUNDATION_H}\".unifdef\n ;;\n1)\n mv \"${WKFOUNDATION_H}\"{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
+ shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n # 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.\n exit 0\nfi\n\nWKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ \"${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}\" == \"YES\" ]]; then\n UNIFDEF_OPTIONS=\"-UWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nelse\n UNIFDEF_OPTIONS=\"-DWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o \"${WKFOUNDATION_H}\".unifdef \"${WKFOUNDATION_H}\"\n\ncase $? in\n0)\n rm \"${WKFOUNDATION_H}\".unifdef\n ;;\n1)\n mv \"${WKFOUNDATION_H}\"{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
};
1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */ = {
isa = PBXShellScriptBuildPhase;
@@ -12316,7 +12317,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n # 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.\n exit 0\nfi\n\nWKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UBUILDING_WPE__ -UUSE_SOUP -o \"${WKBASE_H}\".unifdef \"${WKBASE_H}\"\n\ncase $? in\n0)\n rm \"${WKBASE_H}\".unifdef\n ;;\n1)\n mv \"${WKBASE_H}\"{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
+ shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n # 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.\n exit 0\nfi\n\nWKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UBUILDING_WPE__ -UUSE_SOUP -o \"${WKBASE_H}\".unifdef \"${WKBASE_H}\"\n\ncase $? in\n0)\n rm \"${WKBASE_H}\".unifdef\n ;;\n1)\n mv \"${WKBASE_H}\"{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
};
37E531011B2391090074F0DF /* Copy iOS Sandbox Profiles for Manual Sandboxing */ = {
isa = PBXShellScriptBuildPhase;
@@ -12627,7 +12628,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n # 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.\n exit 0\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n for HEADERS_DIRECTORY in \"${PUBLIC_HEADERS_FOLDER_PATH}\" \"${PRIVATE_HEADERS_FOLDER_PATH}\"; do\n for HEADER_PATH in \"${TARGET_BUILD_DIR}/${HEADERS_DIRECTORY}/\"*.*; do\n if [[ ! -z `grep '#import <WebKitAdditions/.*>' \"${HEADER_PATH}\"` ]]; then\n python \"${SRCROOT}/mac/replace-webkit-additions-includes.py\" \"${H
EADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\n fi\n done\n done\nfi\n\n\n";
+ shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n # 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.\n exit 0\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n for HEADERS_DIRECTORY in \"${PUBLIC_HEADERS_FOLDER_PATH}\" \"${PRIVATE_HEADERS_FOLDER_PATH}\"; do\n for HEADER_PATH in \"${TARGET_BUILD_DIR}/${HEADERS_DIRECTORY}/\"*.*; do\n if [[ ! -z `grep '#import <WebKitAdditions/.*>' \"${HEADER_PATH}\"` ]]; then\n python \"${SRCROOT}/mac/replace-webkit-additions-includes.py\" \"${HE
ADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\n fi\n done\n done\nfi\n\n\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/WebKitLegacy/ChangeLog (262307 => 262308)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,17 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ * WebKitLegacy.xcodeproj/project.pbxproj:
+
2020-05-27 Keith Rollin <krol...@apple.com>
Enable the use of XCBuild by default in Apple builds
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (262307 => 262308)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-05-29 18:40:48 UTC (rev 262308)
@@ -3163,6 +3163,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1140;
TargetAttributes = {
@@ -3379,7 +3380,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n # 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.\n exit 0\nfi\n\nexec \"${SRCROOT}/mac/postprocess-headers.sh\"\n";
+ shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n # 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.\n exit 0\nfi\n\nexec \"${SRCROOT}/mac/postprocess-headers.sh\"\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (262307 => 262308)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,17 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
2020-05-29 Commit Queue <commit-qu...@webkit.org>
Unreviewed, reverting r262245.
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (262307 => 262308)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2020-05-29 18:40:48 UTC (rev 262308)
@@ -68,7 +68,7 @@
INSTALLHDRS_COPY_PHASE = YES;
INSTALLHDRS_SCRIPT_PHASE = YES;
APPLY_RULES_IN_COPY_HEADERS = $(WK_APPLY_RULES_IN_COPY_HEADERS_$(USE_NEW_BUILD_SYSTEM));
-WK_APPLY_RULES_IN_COPY_HEADERS_ = YES;
+WK_APPLY_RULES_IN_COPY_HEADERS_ = NO;
WK_APPLY_RULES_IN_COPY_HEADERS_NO = NO;
WK_APPLY_RULES_IN_COPY_HEADERS_YES = YES;
PRODUCT_NAME = WebKitLegacy;
Modified: trunk/Tools/ChangeLog (262307 => 262308)
--- trunk/Tools/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Tools/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1,3 +1,19 @@
+2020-05-29 Keith Rollin <krol...@apple.com>
+
+ Revert switch to XCBuild
+ https://bugs.webkit.org/show_bug.cgi?id=212530
+ <rdar://problem/63764632>
+
+ Unreviewed build fix.
+
+ Bug 209890 enabled the use of XCBuild by default. Since then, some
+ build issues have shown up. While addressing them, temporarily turn
+ off the use of XCBuild by default.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * Scripts/build-webkit:
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+
2020-05-29 Philippe Normand <pnorm...@igalia.com>
[Flatpak][GStreamer] all commands, except webkit-build, fails if GST_BUILD_PATH is set
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (262307 => 262308)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1014,6 +1014,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1140;
TargetAttributes = {
Modified: trunk/Tools/Scripts/build-webkit (262307 => 262308)
--- trunk/Tools/Scripts/build-webkit 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Tools/Scripts/build-webkit 2020-05-29 18:40:48 UTC (rev 262308)
@@ -213,7 +213,9 @@
if (isAppleCocoaWebKit()) {
push @options, XcodeOptions();
- if ((not defined $xcbuild or $xcbuild) and canUseXCBuild()) {
+ # Temporarily disable default use of XCBuild until issues with it are ironed out.
+ #if ((not defined $xcbuild or $xcbuild) and canUseXCBuild()) {
+ if ($xcbuild and canUseXCBuild()) {
push @options, "-UseNewBuildSystem=YES";
push @options, "USE_NEW_BUILD_SYSTEM=YES";
} else {
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (262307 => 262308)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2020-05-29 18:40:48 UTC (rev 262308)
@@ -1009,6 +1009,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1140;
TargetAttributes = {
Modified: trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (262307 => 262308)
--- trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings 2020-05-29 18:32:27 UTC (rev 262307)
+++ trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings 2020-05-29 18:40:48 UTC (rev 262308)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
- <string>Latest</string>
+ <string>Original</string>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
</dict>
