Use relative paths for lists of source files.
This patch removes the libaddressinput_dir variable and renames:
libaddressinput_[test_]sources -> libaddressinput_[test_]files
String values contained within lists associated with keys ending in
"_files" suffix are treated as pathnames relative to the file in which
they are defined.
https://code.google.com/p/gyp/wiki/InputFormatReference#Pathname_Relativization
R=roubert@google.com
Review URL: https://codereview.appspot.com/93410044
diff --git a/cpp/libaddressinput.gyp b/cpp/libaddressinput.gyp
index ca27ca7..63923c9 100644
--- a/cpp/libaddressinput.gyp
+++ b/cpp/libaddressinput.gyp
@@ -26,7 +26,7 @@
'target_name': 'libaddressinput',
'type': '<(component)',
'sources': [
- '<@(libaddressinput_sources)',
+ '<@(libaddressinput_files)',
],
'dependencies': [
'grit.gyp:generated_messages',
@@ -44,7 +44,7 @@
'target_name': 'unit_tests',
'type': 'executable',
'sources': [
- '<@(libaddressinput_test_sources)',
+ '<@(libaddressinput_test_files)',
],
'defines': [
'TEST_DATA_DIR="../testdata"',
diff --git a/cpp/libaddressinput.gypi b/cpp/libaddressinput.gypi
index d971990..f91e4f9 100644
--- a/cpp/libaddressinput.gypi
+++ b/cpp/libaddressinput.gypi
@@ -13,65 +13,62 @@
# limitations under the License.
{
'variables': {
- 'variables': {
- 'libaddressinput_dir%': '.',
- },
- 'libaddressinput_sources': [
- '<(libaddressinput_dir)/src/address_data.cc',
- '<(libaddressinput_dir)/src/address_field.cc',
- '<(libaddressinput_dir)/src/address_field_util.cc',
- '<(libaddressinput_dir)/src/address_problem.cc',
- '<(libaddressinput_dir)/src/address_ui.cc',
- '<(libaddressinput_dir)/src/address_validator.cc',
- '<(libaddressinput_dir)/src/language.cc',
- '<(libaddressinput_dir)/src/localization.cc',
- '<(libaddressinput_dir)/src/lookup_key.cc',
- '<(libaddressinput_dir)/src/lookup_key_util.cc',
- '<(libaddressinput_dir)/src/metadata_loader.cc',
- '<(libaddressinput_dir)/src/metadata_query_task.cc',
- '<(libaddressinput_dir)/src/null_storage.cc',
- '<(libaddressinput_dir)/src/post_box_matchers.cc',
- '<(libaddressinput_dir)/src/region_data_constants.cc',
- '<(libaddressinput_dir)/src/retriever.cc',
- '<(libaddressinput_dir)/src/rule.cc',
- '<(libaddressinput_dir)/src/rule_retriever.cc',
- '<(libaddressinput_dir)/src/util/json.cc',
- '<(libaddressinput_dir)/src/util/md5.cc',
- '<(libaddressinput_dir)/src/util/string_split.cc',
- '<(libaddressinput_dir)/src/validating_storage.cc',
- '<(libaddressinput_dir)/src/validating_util.cc',
- '<(libaddressinput_dir)/src/validation_task.cc',
+ 'libaddressinput_files': [
+ 'src/address_data.cc',
+ 'src/address_field.cc',
+ 'src/address_field_util.cc',
+ 'src/address_problem.cc',
+ 'src/address_ui.cc',
+ 'src/address_validator.cc',
+ 'src/language.cc',
+ 'src/localization.cc',
+ 'src/lookup_key.cc',
+ 'src/lookup_key_util.cc',
+ 'src/metadata_loader.cc',
+ 'src/metadata_query_task.cc',
+ 'src/null_storage.cc',
+ 'src/post_box_matchers.cc',
+ 'src/region_data_constants.cc',
+ 'src/retriever.cc',
+ 'src/rule.cc',
+ 'src/rule_retriever.cc',
+ 'src/util/json.cc',
+ 'src/util/md5.cc',
+ 'src/util/string_split.cc',
+ 'src/validating_storage.cc',
+ 'src/validating_util.cc',
+ 'src/validation_task.cc',
],
- 'libaddressinput_test_sources': [
- '<(libaddressinput_dir)/test/address_data_test.cc',
- '<(libaddressinput_dir)/test/address_field_test.cc',
- '<(libaddressinput_dir)/test/address_field_util_test.cc',
- '<(libaddressinput_dir)/test/address_problem_test.cc',
- '<(libaddressinput_dir)/test/address_ui_test.cc',
- '<(libaddressinput_dir)/test/address_validator_test.cc',
- '<(libaddressinput_dir)/test/fake_downloader.cc',
- '<(libaddressinput_dir)/test/fake_downloader_test.cc',
- '<(libaddressinput_dir)/test/fake_storage.cc',
- '<(libaddressinput_dir)/test/fake_storage_test.cc',
- '<(libaddressinput_dir)/test/language_test.cc',
- '<(libaddressinput_dir)/test/localization_test.cc',
- '<(libaddressinput_dir)/test/lookup_key_test.cc',
- '<(libaddressinput_dir)/test/lookup_key_util_test.cc',
- '<(libaddressinput_dir)/test/metadata_loader_test.cc',
- '<(libaddressinput_dir)/test/metadata_query_task_test.cc',
- '<(libaddressinput_dir)/test/null_storage_test.cc',
- '<(libaddressinput_dir)/test/post_box_matchers_test.cc',
- '<(libaddressinput_dir)/test/region_data_constants_test.cc',
- '<(libaddressinput_dir)/test/retriever_test.cc',
- '<(libaddressinput_dir)/test/rule_retriever_test.cc',
- '<(libaddressinput_dir)/test/rule_test.cc',
- '<(libaddressinput_dir)/test/util/json_test.cc',
- '<(libaddressinput_dir)/test/util/md5_unittest.cc',
- '<(libaddressinput_dir)/test/util/scoped_ptr_unittest.cc',
- '<(libaddressinput_dir)/test/util/string_split_unittest.cc',
- '<(libaddressinput_dir)/test/validating_storage_test.cc',
- '<(libaddressinput_dir)/test/validating_util_test.cc',
- '<(libaddressinput_dir)/test/validation_task_test.cc',
+ 'libaddressinput_test_files': [
+ 'test/address_data_test.cc',
+ 'test/address_field_test.cc',
+ 'test/address_field_util_test.cc',
+ 'test/address_problem_test.cc',
+ 'test/address_ui_test.cc',
+ 'test/address_validator_test.cc',
+ 'test/fake_downloader.cc',
+ 'test/fake_downloader_test.cc',
+ 'test/fake_storage.cc',
+ 'test/fake_storage_test.cc',
+ 'test/language_test.cc',
+ 'test/localization_test.cc',
+ 'test/lookup_key_test.cc',
+ 'test/lookup_key_util_test.cc',
+ 'test/metadata_loader_test.cc',
+ 'test/metadata_query_task_test.cc',
+ 'test/null_storage_test.cc',
+ 'test/post_box_matchers_test.cc',
+ 'test/region_data_constants_test.cc',
+ 'test/retriever_test.cc',
+ 'test/rule_retriever_test.cc',
+ 'test/rule_test.cc',
+ 'test/util/json_test.cc',
+ 'test/util/md5_unittest.cc',
+ 'test/util/scoped_ptr_unittest.cc',
+ 'test/util/string_split_unittest.cc',
+ 'test/validating_storage_test.cc',
+ 'test/validating_util_test.cc',
+ 'test/validation_task_test.cc',
],
},
}
