diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-27 11:46:06 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-01 08:11:01 -0800 |
| commit | 9c5abc122176a9080f03754e88c0bab4c08a034b (patch) | |
| tree | 61f00a8620e335096426bbf70684e55e1d057965 | |
| parent | d4cee2cea5f42843fcbebc6bfbc001559c3a79e1 (diff) | |
| download | qtlocation-mapboxgl-9c5abc122176a9080f03754e88c0bab4c08a034b.tar.gz | |
[build] Use style-spec from gl-js monorepo
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | platform/android/scripts/generate-style-code.js | 2 | ||||
| -rw-r--r-- | platform/darwin/scripts/generate-style-code.js | 2 | ||||
| -rw-r--r-- | scripts/generate-style-code.js | 2 |
5 files changed, 3 insertions, 4 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject 2663093c9d7f0cba6235131fb9b9f30328a7660 +Subproject b701148c26bf54e713a6d2490a6b8605a11f617 diff --git a/package.json b/package.json index 5a9e159cc5..c3452bcadf 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "ejs": "^2.4.1", "express": "^4.11.1", "lodash": "^4.16.4", - "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#49e8b407bdbbe6f7c92dbcb56d3d51f425fc2653", "mkdirp": "^0.5.1", "node-cmake": "^1.2.1", "pixelmatch": "^4.0.2", diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index 9c31d0cbbf..634a4ce802 100644 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -2,7 +2,7 @@ const fs = require('fs'); const ejs = require('ejs'); -const spec = require('mapbox-gl-style-spec').latest; +const spec = require('../../../mapbox-gl-js/js/style-spec').latest; const _ = require('lodash'); require('../../../scripts/style-code'); diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js index 4b04250070..a305367afd 100644 --- a/platform/darwin/scripts/generate-style-code.js +++ b/platform/darwin/scripts/generate-style-code.js @@ -11,7 +11,7 @@ const cocoaConventions = require('./style-spec-cocoa-conventions-v8.json'); const prefix = 'MGL'; const suffix = 'StyleLayer'; -let spec = _.merge(require('mapbox-gl-style-spec').latest, require('./style-spec-overrides-v8.json')); +let spec = _.merge(require('../../../mapbox-gl-js/js/style-spec').latest, require('./style-spec-overrides-v8.json')); /// // Temporarily IGNORE layers that are in the spec yet still not supported in mbgl core diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index f2acb12a2a..d090dff872 100644 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -2,7 +2,7 @@ const fs = require('fs'); const ejs = require('ejs'); -const spec = require('mapbox-gl-style-spec').latest; +const spec = require('../mapbox-gl-js/js/style-spec').latest; const colorParser = require('csscolorparser'); require('./style-code'); |