Index: test/rules-dirname/src/subdir/input-rule-dirname.gyp |
diff --git a/test/rules-dirname/src/subdir/input-rule-dirname.gyp b/test/rules-dirname/src/subdir/input-rule-dirname.gyp |
index 36676f12b53edf6c73161c0d40b218e220f633dd..da749a2231fe119b158eb900d0f96fcb458d8206 100644 |
--- a/test/rules-dirname/src/subdir/input-rule-dirname.gyp |
+++ b/test/rules-dirname/src/subdir/input-rule-dirname.gyp |
@@ -5,7 +5,7 @@ |
{ |
'targets': [ |
{ |
- 'target_name': 'print_rule_input_path', |
+ 'target_name': 'print_rule_input_dirname', |
'type': 'none', |
'msvs_cygwin_shell': 0, |
'sources': [ |
@@ -20,7 +20,7 @@ |
'printvars.py', |
], |
'outputs': [ |
- '<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).printed', |
+ '<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).dirname', |
], |
'action': [ |
'python', '<@(_inputs)', '<(RULE_INPUT_DIRNAME)', '<@(_outputs)', |
@@ -29,28 +29,43 @@ |
], |
}, |
{ |
+ 'target_name': 'print_rule_input_path', |
+ 'type': 'none', |
+ 'msvs_cygwin_shell': 0, |
+ 'sources': [ |
+ 'foo/bar/baz.printvars', |
+ 'a/b/c.printvars', |
+ ], |
+ 'rules': [ |
+ { |
+ 'rule_name': 'printvars', |
+ 'extension': 'printvars', |
+ 'inputs': [ |
+ 'printvars.py', |
+ ], |
+ 'outputs': [ |
+ '<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).path', |
+ ], |
+ 'action': [ |
+ 'python', '<@(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', |
+ ], |
+ }, |
+ ], |
+ }, |
+ { |
'target_name': 'gencc_int_output', |
'type': 'executable', |
'msvs_cygwin_shell': 0, |
- 'msvs_cygwin_dirs': ['../../../../../../<(DEPTH)/third_party/cygwin'], |
'sources': [ |
'nodir.gencc', |
'foo/bar/baz.gencc', |
'a/b/c.gencc', |
- 'main.cc', |
- ], |
- 'conditions': [ |
- ['OS=="win"', { |
- 'dependencies': [ |
- 'cygwin', |
- ], |
- }], |
+ 'main.cc', |
], |
'rules': [ |
{ |
'rule_name': 'gencc', |
'extension': 'gencc', |
- 'msvs_external_rule': 1, |
'inputs': [ |
'<(DEPTH)/copy-file.py', |
], |
@@ -69,6 +84,38 @@ |
['OS=="win"', { |
'targets': [ |
{ |
+ 'target_name': 'gencc_int_output_external', |
+ 'type': 'executable', |
+ 'msvs_cygwin_shell': 0, |
+ 'msvs_cygwin_dirs': ['../../../../../../<(DEPTH)/third_party/cygwin'], |
+ 'sources': [ |
+ 'nodir.gencc', |
+ 'foo/bar/baz.gencc', |
+ 'a/b/c.gencc', |
+ 'main.cc', |
+ ], |
+ 'dependencies': [ |
+ 'cygwin', |
+ ], |
+ 'rules': [ |
+ { |
+ 'rule_name': 'gencc', |
+ 'extension': 'gencc', |
+ 'msvs_external_rule': 1, |
+ 'inputs': [ |
+ '<(DEPTH)/copy-file.py', |
+ ], |
+ 'outputs': [ |
+ '<(INTERMEDIATE_DIR)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).cc', |
+ ], |
+ 'action': [ |
+ 'python', '<@(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', |
+ ], |
+ 'process_outputs_as_sources': 1, |
+ }, |
+ ], |
+ }, |
+ { |
'target_name': 'cygwin', |
'type': 'none', |
'actions': [ |