- Revision
- 244575
- Author
- [email protected]
- Date
- 2019-04-23 17:52:41 -0700 (Tue, 23 Apr 2019)
Log Message
Add Xcode version check for Header post-processing scripts
https://bugs.webkit.org/show_bug.cgi?id=197116
<rdar://problem/50058968>
Reviewed by Brent Fulgham.
There are several places in our Xcode projects that post-process
header files after they've been exported. Because of XCBuild, we're
moving to a model where the post-processing is performed at the same
time the header files are exported, rather than as a distinct
post-processing step. This patch disables the distinct step when the
inline processing is available.
In practice, this means prefixing appropriate post-processing Custom
Build phases with:
if [ "${XCODE_VERSION_MAJOR}" -ge "1100" -a "${USE_NEW_BUILD_SYSTEM}" = "YES" ]; then
# 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.
exit 0
fi
Source/_javascript_Core:
* _javascript_Core.xcodeproj/project.pbxproj:
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKitLegacy:
* WebKitLegacy.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (244574 => 244575)
--- trunk/Source/_javascript_Core/ChangeLog 2019-04-24 00:29:55 UTC (rev 244574)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-04-24 00:52:41 UTC (rev 244575)
@@ -1,3 +1,28 @@
+2019-04-23 Keith Rollin <[email protected]>
+
+ Add Xcode version check for Header post-processing scripts
+ https://bugs.webkit.org/show_bug.cgi?id=197116
+ <rdar://problem/50058968>
+
+ Reviewed by Brent Fulgham.
+
+ There are several places in our Xcode projects that post-process
+ header files after they've been exported. Because of XCBuild, we're
+ moving to a model where the post-processing is performed at the same
+ time the header files are exported, rather than as a distinct
+ post-processing step. This patch disables the distinct step when the
+ inline processing is available.
+
+ In practice, this means prefixing appropriate post-processing Custom
+ Build phases with:
+
+ if [ "${XCODE_VERSION_MAJOR}" -ge "1100" -a "${USE_NEW_BUILD_SYSTEM}" = "YES" ]; then
+ # 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.
+ exit 0
+ fi
+
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
2019-04-23 Commit Queue <[email protected]>
Unreviewed, rolling out r244558.
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (244574 => 244575)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-04-24 00:29:55 UTC (rev 244574)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-04-24 00:52:41 UTC (rev 244575)
@@ -10403,7 +10403,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "exec ${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/WebKit/ChangeLog (244574 => 244575)
--- trunk/Source/WebKit/ChangeLog 2019-04-24 00:29:55 UTC (rev 244574)
+++ trunk/Source/WebKit/ChangeLog 2019-04-24 00:52:41 UTC (rev 244575)
@@ -1,3 +1,28 @@
+2019-04-23 Keith Rollin <[email protected]>
+
+ Add Xcode version check for Header post-processing scripts
+ https://bugs.webkit.org/show_bug.cgi?id=197116
+ <rdar://problem/50058968>
+
+ Reviewed by Brent Fulgham.
+
+ There are several places in our Xcode projects that post-process
+ header files after they've been exported. Because of XCBuild, we're
+ moving to a model where the post-processing is performed at the same
+ time the header files are exported, rather than as a distinct
+ post-processing step. This patch disables the distinct step when the
+ inline processing is available.
+
+ In practice, this means prefixing appropriate post-processing Custom
+ Build phases with:
+
+ if [ "${XCODE_VERSION_MAJOR}" -ge "1100" -a "${USE_NEW_BUILD_SYSTEM}" = "YES" ]; then
+ # 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.
+ exit 0
+ fi
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2019-04-23 John Wilander <[email protected]>
Remove Ad Click Attribution data when removing website data
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (244574 => 244575)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-04-24 00:29:55 UTC (rev 244574)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-04-24 00:52:41 UTC (rev 244575)
@@ -10456,7 +10456,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${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;
@@ -10499,7 +10499,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "WKFOUNDATION_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;
@@ -10599,7 +10599,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "WKBASE_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;
@@ -10906,7 +10906,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${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}/\"*.h; do\n if [[ ! -z `grep '#import <WebKitAdditions/.*\\.h>' \"${HEADER_PATH}\"` ]]; then\n python \"${SRCROOT}/mac/replace-webkit-additions-includes.py\" \"${HEADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\n fi\n done\n done\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 for HEADERS_DIRECTORY in \"${PUBLIC_HEADERS_FOLDER_PATH}\" \"${PRIVATE_HEADERS_FOLDER_PATH}\"; do\n for HEADER_PATH in \"${TARGET_BUILD_DIR}/${HEADERS_DIRECTORY}/\"*.h; do\n if [[ ! -z `grep '#import <WebKitAdditions/.*\\.h>' \"${HEADER_PATH}\"` ]]; then\n python \"${SRCROOT}/mac/replace-webkit-additions-includes.py\" \"$
{HEADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\n fi\n done\n done\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/WebKitLegacy/ChangeLog (244574 => 244575)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-04-24 00:29:55 UTC (rev 244574)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-04-24 00:52:41 UTC (rev 244575)
@@ -1,3 +1,28 @@
+2019-04-23 Keith Rollin <[email protected]>
+
+ Add Xcode version check for Header post-processing scripts
+ https://bugs.webkit.org/show_bug.cgi?id=197116
+ <rdar://problem/50058968>
+
+ Reviewed by Brent Fulgham.
+
+ There are several places in our Xcode projects that post-process
+ header files after they've been exported. Because of XCBuild, we're
+ moving to a model where the post-processing is performed at the same
+ time the header files are exported, rather than as a distinct
+ post-processing step. This patch disables the distinct step when the
+ inline processing is available.
+
+ In practice, this means prefixing appropriate post-processing Custom
+ Build phases with:
+
+ if [ "${XCODE_VERSION_MAJOR}" -ge "1100" -a "${USE_NEW_BUILD_SYSTEM}" = "YES" ]; then
+ # 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.
+ exit 0
+ fi
+
+ * WebKitLegacy.xcodeproj/project.pbxproj:
+
2019-04-20 Don Olmstead <[email protected]>
[CMake][Win] Use target oriented design for WebKitLegacy
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (244574 => 244575)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2019-04-24 00:29:55 UTC (rev 244574)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2019-04-24 00:52:41 UTC (rev 244575)
@@ -3339,7 +3339,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "exec \"${SRCROOT}/mac/postprocess-headers.sh\"";
+ 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 */
