Changeset 248813 in webkit

Timestamp:

Aug 16, 2019 8:45:45 PM (5 years ago)

Author:

Keith Rollin

Message:

Add XCBuild support to ANGLE
​https://bugs.webkit.org/show_bug.cgi?id=200836
<rdar://problem/54410420>

Reviewed by Alex Christensen.

The ANGLE Xcode project contains two Build Phases: one that copies
some headers, and another that modifies those headers. This
combination does not work with XCBuild, which gets confused when it
finds that headers that it's copied have been changed. When it detects
this, XCBuild thinks that it should recopy those headers on the next
build, causing their modification dates to change and for all
dependent files to be rebuilt. This essentially turns an incremental
rebuild into a full rebuild.

Address this problem by using a new facility in Xcode 11. This
facility supports the copying and modifying headers files in a single
step. It is achieved by first enabling the facility by setting
APPLY_RULES_IN_COPY_HEADERS to YES. Next, we add a new Build Rule that
invokes a custom script when the header files are copied. Third, we
provide this script, which can essentially be a stripped down version
of the one already used to modify the exported headers files. Finally,
we disable the use of that old script when we are using Xcode 11. In
this way, the old script that modifies the exported headers is used in
Xcode 10, and the new facility is used in Xcode 11.

See also Bug 197340 for where this process was also applied to
JavaScriptCore, WebKit, and WebKitLegacy.

• ANGLE.xcodeproj/project.pbxproj:
• Configurations/ANGLE.xcconfig:
• adjust-angle-include-paths-rule: Added.

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ANGLE.xcodeproj/project.pbxproj (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• Configurations/ANGLE.xcconfig (modified) (1 diff)
• adjust-angle-include-paths-rule (added)

trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

@@ -630 +630 @@
                 FB39D76E120110FC00088E69 /* ShaderLang.h in Headers */ = {isa = PBXBuildFile; fileRef = FB39D2BF1200F3E600088E69 /* ShaderLang.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
+
+/* Begin PBXBuildRule section */
+                53E934DB230609D800DE060C /* PBXBuildRule */ = {
+                        isa = PBXBuildRule;
+                        compilerSpec = com.apple.compilers.proxy.script;
+                        filePatterns = "*.h";
+                        fileType = pattern.proxy;
+                        inputFiles = (
+                        );
+                        isEditable = 1;
+                        name = "Files '*.h' using Script";
+                        outputFiles = (
+                                "$(HEADER_OUTPUT_DIR)/$(INPUT_FILE_NAME)",
+                        );
+                        script = "exec \"${SRCROOT}/adjust-angle-include-paths-rule\"\n";
+                };
+/* End PBXBuildRule section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -2608 +2625 @@
                         );
                         buildRules = (
+                                53E934DB230609D800DE060C /* PBXBuildRule */,
                         );
                         dependencies = (
@@ -2660 +2678 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "/bin/sh $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 */

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2019-08-16  Keith Rollin  <krollin@apple.com>
+
+        Add XCBuild support to ANGLE
+        https://bugs.webkit.org/show_bug.cgi?id=200836
+        <rdar://problem/54410420>
+
+        Reviewed by Alex Christensen.
+
+        The ANGLE Xcode project contains two Build Phases: one that copies
+        some headers, and another that modifies those headers. This
+        combination does not work with XCBuild, which gets confused when it
+        finds that headers that it's copied have been changed. When it detects
+        this, XCBuild thinks that it should recopy those headers on the next
+        build, causing their modification dates to change and for all
+        dependent files to be rebuilt. This essentially turns an incremental
+        rebuild into a full rebuild.
+
+        Address this problem by using a new facility in Xcode 11. This
+        facility supports the copying and modifying headers files in a single
+        step. It is achieved by first enabling the facility by setting
+        APPLY_RULES_IN_COPY_HEADERS to YES. Next, we add a new Build Rule that
+        invokes a custom script when the header files are copied. Third, we
+        provide this script, which can essentially be a stripped down version
+        of the one already used to modify the exported headers files. Finally,
+        we disable the use of that old script when we are using Xcode 11. In
+        this way, the old script that modifies the exported headers is used in
+        Xcode 10, and the new facility is used in Xcode 11.
+
+        See also Bug 197340 for where this process was also applied to
+        JavaScriptCore, WebKit, and WebKitLegacy.
+
+        * ANGLE.xcodeproj/project.pbxproj:
+        * Configurations/ANGLE.xcconfig:
+        * adjust-angle-include-paths-rule: Added.
+
 2019-08-08  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig

@@ -9 +9 @@
 INSTALL_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;
+APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);