From a3054ae5d1a642dd14c14f17304812fc0e50aee3 Mon Sep 17 00:00:00 2001 From: divdavem Date: Thu, 18 Apr 2013 11:40:38 +0200 Subject: [PATCH] feat #465 moving some grunt configuration values This commit moves some build configuration values from config-atpackager-bootstrap.js to config-packaging.js to have more control on the build when overriding config-packaging.js. Close #465 --- build/grunt-config/config-atpackager-bootstrap.js | 2 +- build/grunt-config/config-atpackager-prod.js | 2 +- build/grunt-config/config-packaging.js | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/grunt-config/config-atpackager-bootstrap.js b/build/grunt-config/config-atpackager-bootstrap.js index ce5339b6c..cb6e89cb8 100644 --- a/build/grunt-config/config-atpackager-bootstrap.js +++ b/build/grunt-config/config-atpackager-bootstrap.js @@ -85,7 +85,7 @@ module.exports = function (grunt) { header : '<%= packaging.license %>' } }, - files : require('../config/files-bootstrap.json') + files : '<%= packaging.bootstrap.files %>' }, { name : 'aria/css/atskin-<%= pkg.version %>.js', files : ['aria/css/atskin.js'] diff --git a/build/grunt-config/config-atpackager-prod.js b/build/grunt-config/config-atpackager-prod.js index ce9c3b99a..903322475 100644 --- a/build/grunt-config/config-atpackager-prod.js +++ b/build/grunt-config/config-atpackager-prod.js @@ -37,7 +37,7 @@ module.exports = function (grunt) { options : { ATBootstrapFile : mainATFile, sourceDirectories : ['<%= packaging.bootstrap.outputdir %>'], - sourceFiles : ['**/*'], + sourceFiles : '<%= packaging.prod.source_files %>', defaultBuilder : { type : 'ATMultipart', cfg : { diff --git a/build/grunt-config/config-packaging.js b/build/grunt-config/config-packaging.js index e9d63bed2..9ac60f1dd 100755 --- a/build/grunt-config/config-packaging.js +++ b/build/grunt-config/config-packaging.js @@ -19,6 +19,7 @@ module.exports = function (grunt) { grunt.config.set('packaging.bootstrap.files', require('../config/files-bootstrap.json')); grunt.config.set('packaging.prod.outputdir', 'build/target/production'); grunt.config.set('packaging.prod.files', require('../config/files-prod.json')); + grunt.config.set('packaging.prod.source_files', ['**/*']); grunt.config.set('packaging.prod.allow_unpackaged_files', []); grunt.config.set('packaging.prod.localization_files', require('../config/files-prod-localization.json')); grunt.config.set('packaging.prod.hash_include_files', []);