build fixes

2014-08-11 13:24:25 -04:00
parent 702c74fbd9
commit fae1c157f6
4 changed files with 2247 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@
 /src/shader/shaders_gles2.cpp
 /bin/style.bin.js
 /test/fixtures/styles/index.html
-/test/fixtures/style_parser/default.style.json
+/test/fixtures/style_parser/styles
--- a/mapboxgl.gyp
+++ b/mapboxgl.gyp
@@ -57,9 +57,6 @@
      'target_name': 'bundle_styles',
      'type': 'none',
      'hard_dependency': 1,
-      'dependencies': [
-        'npm_install'
-      ],
      'actions': [
        {
          'action_name': 'Touch Stylesheet Directory',
@@ -98,7 +95,7 @@
      'type': 'none',
      'hard_dependency': 1,
      'dependencies': [
-        'build_stylesheet'
+        'bundle_styles'
      ],
      'copies': [
        {
--- a/test/fixtures/style_parser/default.style.json
+++ b/test/fixtures/style_parser/default.style.json
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -122,7 +122,7 @@
        "dependencies": [
            "../deps/gtest/gtest.gyp:gtest",
            "../mapboxgl.gyp:mapboxgl",
-            "../mapboxgl.gyp:copy_default_stylesheet_fixtures",
+            "../mapboxgl.gyp:copy_fixtures",
        ]
    },
    {