Skip to content

A
angle
Commit 62778cb9 by Jamie Madill Committed by Commit Bot
Options

Rename version/commit headers.

Prefix the files with angle_ to disambiguate them from other tools. Bug: b/168736059 Change-Id: I7be25ca18fb69d7f2ab71bdf355932865d134954 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2425197 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent ff0ec95b
Showing with 58 additions and 21 deletions
BUILD.gn
...@@ -489,15 +489,15 @@ angle_source_set("translator_fuzzer") { ...@@ -489,15 +489,15 @@ angle_source_set("translator_fuzzer") {
deps = [ ":translator" ] deps = [ ":translator" ]
} }
config("commit_id_config") { config("angle_commit_id_config") {
include_dirs = [ "$root_gen_dir/angle" ] include_dirs = [ "$root_gen_dir/angle" ]
visibility = [ ":commit_id" ] visibility = [ ":angle_commit_id" ]
} }
commit_id_output_file = "$root_gen_dir/angle/commit.h" _commit_id_output_file = "$root_gen_dir/angle/angle_commit.h"
action("commit_id") { action("angle_commit_id") {
script = "src/commit_id.py" script = "src/commit_id.py"
outputs = [ commit_id_output_file ] outputs = [ _commit_id_output_file ]
# Add git as a dependency if it is available. # Add git as a dependency if it is available.
if (angle_enable_commit_id && if (angle_enable_commit_id &&
...@@ -513,15 +513,24 @@ action("commit_id") { ...@@ -513,15 +513,24 @@ action("commit_id") {
args = [ args = [
"gen", "gen",
rebase_path(commit_id_output_file, root_build_dir), rebase_path(_commit_id_output_file, root_build_dir),
] ]
public_configs = [ ":commit_id_config" ] public_configs = [ ":angle_commit_id_config" ]
}
# TODO(jmadill): Remove this. http://b/168736059
group("commit_id") {
data_deps = [ ":angle_commit_id" ]
} }
angle_source_set("angle_version") { angle_source_set("angle_version") {
sources = [ "src/common/version.h" ] # TODO(jmadill): Remove version.h. http://b/168736059
public_deps = [ ":commit_id" ] sources = [
"src/common/angle_version.h",
"src/common/version.h",
]
public_deps = [ ":angle_commit_id" ]
} }
config("angle_backend_config") { config("angle_backend_config") {
......
src/common/angle_version.h 0 → 100644
//
// 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.
//
// angle_version.h: ANGLE version constants. Generated from git commands.
#ifndef COMMON_VERSION_H_
#define COMMON_VERSION_H_
#include "angle_commit.h"
#define ANGLE_MAJOR_VERSION 2
#define ANGLE_MINOR_VERSION 1
#ifndef ANGLE_REVISION
# define ANGLE_REVISION ANGLE_COMMIT_POSITION
#endif
#define ANGLE_STRINGIFY(x) #x
#define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
#define ANGLE_VERSION_STRING \
ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION) \
"." ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." ANGLE_MACRO_STRINGIFY( \
ANGLE_REVISION) " git hash: " ANGLE_COMMIT_HASH
#endif // COMMON_VERSION_H_
src/common/version.h
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
// angle_version.h: ANGLE version constants. Generated from git commands.
#ifndef COMMON_VERSION_H_ #ifndef COMMON_VERSION_H_
#define COMMON_VERSION_H_ #define COMMON_VERSION_H_
#include "commit.h" #include "angle_commit.h"
#define ANGLE_MAJOR_VERSION 2 #define ANGLE_MAJOR_VERSION 2
#define ANGLE_MINOR_VERSION 1 #define ANGLE_MINOR_VERSION 1
......
src/libANGLE/BlobCache.cpp
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "libANGLE/BlobCache.h" #include "libANGLE/BlobCache.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "common/version.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
#include "libANGLE/histogram_macros.h" #include "libANGLE/histogram_macros.h"
......
src/libANGLE/Context.cpp
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
#include <vector> #include <vector>
#include "common/PackedEnums.h" #include "common/PackedEnums.h"
#include "common/angle_version.h"
#include "common/matrix_utils.h" #include "common/matrix_utils.h"
#include "common/platform.h" #include "common/platform.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "common/version.h"
#include "libANGLE/Buffer.h" #include "libANGLE/Buffer.h"
#include "libANGLE/Compiler.h" #include "libANGLE/Compiler.h"
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
......
src/libANGLE/MemoryProgramCache.cpp
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include <GLSLANG/ShaderVars.h> #include <GLSLANG/ShaderVars.h>
#include <anglebase/sha1.h> #include <anglebase/sha1.h>
#include "common/angle_version.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "common/version.h"
#include "libANGLE/BinaryStream.h" #include "libANGLE/BinaryStream.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Uniform.h" #include "libANGLE/Uniform.h"
......
src/libANGLE/Program.cpp
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
#include "common/angle_version.h"
#include "common/bitset_utils.h" #include "common/bitset_utils.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/platform.h" #include "common/platform.h"
#include "common/string_utils.h" #include "common/string_utils.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "common/version.h"
#include "compiler/translator/blocklayout.h" #include "compiler/translator/blocklayout.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/ErrorStrings.h" #include "libANGLE/ErrorStrings.h"
......
src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <android/native_window.h> #include <android/native_window.h>
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include "common/version.h" #include "common/angle_version.h"
#include "libANGLE/renderer/vulkan/RendererVk.h" #include "libANGLE/renderer/vulkan/RendererVk.h"
#include "libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h" #include "libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h"
#include "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h" #include "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h"
......
src/libEGL/libEGL.rc
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include <windows.h> #include <windows.h>
#include "../common/version.h" #include "../common/angle_version.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
......
src/libGL/entry_points_wgl.cpp
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
#include "entry_points_wgl.h" #include "entry_points_wgl.h"
#include "common/angle_version.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/event_tracer.h" #include "common/event_tracer.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "common/version.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
#include "libANGLE/EGLSync.h" #include "libANGLE/EGLSync.h"
......
src/libGL/libGL.rc
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include <windows.h> #include <windows.h>
#include "../common/version.h" #include "../common/angle_version.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
......
src/libGLESv1_CM/libGLESv1_CM.rc
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include <windows.h> #include <windows.h>
#include "../common/version.h" #include "../common/angle_version.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
......
src/libGLESv2/entry_points_egl.cpp
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#include "libGLESv2/entry_points_egl.h" #include "libGLESv2/entry_points_egl.h"
#include "common/angle_version.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "common/version.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
#include "libANGLE/EGLSync.h" #include "libANGLE/EGLSync.h"
......
src/libGLESv2/libGLESv2.rc
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include <windows.h> #include <windows.h>
#include "../common/version.h" #include "../common/angle_version.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment