From e8dcb8af0001bf5486500340405faa0041adcd41 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 9 Jul 2014 14:22:10 -0700 Subject: [PATCH] generate fuzzed color stylesheet, copy to product_dir --- bin/build-style.js | 17 +++++++++++++---- llmr.gyp | 13 +++++++++---- test/style.cpp | 10 ++++++++++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/bin/build-style.js b/bin/build-style.js index 9e131e05a..720a73990 100755 --- a/bin/build-style.js +++ b/bin/build-style.js @@ -2,9 +2,18 @@ 'use strict'; var load = require('./load-style.js'); -var minify = require('./minify'); var mkdirp = require('./mkdirp.js'); +var path = require('path'); -load(process.argv[2]) - .pipe(minify()) - .pipe(mkdirp(process.argv[3])); +var transforms = { + 'style.min.js': require('./minify.js'), + 'fuzz-colors.min.js': require('./fuzz-colors.js') +}; + +var source = load(process.argv[2]); + +Object.keys(transforms).forEach(function(key) { + load(process.argv[2]) + .pipe(transforms[key].call()) + .pipe(mkdirp(path.join(process.argv[3], key))); +}); diff --git a/llmr.gyp b/llmr.gyp index f19478aa1..2a2df44b0 100644 --- a/llmr.gyp +++ b/llmr.gyp @@ -44,14 +44,16 @@ 'bin/style.json', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js' + '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js', + '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-colors.min.js', ], - 'action': ['<@(node)', 'bin/build-style.js', '<@(_inputs)', '<@(_outputs)'] + 'action': ['<@(node)', 'bin/build-style.js', '<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)/bin'] } ], 'direct_dependent_settings': { 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js' + '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js', + '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-colors.min.js', ], } }, @@ -64,7 +66,10 @@ ], 'copies': [ { - 'files': [ '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js' ], + 'files': [ + '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js', + '<(SHARED_INTERMEDIATE_DIR)/bin/fuzz-colors.min.js', + ], 'destination': '<(PRODUCT_DIR)' } ] diff --git a/test/style.cpp b/test/style.cpp index 6a482184d..a321fe835 100644 --- a/test/style.cpp +++ b/test/style.cpp @@ -16,3 +16,13 @@ TEST(Style, Style) { Style style; style.loadJSON((const uint8_t *)stylejson.str().c_str()); } + +TEST(Style, Colors) { + std::ifstream stylefile("./fuzz-colors.min.js"); + ASSERT_TRUE(stylefile.good()); + std::stringstream stylejson; + stylejson << stylefile.rdbuf(); + + Style style; + style.loadJSON((const uint8_t *)stylejson.str().c_str()); +}