diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-08-11 12:42:49 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-08-11 12:42:49 -0400 |
| commit | a79afb78d8c1d0c8faf0c54ee9d669a79f71ce3f (patch) | |
| tree | 2dc2e557b4932c44e3717effa0ee342dbc74decd /mapboxgl.gyp | |
| parent | 1e55be2065827a8e1e66ccc60ca9292feaff944f (diff) | |
| parent | 7a98ad4cf949dd1279719bf926bd08da0133210f (diff) | |
| download | qtlocation-mapboxgl-a79afb78d8c1d0c8faf0c54ee9d669a79f71ce3f.tar.gz | |
Merge branch 'master' into style-parser-test
Conflicts:
bin/build-style.js
bin/default.style.json
mapboxgl.gyp
src/style/style_parser.cpp
test/test.gyp
Diffstat (limited to 'mapboxgl.gyp')
| -rw-r--r-- | mapboxgl.gyp | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/mapboxgl.gyp b/mapboxgl.gyp index 0c08989ce8..5a526f8e90 100644 --- a/mapboxgl.gyp +++ b/mapboxgl.gyp @@ -54,7 +54,7 @@ ], }, { - 'target_name': 'build_stylesheet', + 'target_name': 'bundle_styles', 'type': 'none', 'hard_dependency': 1, 'dependencies': [ @@ -62,40 +62,39 @@ ], 'actions': [ { - 'action_name': 'Build Stylesheet', - 'inputs': [ - 'bin/default.style.json', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js', - ], - 'action': ['<@(node)', 'bin/build-style.js', '<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)/bin'] + 'action_name': 'Touch Stylesheet Directory', + 'inputs': ['styles'], + 'outputs': ['styles'], + 'action': ['touch', 'styles'], # required for xcode http://openradar.appspot.com/7232149 } ], 'direct_dependent_settings': { - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js', + 'mac_bundle_resources': [ + 'styles', ], } }, { - 'target_name': 'copy_default_stylesheet', + 'target_name': 'copy_styles', 'type': 'none', 'hard_dependency': 1, - 'dependencies': [ - 'build_stylesheet' + 'actions': [ + { + 'action_name': 'Touch Stylesheet Directory', + 'inputs': ['styles'], + 'outputs': ['styles'], + 'action': ['touch', 'styles'], # required for xcode http://openradar.appspot.com/7232149 + } ], 'copies': [ { - 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js', - ], + 'files': [ 'styles' ], 'destination': '<(PRODUCT_DIR)' } ] }, { - 'target_name': 'copy_default_stylesheet_fixtures', + 'target_name': 'copy_fixtures', 'type': 'none', 'hard_dependency': 1, 'dependencies': [ @@ -103,9 +102,7 @@ ], 'copies': [ { - 'files': [ - 'bin/default.style.json', - ], + 'files': [ 'styles' ], 'destination': 'test/fixtures/style_parser' } ] @@ -127,7 +124,6 @@ 'type': 'static_library', 'hard_dependency': 1, 'dependencies': [ - 'build_stylesheet', 'shaders', ], 'sources': [ @@ -195,7 +191,6 @@ 'type': 'static_library', 'hard_dependency': 1, 'dependencies': [ - 'build_stylesheet', 'shaders', ], 'sources': [ |