AvaloniaUI
/
angle
зеркало из https://github.com/AvaloniaUI/angle.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Rename the build/ directory. 

GYP related files went in gypfiles/, and the gni went in gni/ this
changes frees up the build/ directory name for Chromium's build/
directory.

BUG=angleproject:1569

Change-Id: I76fe343d569239c2732ba87986fcf7debc21d417
Reviewed-on: https://chromium-review.googlesource.com/403029
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Corentin Wallez 2016-10-25 07:43:33 -04:00 коммит произвёл Commit Bot
Родитель e76f55fefa
Коммит 7f07caa961
18 изменённых файлов: 49 добавлений и 49 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
BUILD.gn
Просмотреть файл

@ -7,7 +7,7 @@ import("//build/config/dcheck_always_on.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
import("//third_party/angle/build/angle_common.gni")
import("//third_party/angle/gni/angle.gni")
import("//ui/ozone/ozone.gni")
if (ozone_platform_gbm) {

2
DEPS
Просмотреть файл

@ -101,7 +101,7 @@ hooks = [
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
'pattern': '.',
'action': ['python', 'build/gyp_angle'],
'action': ['python', 'gyp/gyp_angle'],
},
]

2
doc/DebuggingTips.md
Просмотреть файл

@ -17,7 +17,7 @@ If you follow these steps, apitrace will work correctly aside from a few minor b
For example, to trace a run of `hello_triangle`, assuming you are using the ninja gyp generator and the apitrace executables are in `$PATH`:
```
./build/gyp_angle -D angle_link_glx=1 -D angle_gl_library_type=static_library
./gyp/gyp_angle -D angle_link_glx=1 -D angle_gl_library_type=static_library
ninja -C out/Debug
export TRACE_LIBGL="/usr/lib/libGL.so.1" # may require a different path
apitrace trace -o mytrace ./out/Debug/hello_triangle

0
build/angle_common.gni → gni/angle.gni
Просмотреть файл

0
build/ANGLE.gyp → gyp/ANGLE.gyp
Просмотреть файл

0
build/common.gypi → gyp/common.gypi
Просмотреть файл

0
build/common_defines.gypi → gyp/common_defines.gypi
Просмотреть файл

0
build/gyp_angle → gyp/gyp_angle
Просмотреть файл

0
build/standalone.gypi → gyp/standalone.gypi
Просмотреть файл

36
samples/samples.gyp
Просмотреть файл

@ -8,7 +8,7 @@
{
'target_name': 'shader_translator',
'type': 'executable',
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'dependencies': [ '../src/angle.gyp:translator', ],
'include_dirs': [ '../include', ],
'sources': [ 'shader_translator/shader_translator.cpp' ],
@ -16,7 +16,7 @@
{
'target_name': 'sample_util',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'dependencies':
[
'<(angle_path)/src/angle.gyp:libEGL',
@ -65,21 +65,21 @@
'target_name': 'hello_triangle',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'hello_triangle/HelloTriangle.cpp', ],
},
{
'target_name': 'mip_map_2d',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'mip_map_2d/MipMap2D.cpp', ],
},
{
'target_name': 'multi_texture',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'multi_texture/MultiTexture.cpp', ],
'copies':
[
@ -98,7 +98,7 @@
'target_name': 'multi_window',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'multi_window/MultiWindow.cpp', ],
},
@ -106,7 +106,7 @@
'target_name': 'multiple_draw_buffers',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'multiple_draw_buffers/MultipleDrawBuffers.cpp', ],
'copies':
[
@ -126,7 +126,7 @@
'target_name': 'particle_system',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'particle_system/ParticleSystem.cpp', ],
'copies':
[
@ -143,7 +143,7 @@
'target_name': 'post_sub_buffer',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'post_sub_buffer/PostSubBuffer.cpp', ],
},
@ -151,7 +151,7 @@
'target_name': 'simple_instancing',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'simple_instancing/SimpleInstancing.cpp', ],
},
@ -159,7 +159,7 @@
'target_name': 'simple_texture_2d',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'simple_texture_2d/SimpleTexture2D.cpp', ],
},
@ -167,7 +167,7 @@
'target_name': 'simple_texture_cubemap',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'simple_texture_cubemap/SimpleTextureCubemap.cpp', ],
},
@ -175,7 +175,7 @@
'target_name': 'simple_vertex_shader',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'simple_vertex_shader/SimpleVertexShader.cpp', ],
},
@ -183,7 +183,7 @@
'target_name': 'stencil_operations',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'stencil_operations/StencilOperations.cpp', ],
},
@ -191,7 +191,7 @@
'target_name': 'tex_redef_microbench',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'tex_redef_microbench/TexRedefMicroBench.cpp', ],
},
@ -199,7 +199,7 @@
'target_name': 'texture_wrap',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'texture_wrap/TextureWrap.cpp', ],
},
@ -207,7 +207,7 @@
'target_name': 'tri_fan_microbench',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'tri_fan_microbench/TriFanMicroBench.cpp', ],
},
@ -215,7 +215,7 @@
'target_name': 'window_test',
'type': 'executable',
'dependencies': [ 'sample_util' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ 'WindowTest/WindowTest.cpp', ],
},
],

12
src/angle.gyp
Просмотреть файл

@ -59,7 +59,7 @@
{
'target_name': 'angle_common',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources':
[
'<@(libangle_common_sources)',
@ -146,7 +146,7 @@
{
'target_name': 'angle_image_util',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources':
[
'<@(libangle_image_util_sources)',
@ -173,7 +173,7 @@
{
'target_name': 'copy_scripts',
'type': 'none',
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'hard_dependency': 1,
'copies':
[
@ -200,7 +200,7 @@
{
'target_name': 'commit_id',
'type': 'none',
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'dependencies': [ 'copy_scripts', ],
'hard_dependency': 1,
'actions':
@ -242,7 +242,7 @@
'target_name': 'commit_id',
'type': 'none',
'hard_dependency': 1,
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'copies':
[
{
@ -275,7 +275,7 @@
'target_name': 'copy_compiler_dll',
'type': 'none',
'dependencies': [ 'copy_scripts', ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'conditions':
[
['angle_build_winrt==0',

6
src/compiler.gypi
Просмотреть файл

@ -248,14 +248,14 @@
'target_name': 'preprocessor',
'type': 'static_library',
'dependencies': [ 'angle_common' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources': [ '<@(angle_preprocessor_sources)', ],
},
{
'target_name': 'translator_lib',
'type': 'static_library',
'dependencies': [ 'preprocessor', 'angle_common' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'include_dirs':
[
'.',
@ -341,7 +341,7 @@
'target_name': 'translator',
'type': 'static_library',
'dependencies': [ 'translator_lib', 'angle_common' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'include_dirs':
[
'.',

2
src/libEGL.gypi
Просмотреть файл

@ -17,7 +17,7 @@
],
'includes':
[
'../build/common_defines.gypi',
'../gyp/common_defines.gypi',
],
'include_dirs':
[

4
src/libGLESv2.gypi
Просмотреть файл

@ -710,7 +710,7 @@
'angle_common',
'angle_image_util',
],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'include_dirs':
[
'.',
@ -1037,7 +1037,7 @@
'target_name': 'libGLESv2',
'type': '<(angle_gl_library_type)',
'dependencies': [ 'libANGLE', 'angle_common' ],
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'sources':
[
'<@(libglesv2_sources)',

2
src/tests/BUILD.gn
Просмотреть файл

@ -4,7 +4,7 @@
import("//testing/test.gni")
import("//build/config/chromecast_build.gni")
import("//third_party/angle/build/angle_common.gni")
import("//third_party/angle/gni/angle.gni")
unittests_gypi = exec_script("//build/gypi_to_gn.py",
[

12
src/tests/deqp.gypi
Просмотреть файл

@ -1250,7 +1250,7 @@
{
'target_name': 'angle_zlib',
'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'include_dirs':
[
'<(zlib_path)',
@ -1326,7 +1326,7 @@
{
'target_name': 'angle_libpng',
'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies':
[
'angle_zlib'
@ -1842,7 +1842,7 @@
{
'target_name': 'angle_deqp_gtest_gles2_tests',
'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies':
[
'angle_deqp_gtest_support',
@ -1857,7 +1857,7 @@
{
'target_name': 'angle_deqp_gtest_gles3_tests',
'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies':
[
'angle_deqp_gtest_support',
@ -1872,7 +1872,7 @@
{
'target_name': 'angle_deqp_gtest_gles31_tests',
'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies':
[
'angle_deqp_gtest_support',
@ -1887,7 +1887,7 @@
{
'target_name': 'angle_deqp_gtest_egl_tests',
'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies':
[
'angle_deqp_gtest_support',

16
src/tests/tests.gyp
Просмотреть файл

@ -6,7 +6,7 @@
'includes':
[
'deqp.gypi',
'../../build/common_defines.gypi',
'../../gyp/common_defines.gypi',
],
'variables':
{
@ -68,7 +68,7 @@
{
'target_name': 'angle_internal_gtest',
'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'include_dirs':
[
'<(angle_path)/testing/gtest',
@ -99,7 +99,7 @@
{
'target_name': 'angle_internal_gmock',
'type': 'static_library',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'include_dirs':
[
'<(angle_path)/testing/gmock',
@ -137,7 +137,7 @@
'type': 'executable',
'includes':
[
'../../build/common_defines.gypi',
'../../gyp/common_defines.gypi',
'angle_unittests.gypi',
],
'sources':
@ -170,7 +170,7 @@
'type': 'executable',
'includes':
[
'../../build/common_defines.gypi',
'../../gyp/common_defines.gypi',
'angle_end2end_tests.gypi',
],
'sources':
@ -183,7 +183,7 @@
'type': 'executable',
'includes':
[
'../../build/common_defines.gypi',
'../../gyp/common_defines.gypi',
'angle_perftests.gypi',
],
'sources':
@ -210,7 +210,7 @@
{
'target_name': 'angle_gles2_conformance_tests',
'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies':
[
'<(angle_path)/src/angle.gyp:libGLESv2',
@ -277,7 +277,7 @@
{
'target_name': 'angle_gles3_conformance_tests',
'type': 'executable',
'includes': [ '../../build/common_defines.gypi', ],
'includes': [ '../../gyp/common_defines.gypi', ],
'dependencies':
[
'<(angle_path)/src/angle.gyp:libGLESv2',

2
util/util.gyp
Просмотреть файл

@ -97,7 +97,7 @@
{
'target_name': 'angle_util',
'type': 'shared_library',
'includes': [ '../build/common_defines.gypi', ],
'includes': [ '../gyp/common_defines.gypi', ],
'dependencies':
[
'<(angle_path)/src/angle.gyp:angle_common',