summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-10-10 19:33:15 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-10-11 16:06:28 +0300
commit990fdc43facab2d296f35bc8670a926d05fbe864 (patch)
tree5b830ef87cf47814eff861602de869a1dcc0a30e
parentbebc49949a551150de8e557bf15563283516a59b (diff)
downloadqtlocation-mapboxgl-990fdc43facab2d296f35bc8670a926d05fbe864.tar.gz
[build] Make sure offline_schema.hpp is up-to-date
- Get the bots to verify that. - Fix the paths.
-rw-r--r--circle.yml1
-rw-r--r--platform/default/include/mbgl/storage/offline_schema.hpp2
-rwxr-xr-x[-rw-r--r--]platform/default/include/mbgl/storage/offline_schema.js8
3 files changed, 7 insertions, 4 deletions
diff --git a/circle.yml b/circle.yml
index 083ea121a0..d549cbe563 100644
--- a/circle.yml
+++ b/circle.yml
@@ -642,6 +642,7 @@ jobs:
name: Code Generators
command: |
platform/android/scripts/generate-style-code.js
+ platform/default/include/mbgl/storage/offline_schema.js
scripts/generate-file-lists.js
scripts/generate-shaders.js
scripts/generate-style-code.js
diff --git a/platform/default/include/mbgl/storage/offline_schema.hpp b/platform/default/include/mbgl/storage/offline_schema.hpp
index e177d0dbd3..77c66b7d15 100644
--- a/platform/default/include/mbgl/storage/offline_schema.hpp
+++ b/platform/default/include/mbgl/storage/offline_schema.hpp
@@ -1,7 +1,7 @@
#pragma once
// THIS IS A GENERATED FILE; EDIT offline_schema.sql INSTEAD
-// To regenerate, run `node platform/default/mbgl/storage/offline_schema.js`
+// To regenerate, run `node platform/default/include/mbgl/storage/offline_schema.js`
namespace mbgl {
diff --git a/platform/default/include/mbgl/storage/offline_schema.js b/platform/default/include/mbgl/storage/offline_schema.js
index fdb7dc6405..a58e216d4a 100644..100755
--- a/platform/default/include/mbgl/storage/offline_schema.js
+++ b/platform/default/include/mbgl/storage/offline_schema.js
@@ -1,13 +1,15 @@
+#!/usr/bin/env node
+
var fs = require('fs');
-fs.writeFileSync('platform/default/mbgl/storage/offline_schema.hpp', `#pragma once
+fs.writeFileSync('platform/default/include/mbgl/storage/offline_schema.hpp', `#pragma once
// THIS IS A GENERATED FILE; EDIT offline_schema.sql INSTEAD
-// To regenerate, run \`node platform/default/mbgl/storage/offline_schema.js\`
+// To regenerate, run \`node platform/default/include/mbgl/storage/offline_schema.js\`
namespace mbgl {
static constexpr const char* offlineDatabaseSchema =
-${fs.readFileSync('platform/default/mbgl/storage/offline_schema.sql', 'utf8')
+${fs.readFileSync('platform/default/include/mbgl/storage/offline_schema.sql', 'utf8')
.replace(/ *--.*/g, '')
.split('\n')
.filter(a => a)