diff options
author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-18 14:09:33 -0400 |
---|---|---|
committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-18 14:09:33 -0400 |
commit | 54a81d0f9b9903213c55d89ee87eeacbadd5486c (patch) | |
tree | 064e86dd0b806c4cfca0082e255edc989a17cfe6 /mapboxgl.gyp | |
parent | 4d4fd3155c9d649628f776ed298d3812f363b354 (diff) | |
download | qtlocation-mapboxgl-54a81d0f9b9903213c55d89ee87eeacbadd5486c.tar.gz |
migrate style_parser tests to use info and style json fixtures
Diffstat (limited to 'mapboxgl.gyp')
-rw-r--r-- | mapboxgl.gyp | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/mapboxgl.gyp b/mapboxgl.gyp index e8a217a3f9..0c08989ce8 100644 --- a/mapboxgl.gyp +++ b/mapboxgl.gyp @@ -64,7 +64,7 @@ { 'action_name': 'Build Stylesheet', 'inputs': [ - 'bin/style.json', + 'bin/default.style.json', ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js', @@ -79,35 +79,6 @@ } }, { - 'target_name': 'build_stylesheet_fixtures', - 'type': 'none', - 'hard_dependency': 1, - 'dependencies': [ - 'npm_install' - ], - 'actions': [ - { - 'action_name': 'Build Stylesheet Fixtures', - 'inputs': [ - 'bin/style.json', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-colors.min.js', - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-functions.min.js', - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-layers.min.js', - ], - 'action': ['<@(node)', 'bin/build-fixtures.js', '<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)/bin'] - } - ], - 'direct_dependent_settings': { - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-colors.min.js', - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-functions.min.js', - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-layers.min.js', - ], - } - }, - { 'target_name': 'copy_default_stylesheet', 'type': 'none', 'hard_dependency': 1, @@ -124,20 +95,18 @@ ] }, { - 'target_name': 'copy_stylesheet_fixtures', + 'target_name': 'copy_default_stylesheet_fixtures', 'type': 'none', 'hard_dependency': 1, 'dependencies': [ - 'build_stylesheet_fixtures' + 'build_stylesheet' ], 'copies': [ { 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-colors.min.js', - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-functions.min.js', - '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-layers.min.js', + 'bin/default.style.json', ], - 'destination': '<(PRODUCT_DIR)' + 'destination': 'test/fixtures/style_parser' } ] }, |