Changeset 246842 in webkit

Timestamp:

Jun 26, 2019 11:34:56 AM (5 years ago)

Author:

dino@apple.com

Message:

Script which adjusts include paths in ANGLE's copied headers breaks incremental builds
​https://bugs.webkit.org/show_bug.cgi?id=199212

Patch by Kenneth Russell <​kbr@chromium.org> on 2019-06-25
Reviewed by Darin Adler.

Maintain and test a timestamp in adjust-angle-include-paths.sh
in order to avoid touching the headers during each build.

• adjust-angle-include-paths.sh:

Location:

trunk/Source

Files:

• ThirdParty/ANGLE/ChangeLog (modified) (2 diffs)
• ThirdParty/ANGLE/adjust-angle-include-paths.sh (modified) (2 diffs)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm.orig (added)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2019-06-25  Kenneth Russell  <kbr@chromium.org>
+
+        Script which adjusts include paths in ANGLE's copied headers breaks incremental builds
+        https://bugs.webkit.org/show_bug.cgi?id=199212
+
+        Reviewed by Darin Adler.
+
+        Maintain and test a timestamp in adjust-angle-include-paths.sh
+        in order to avoid touching the headers during each build.
+
+        * adjust-angle-include-paths.sh:
+
 2019-06-25  Ryan Haddad  <ryanhaddad@apple.com>
 
@@ -22 +34 @@
         in order to avoid touching the headers during each build.
 
-        * adjust-angle-include-paths.sh:
+        * adjust-angle-include-paths.sh:
 
 2019-06-18  Kenneth Russell  <kbr@chromium.org>

trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh

@@ -29 +29 @@
 
 for i in $output_dir/*.h ; do
-    sed -e '
+    if [ ! -f $output_dir/angle.timestamp ] || [ $i -nt $output_dir/angle.timestamp ] ; then
+        sed -e '
 s/^#include <EGL\/\(.*\)>/#include <ANGLE\/\1>/
 s/^#include <GLES2\/\(.*\)>/#include <ANGLE\/\1>/
@@ -37 +38 @@
 s/^#include "\(eglext_angle\|gl2ext_angle\|ShaderVars\).h"/#include <ANGLE\/\1.h>/
 ' -i "" $i
+        echo Postprocessed ANGLE header $i
+    fi
 done
+
+date > $output_dir/angle.timestamp