From a75a786530ba49b7dcb9e863d6a25753d6ba08f5 Mon Sep 17 00:00:00 2001
From: itkg-ngilain <noel.gilain@businessdecision.com>
Date: Mon, 18 Jan 2016 11:13:20 +0100
Subject: [PATCH] Move remaining generic code inside CmsBundle

---
 Gruntfile.js        | 19 ++-----------------
 grunt/app_config.js |  3 ++-
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 1c92c65d7..1e0083320 100644
--- a/Gruntfile.js
+++ b/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);
 };
diff --git a/grunt/app_config.js b/grunt/app_config.js
index 3bedbf736..82e41dbf5 100644
--- a/grunt/app_config.js
+++ b/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',