From d467ae6e7867044b8d7b466776fb37089292c52b Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Fri, 4 Dec 2015 13:29:51 -0500 Subject: [core] upgrade gyp to git commit 6fb8bd8 https://chromium.googlesource.com/external/gyp/+/6fb8bd829f0ca8fd432fd85ede788b6881c4f09f --- deps/gyp/test/same-source-file-name/src/all.gyp | 30 ++++++++++++++++++++++ .../src/double-executable.gyp | 21 +++++++++++++++ .../same-source-file-name/src/double-shared.gyp | 27 +++++++++++++++++++ .../same-source-file-name/src/double-static.gyp | 22 ++++++++++++++++ deps/gyp/test/same-source-file-name/src/func.c | 6 +++++ deps/gyp/test/same-source-file-name/src/prog1.c | 16 ++++++++++++ deps/gyp/test/same-source-file-name/src/prog2.c | 16 ++++++++++++ deps/gyp/test/same-source-file-name/src/prog3.c | 18 +++++++++++++ .../test/same-source-file-name/src/subdir1/func.c | 6 +++++ .../test/same-source-file-name/src/subdir2/func.c | 6 +++++ 10 files changed, 168 insertions(+) create mode 100644 deps/gyp/test/same-source-file-name/src/all.gyp create mode 100644 deps/gyp/test/same-source-file-name/src/double-executable.gyp create mode 100644 deps/gyp/test/same-source-file-name/src/double-shared.gyp create mode 100644 deps/gyp/test/same-source-file-name/src/double-static.gyp create mode 100644 deps/gyp/test/same-source-file-name/src/func.c create mode 100644 deps/gyp/test/same-source-file-name/src/prog1.c create mode 100644 deps/gyp/test/same-source-file-name/src/prog2.c create mode 100644 deps/gyp/test/same-source-file-name/src/prog3.c create mode 100644 deps/gyp/test/same-source-file-name/src/subdir1/func.c create mode 100644 deps/gyp/test/same-source-file-name/src/subdir2/func.c (limited to 'deps/gyp/test/same-source-file-name/src') diff --git a/deps/gyp/test/same-source-file-name/src/all.gyp b/deps/gyp/test/same-source-file-name/src/all.gyp new file mode 100644 index 0000000000..4fe052c668 --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/all.gyp @@ -0,0 +1,30 @@ +# Copyright (c) 2009 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'prog1', + 'type': 'executable', + 'defines': [ + 'PROG="prog1"', + ], + 'sources': [ + 'prog1.c', + 'func.c', + ], + }, + { + 'target_name': 'prog2', + 'type': 'executable', + 'defines': [ + 'PROG="prog2"', + ], + 'sources': [ + 'prog2.c', + 'func.c', + ], + }, + ], +} diff --git a/deps/gyp/test/same-source-file-name/src/double-executable.gyp b/deps/gyp/test/same-source-file-name/src/double-executable.gyp new file mode 100644 index 0000000000..477bd87e0d --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/double-executable.gyp @@ -0,0 +1,21 @@ +# Copyright (c) 2012 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'prog3', + 'type': 'executable', + 'sources': [ + 'prog3.c', + 'func.c', + 'subdir1/func.c', + 'subdir2/func.c', + ], + 'defines': [ + 'PROG="prog3"', + ], + }, + ], +} diff --git a/deps/gyp/test/same-source-file-name/src/double-shared.gyp b/deps/gyp/test/same-source-file-name/src/double-shared.gyp new file mode 100644 index 0000000000..438b50f3f1 --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/double-shared.gyp @@ -0,0 +1,27 @@ +# Copyright (c) 2012 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'lib', + 'product_name': 'test_shared_lib', + 'type': 'shared_library', + 'sources': [ + 'prog2.c', + 'func.c', + 'subdir1/func.c', + 'subdir2/func.c', + ], + 'defines': [ + 'PROG="prog2"', + ], + 'conditions': [ + ['OS=="linux"', { + 'cflags': ['-fPIC'], + }], + ], + }, + ], +} diff --git a/deps/gyp/test/same-source-file-name/src/double-static.gyp b/deps/gyp/test/same-source-file-name/src/double-static.gyp new file mode 100644 index 0000000000..e49c0e1251 --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/double-static.gyp @@ -0,0 +1,22 @@ +# Copyright (c) 2012 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'lib', + 'product_name': 'test_static_lib', + 'type': 'static_library', + 'sources': [ + 'prog1.c', + 'func.c', + 'subdir1/func.c', + 'subdir2/func.c', + ], + 'defines': [ + 'PROG="prog1"', + ], + }, + ], +} diff --git a/deps/gyp/test/same-source-file-name/src/func.c b/deps/gyp/test/same-source-file-name/src/func.c new file mode 100644 index 0000000000..e069c692a6 --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/func.c @@ -0,0 +1,6 @@ +#include + +void func(void) +{ + printf("Hello %s from func.c\n", PROG); +} diff --git a/deps/gyp/test/same-source-file-name/src/prog1.c b/deps/gyp/test/same-source-file-name/src/prog1.c new file mode 100644 index 0000000000..604e2b9c98 --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/prog1.c @@ -0,0 +1,16 @@ +#include + +extern void func(void); + +int main(void) +{ + printf("Hello from prog1.c\n"); + func(); + /* + * Uncomment to test same-named files in different directories, + * which Visual Studio doesn't support. + subdir1_func(); + subdir2_func(); + */ + return 0; +} diff --git a/deps/gyp/test/same-source-file-name/src/prog2.c b/deps/gyp/test/same-source-file-name/src/prog2.c new file mode 100644 index 0000000000..466ee35003 --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/prog2.c @@ -0,0 +1,16 @@ +#include + +extern void func(void); + +int main(void) +{ + printf("Hello from prog2.c\n"); + func(); + /* + * Uncomment to test same-named files in different directories, + * which Visual Studio doesn't support. + subdir1_func(); + subdir2_func(); + */ + return 0; +} diff --git a/deps/gyp/test/same-source-file-name/src/prog3.c b/deps/gyp/test/same-source-file-name/src/prog3.c new file mode 100644 index 0000000000..34d495ce08 --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/prog3.c @@ -0,0 +1,18 @@ +// Copyright (c) 2012 Google Inc. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include + +extern void func(void); +extern void subdir1_func(void); +extern void subdir2_func(void); + +int main(void) +{ + printf("Hello from prog3.c\n"); + func(); + subdir1_func(); + subdir2_func(); + return 0; +} diff --git a/deps/gyp/test/same-source-file-name/src/subdir1/func.c b/deps/gyp/test/same-source-file-name/src/subdir1/func.c new file mode 100644 index 0000000000..b73450d105 --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/subdir1/func.c @@ -0,0 +1,6 @@ +#include + +void subdir1_func(void) +{ + printf("Hello %s from subdir1/func.c\n", PROG); +} diff --git a/deps/gyp/test/same-source-file-name/src/subdir2/func.c b/deps/gyp/test/same-source-file-name/src/subdir2/func.c new file mode 100644 index 0000000000..0248b5720e --- /dev/null +++ b/deps/gyp/test/same-source-file-name/src/subdir2/func.c @@ -0,0 +1,6 @@ +#include + +void subdir2_func(void) +{ + printf("Hello %s from subdir2/func.c\n", PROG); +} -- cgit v1.2.1