From d467ae6e7867044b8d7b466776fb37089292c52b Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Fri, 4 Dec 2015 13:29:51 -0500
Subject: [core] upgrade gyp to git commit 6fb8bd8

https://chromium.googlesource.com/external/gyp/+/6fb8bd829f0ca8fd432fd85ede788b6881c4f09f
---
 .../src/subdir1/subdir1.gyp                        | 30 ++++++++++++++++++++++
 .../src/subdir2/subdir2.gyp                        | 30 ++++++++++++++++++++++
 .../same-rule-output-file-name/src/subdirs.gyp     | 16 ++++++++++++
 .../test/same-rule-output-file-name/src/touch.py   | 11 ++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 deps/gyp/test/same-rule-output-file-name/src/subdir1/subdir1.gyp
 create mode 100644 deps/gyp/test/same-rule-output-file-name/src/subdir2/subdir2.gyp
 create mode 100644 deps/gyp/test/same-rule-output-file-name/src/subdirs.gyp
 create mode 100644 deps/gyp/test/same-rule-output-file-name/src/touch.py

(limited to 'deps/gyp/test/same-rule-output-file-name/src')

diff --git a/deps/gyp/test/same-rule-output-file-name/src/subdir1/subdir1.gyp b/deps/gyp/test/same-rule-output-file-name/src/subdir1/subdir1.gyp
new file mode 100644
index 0000000000..bff381a5a5
--- /dev/null
+++ b/deps/gyp/test/same-rule-output-file-name/src/subdir1/subdir1.gyp
@@ -0,0 +1,30 @@
+# 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': 'target1',
+      'type': 'none',
+      'sources': [
+        '../touch.py'
+      ],
+      'rules': [
+        {
+          'rule_name': 'rule1',
+          'extension': 'py',
+          'inputs': [],
+          'outputs': [
+            'rule.txt',
+          ],
+          'action': [
+            'python', '../touch.py', '<(_outputs)',
+          ],
+          # Allows the test to run without hermetic cygwin on windows.
+          'msvs_cygwin_shell': 0,
+        },
+      ],
+    },
+  ],
+}
diff --git a/deps/gyp/test/same-rule-output-file-name/src/subdir2/subdir2.gyp b/deps/gyp/test/same-rule-output-file-name/src/subdir2/subdir2.gyp
new file mode 100644
index 0000000000..12a35600a3
--- /dev/null
+++ b/deps/gyp/test/same-rule-output-file-name/src/subdir2/subdir2.gyp
@@ -0,0 +1,30 @@
+# 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': 'target2',
+      'type': 'none',
+      'sources': [
+        '../touch.py'
+      ],
+      'rules': [
+        {
+          'rule_name': 'rule2',
+          'extension': 'py',
+          'inputs': [],
+          'outputs': [
+            'rule.txt',
+          ],
+          'action': [
+            'python', '../touch.py', '<(_outputs)',
+          ],
+          # Allows the test to run without hermetic cygwin on windows.
+          'msvs_cygwin_shell': 0,
+        },
+      ],
+    },
+  ],
+}
diff --git a/deps/gyp/test/same-rule-output-file-name/src/subdirs.gyp b/deps/gyp/test/same-rule-output-file-name/src/subdirs.gyp
new file mode 100644
index 0000000000..25259a38f4
--- /dev/null
+++ b/deps/gyp/test/same-rule-output-file-name/src/subdirs.gyp
@@ -0,0 +1,16 @@
+# 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': 'subdirs',
+      'type': 'none',
+      'dependencies': [
+        'subdir1/subdir1.gyp:*',
+        'subdir2/subdir2.gyp:*',
+      ],
+    },
+  ],
+}
diff --git a/deps/gyp/test/same-rule-output-file-name/src/touch.py b/deps/gyp/test/same-rule-output-file-name/src/touch.py
new file mode 100644
index 0000000000..2291e9cc56
--- /dev/null
+++ b/deps/gyp/test/same-rule-output-file-name/src/touch.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+# 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.
+
+import sys
+
+f = open(sys.argv[1], 'w+')
+f.write('Hello from touch.py\n')
+f.close()
-- 
cgit v1.2.1