Remove commit.h copying build steps
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Sep 2019 08:46:46 +0000 (08:46 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Sep 2019 08:46:46 +0000 (08:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=201785

Patch by James Darpinian <jdarpinian@chromium.org> on 2019-09-16
Reviewed by Alex Christensen.

* ANGLE.xcodeproj/project.pbxproj: Remove leftover build step
* CMakeLists.txt: Remove commit.h copying
* src/common/version.h: Restore to upstream version
* src/id/commit.h: Added.
* update-angle.sh: Copy commit.h to id/commit.h at import time

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@249892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
Source/ThirdParty/ANGLE/CMakeLists.txt
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/src/common/version.h
Source/ThirdParty/ANGLE/src/id/commit.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/update-angle.sh

index 5ef5fa9..30ea37f 100644 (file)
                        buildConfigurationList = FB39D0D61200F11E00088E69 /* Build configuration list for PBXNativeTarget "ANGLE" */;
                        buildPhases = (
                                FB39D77B1201110C00088E69 /* Headers */,
-                               A3E827AB230CAF7700E76682 /* ShellScript */,
                                FB39D0CE1200F0E300088E69 /* Sources */,
                                FB39D0CF1200F0E300088E69 /* Frameworks */,
                                312BDB0B15FECAB00097EBC7 /* CopyFiles */,
                        shellPath = /bin/sh;
                        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";
                };
-               A3E827AB230CAF7700E76682 /* ShellScript */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputFileListPaths = (
-                       );
-                       inputPaths = (
-                       );
-                       outputFileListPaths = (
-                       );
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "mkdir -p \"$DERIVED_FILE_DIR/include/id\"\n";
-               };
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
                                        src,
                                        third_party/base,
                                        src/common/third_party/base,
-                                       "$(DERIVED_FILE_DIR)/include",
                                );
                                OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
                        };
                                        src,
                                        third_party/base,
                                        src/common/third_party/base,
-                                       "$(DERIVED_FILE_DIR)/include",
                                );
                                OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
                        };
                                        src,
                                        third_party/base,
                                        src/common/third_party/base,
-                                       "$(DERIVED_FILE_DIR)/include",
                                );
                                OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
                        };
index 267a5bc..ab6902a 100644 (file)
@@ -58,7 +58,6 @@ set(ANGLE_SOURCES
     ${angle_translator_glsl_sources}
     ${angle_translator_sources}
     ${libangle_capture_sources}
-    ${CMAKE_CURRENT_BINARY_DIR}/include/id/commit.h
 )
 
 if (UNIX)
@@ -85,8 +84,6 @@ add_subdirectory(include)
 add_library(ANGLEFramework INTERFACE)
 add_dependencies(ANGLEFramework GLSLANGHeaders ANGLEHeaders)
 
-configure_file(src/commit.h ${CMAKE_CURRENT_BINARY_DIR}/include/id/commit.h COPYONLY)
-
 if (USE_ANGLE_EGL)
     add_library(ANGLE STATIC
         ${ANGLE_SOURCES}
@@ -103,7 +100,6 @@ if (USE_ANGLE_EGL)
 
     add_library(GLESv2 SHARED
         ${libglesv2_sources}
-        ${CMAKE_CURRENT_BINARY_DIR}/include/id/commit.h
     )
     target_include_directories(GLESv2 PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
     target_compile_definitions(GLESv2 PRIVATE LIBGLESV2_IMPLEMENTATION)
@@ -111,7 +107,6 @@ if (USE_ANGLE_EGL)
 
     add_library(EGL SHARED
         ${libegl_sources}
-        ${CMAKE_CURRENT_BINARY_DIR}/include/id/commit.h
     )
     target_include_directories(EGL PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
     target_compile_definitions(EGL PRIVATE
index 27b82fc..42dcc32 100644 (file)
@@ -1,3 +1,16 @@
+2019-09-16  James Darpinian  <jdarpinian@chromium.org>
+
+        Remove commit.h copying build steps
+        https://bugs.webkit.org/show_bug.cgi?id=201785
+
+        Reviewed by Alex Christensen.
+
+        * ANGLE.xcodeproj/project.pbxproj: Remove leftover build step
+        * CMakeLists.txt: Remove commit.h copying
+        * src/common/version.h: Restore to upstream version
+        * src/id/commit.h: Added.
+        * update-angle.sh: Copy commit.h to id/commit.h at import time
+
 2019-09-12  James Darpinian  <jdarpinian@chromium.org>
 
         Update ANGLE
index 1aa31fd..56d6be0 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef COMMON_VERSION_H_
 #define COMMON_VERSION_H_
 
-#include "commit.h"
+#include "id/commit.h"
 
 #define ANGLE_MAJOR_VERSION 2
 #define ANGLE_MINOR_VERSION 1
diff --git a/Source/ThirdParty/ANGLE/src/id/commit.h b/Source/ThirdParty/ANGLE/src/id/commit.h
new file mode 100644 (file)
index 0000000..f21ff43
--- /dev/null
@@ -0,0 +1,14 @@
+//
+// Copyright 2014 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// commit.h:
+//   This is a default commit hash header, when git is not available.
+//
+
+#define ANGLE_COMMIT_HASH "unknown hash"
+#define ANGLE_COMMIT_HASH_SIZE 12
+#define ANGLE_COMMIT_DATE "unknown date"
+
+#define ANGLE_DISABLE_PROGRAM_BINARY_LOAD
index b7fbd07..3d3eaaa 100755 (executable)
@@ -14,6 +14,8 @@ if [[ ! $REPLY =~ ^[Yy]$ ]]; then
     exit
 fi
 
+PREVIOUS_COMMIT_HASH=`grep -m 1 -o -E "[a-z0-9]{40}" ANGLE.plist`
+
 # First, preserve WebKit's additional files
 TEMPDIR=`mktemp -d`
 function cleanup {
@@ -43,15 +45,25 @@ mv include/CMakeLists.txt "$TEMPDIR/include"
 # Remove all files including hidden ones, but not . or ..
 rm -rf ..?* .[!.]* *
 echo "Downloading latest ANGLE via git clone."
-git clone https://chromium.googlesource.com/angle/angle . --depth 1
+git clone https://chromium.googlesource.com/angle/angle .
 echo "Successfully downloaded latest ANGLE."
 echo -n "Commit hash: "
 COMMIT_HASH=`git rev-parse HEAD`
 echo "$COMMIT_HASH"
+echo ""
+echo "Summary of added and removed files since last update:"
+echo "________________________________________________________________________"
+echo ""
+git diff --summary "$PREVIOUS_COMMIT_HASH"
+echo "________________________________________________________________________"
+echo ""
 
 trap - EXIT
 cleanup
 
+echo "Copying src/commit.h to src/id/commit.h"
+mkdir -p src/id
+cp src/commit.h src/id/
 echo "Updating ANGLE.plist commit hashes."
 sed -i.bak -e "s/\([^a-z0-9]\)[a-z0-9]\{40\}\([^a-z0-9]\)/\1$COMMIT_HASH\2/g" ANGLE.plist
 echo "Updating ANGLE.plist date."