Changeset 252994 in webkit

Timestamp:

Dec 2, 2019 10:37:25 AM (4 years ago)

Author:

dino@apple.com

Message:

Clean up ANGLE header post-process script
​https://bugs.webkit.org/show_bug.cgi?id=204711

Reviewed by Tim Horton.

Since sed on macOS requires the in-place argument to have a zero-length string
to avoid making backups, this script was attempting to pass . However, this was
being evaluated, creating a bunch of files with \'\' suffixes. Fix this by using
an array when expanding the arguments.

Also fix a typo where the character "3" was being printed.

Lastly, only print out the basename of the header file being converted.

• adjust-angle-include-paths.sh:

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• adjust-angle-include-paths.sh (modified) (2 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2019-12-02  Dean Jackson  <dino@apple.com>
+
+        Clean up ANGLE header post-process script
+        https://bugs.webkit.org/show_bug.cgi?id=204711
+
+        Reviewed by Tim Horton.
+
+        Since `sed` on macOS requires the in-place argument to have a zero-length string
+        to avoid making backups, this script was attempting to pass ''. However, this was
+        being evaluated, creating a bunch of files with \'\' suffixes. Fix this by using
+        an array when expanding the arguments.
+
+        Also fix a typo where the character "3" was being printed.
+
+        Lastly, only print out the basename of the header file being converted.
+
+        * adjust-angle-include-paths.sh:
+
 2019-11-30  Dean Jackson  <dino@apple.com>
 

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

@@ -22 +22 @@
 if [ "$DEPLOYMENT_LOCATION" == "YES" ] ; then
     # Apple-internal build.
-    output_dir=$DSTROOT/$PUBLIC_HEADERS_FOLDER_PATH
+    output_dir=${DSTROOT}${PUBLIC_HEADERS_FOLDER_PATH}
 else
     # External build.
-    output_dir=$BUILT_PRODUCTS_DIR/$PUBLIC_HEADERS_FOLDER_PATH
+    output_dir=${BUILT_PRODUCTS_DIR}${PUBLIC_HEADERS_FOLDER_PATH}
 fi
 
 if [ $(uname) == "Linux" ]; then
-    inplace_opt="-i"
+    inplace_opt=(-i)
 else
-    inplace_opt="-i ''"
+    inplace_opt=(-i "")
 fi
 
@@ -44 +44 @@
 s/^#include [<"]export.h[>"]/#include <ANGLE\/export.h>/
 s/^#include "\(eglext_angle\|gl2ext_angle\|ShaderVars\).h"/#include <ANGLE\/\1.h>/
-' $inplace_opt $i
-        echo Postprocessed ANGLE header3 $i
+' "${inplace_opt[@]}" $i
+        echo Postprocessed ANGLE header `basename $i`
     fi
 done