Skip to content

Commit

Permalink
Move remaining generic code inside CmsBundle
Browse files Browse the repository at this point in the history
  • Loading branch information
ngilain committed Jan 18, 2016
1 parent 0625ffc commit a75a786
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
19 changes: 2 additions & 17 deletions Gruntfile.js
@@ -1,21 +1,6 @@
module.exports = function(grunt) {
var merge = require('merge');
var appConfig = require('./grunt/app_config.js');
var configLoader = require(appConfig.configLoader);
var config = {
pkg: grunt.file.readJSON('package.json'),
env: process.env
};
var GruntConfigBuilder = require(appConfig.GruntConfigBuilder);

require('load-grunt-tasks')(grunt);

for (var i= 0; i < appConfig.tasksDir.length; i++) {
grunt.loadTasks(appConfig.tasksDir[i]);
}

for (var i= 0; i < appConfig.targetsDir.length; i++) {
config = merge.recursive(true, config, configLoader.loadDir(appConfig.targetsDir[i]));
}

grunt.initConfig(config);
GruntConfigBuilder.init(grunt, appConfig);
};
3 changes: 2 additions & 1 deletion grunt/app_config.js
@@ -1,5 +1,6 @@
module.exports = {
configLoader: '/var/www/openorchestra/vendor/open-orchestra/open-orchestra-cms-bundle/GruntTasks/config_loader.js',
GruntConfigBuilder:
'/var/www/openorchestra/vendor/open-orchestra/open-orchestra-cms-bundle/GruntTasks/GruntConfigBuilder.js',
tasksDir: [
'/var/www/openorchestra/grunt/tasks',
'/var/www/openorchestra/vendor/open-orchestra/open-orchestra-cms-bundle/GruntTasks',
Expand Down

0 comments on commit a75a786

Please sign in to comment.