From 990fdc43facab2d296f35bc8670a926d05fbe864 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 10 Oct 2019 19:33:15 +0300 Subject: [build] Make sure offline_schema.hpp is up-to-date - Get the bots to verify that. - Fix the paths. --- circle.yml | 1 + platform/default/include/mbgl/storage/offline_schema.hpp | 2 +- platform/default/include/mbgl/storage/offline_schema.js | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) mode change 100644 => 100755 platform/default/include/mbgl/storage/offline_schema.js 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 old mode 100644 new mode 100755 index fdb7dc6405..a58e216d4a --- 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) -- cgit v1.2.1