Diff
Modified: trunk/ChangeLog (259725 => 259726)
--- trunk/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Keith Rollin <[email protected]>
Enable the use of XCBuild by default in Apple builds
Modified: trunk/Makefile.shared (259725 => 259726)
--- trunk/Makefile.shared 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Makefile.shared 2020-04-08 17:25:25 UTC (rev 259726)
@@ -51,7 +51,6 @@
XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=YES
else
XCODE_OPTIONS += -UseNewBuildSystem=NO
- XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=NO
endif
endif
Modified: trunk/Source/_javascript_Core/ChangeLog (259725 => 259726)
--- trunk/Source/_javascript_Core/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Guillaume Emont <[email protected]>
[JSC][32-bits] Build failure after r259676 (Not using strict mode within ClassDeclaration statement)
Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (259725 => 259726)
--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2020-04-08 17:25:25 UTC (rev 259726)
@@ -52,9 +52,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
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 = NO;
-WK_APPLY_RULES_IN_COPY_HEADERS_YES = YES;
+APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = framework.sb;
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (259725 => 259726)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-04-08 17:25:25 UTC (rev 259726)
@@ -10690,6 +10690,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
@@ -10818,7 +10819,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -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_MAJOR}\" -ge \"1100\" -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 (259725 => 259726)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-04-08 17:25:25 UTC (rev 259726)
@@ -2986,7 +2986,7 @@
FB39D0CF1200F0E300088E69 /* Frameworks */,
312BDB0B15FECAB00097EBC7 /* CopyFiles */,
312BDB0D15FECACE0097EBC7 /* CopyFiles */,
- 6E28B8742294DD8000717E69 /* Adjust ANGLE Paths */,
+ 6E28B8742294DD8000717E69 /* ShellScript */,
);
buildRules = (
53E934DB230609D800DE060C /* PBXBuildRule */,
@@ -3027,7 +3027,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 6E28B8742294DD8000717E69 /* Adjust ANGLE Paths */ = {
+ 6E28B8742294DD8000717E69 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -3036,7 +3036,6 @@
);
inputPaths = (
);
- name = "Adjust ANGLE Paths";
outputFileListPaths = (
);
outputPaths = (
@@ -3043,7 +3042,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -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_MAJOR}\" -ge \"1100\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n exit 0\nfi\n\nexec \"$SRCROOT/adjust-angle-include-paths.sh\"\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (259725 => 259726)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Keith Rollin <[email protected]>
Enable the use of XCBuild by default in Apple builds
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig (259725 => 259726)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2020-04-08 17:25:25 UTC (rev 259726)
@@ -4,10 +4,7 @@
PRODUCT_NAME = ANGLE;
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 = NO;
-WK_APPLY_RULES_IN_COPY_HEADERS_YES = YES;
+APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (259725 => 259726)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Keith Rollin <[email protected]>
Enable the use of XCBuild by default in Apple builds
Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (259725 => 259726)
--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2020-04-08 17:25:25 UTC (rev 259726)
@@ -16301,6 +16301,7 @@
FB39D0701200ED9200088E69 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
Modified: trunk/Source/WebCore/ChangeLog (259725 => 259726)
--- trunk/Source/WebCore/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebCore/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Rob Buis <[email protected]>
Import fetch/origin/assorted.window.js
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (259725 => 259726)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-04-08 17:25:25 UTC (rev 259726)
@@ -33669,6 +33669,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
Modified: trunk/Source/WebKit/ChangeLog (259725 => 259726)
--- trunk/Source/WebKit/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebKit/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Chris Dumez <[email protected]>
Ref WebProcessProxy in NetworkProcessProxy::terminateUnresponsiveServiceWorkerProcesses()
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (259725 => 259726)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-04-08 17:25:25 UTC (rev 259726)
@@ -152,10 +152,7 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.NetworkProcess.sb com.apple.WebKit.GPUProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
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 = NO;
-WK_APPLY_RULES_IN_COPY_HEADERS_YES = YES;
+APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);
WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1015));
WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1015 = YES;
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (259725 => 259726)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-04-08 17:25:25 UTC (rev 259726)
@@ -11924,6 +11924,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
@@ -12050,7 +12051,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -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_MAJOR}\" -ge \"1100\" -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;
@@ -12093,7 +12094,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -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_MAJOR}\" -ge \"1100\" -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;
@@ -12221,7 +12222,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -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_MAJOR}\" -ge \"1100\" -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;
@@ -12527,7 +12528,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -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\" \"${HE
ADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\n fi\n done\n done\nfi\n\n\n";
+ shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -ge \"1100\" -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\" \"${HEA
DER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\n fi\n done\n done\nfi\n\n\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/WebKitLegacy/ChangeLog (259725 => 259726)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Keith Rollin <[email protected]>
Enable the use of XCBuild by default in Apple builds
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (259725 => 259726)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-04-08 17:25:25 UTC (rev 259726)
@@ -3170,6 +3170,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
@@ -3386,7 +3387,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -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_MAJOR}\" -ge \"1100\" -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 (259725 => 259726)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Keith Rollin <[email protected]>
Enable the use of XCBuild by default in Apple builds
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (259725 => 259726)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2020-04-08 17:25:25 UTC (rev 259726)
@@ -67,10 +67,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 = NO;
-WK_APPLY_RULES_IN_COPY_HEADERS_YES = YES;
+APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);
PRODUCT_NAME = WebKitLegacy;
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
Modified: trunk/Tools/ChangeLog (259725 => 259726)
--- trunk/Tools/ChangeLog 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Tools/ChangeLog 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1,3 +1,15 @@
+2020-04-08 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r259708.
+
+ Broke the iOS device Build
+
+ Reverted changeset:
+
+ "Enable the use of XCBuild by default in Apple builds"
+ https://bugs.webkit.org/show_bug.cgi?id=209890
+ https://trac.webkit.org/changeset/259708
+
2020-04-08 Daniel Bates <[email protected]>
[lldb-webkit] Pretty-print NSEventModifierFlags
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (259725 => 259726)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1012,6 +1012,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
Modified: trunk/Tools/Scripts/build-webkit (259725 => 259726)
--- trunk/Tools/Scripts/build-webkit 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Tools/Scripts/build-webkit 2020-04-08 17:25:25 UTC (rev 259726)
@@ -213,12 +213,15 @@
if (isAppleCocoaWebKit()) {
push @options, XcodeOptions();
- if ((not defined $xcbuild or $xcbuild) and canUseXCBuild()) {
+ if (not defined $xcbuild) {
+ $xcbuild = canUseXCBuild();
+ }
+
+ if ($xcbuild) {
push @options, "-UseNewBuildSystem=YES";
push @options, "USE_NEW_BUILD_SYSTEM=YES";
} else {
push @options, "-UseNewBuildSystem=NO";
- push @options, "USE_NEW_BUILD_SYSTEM=NO";
}
sub option($$)
Modified: trunk/Tools/Scripts/webkitdirs.pm (259725 => 259726)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-04-08 17:25:25 UTC (rev 259726)
@@ -953,8 +953,11 @@
sub canUseXCBuild()
{
- determineXcodeVersion();
- return (eval "v$xcodeVersion" ge v11.4)
+ # if (`xcodebuild -version | grep "Build version"` =~ /Build version (\d+)([a-zA-Z])(\d+)([a-zA-Z]?)/) {
+ # return $1 >= 11;
+ # }
+
+ return 0;
}
my $passedConfiguration;
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (259725 => 259726)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2020-04-08 17:25:25 UTC (rev 259726)
@@ -1009,6 +1009,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1000;
TargetAttributes = {
Modified: trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (259725 => 259726)
--- trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings 2020-04-08 17:21:09 UTC (rev 259725)
+++ trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings 2020-04-08 17:25:25 UTC (rev 259726)
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>BuildSystemType</key>
+ <string>Original</string>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
</dict>
