From 0602efdb1518c3db12698d7829b45458439c4820 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Wed, 17 Oct 2018 09:50:09 +0200
Subject: [PATCH] Compilation grunt

---
 conf/Gruntfile.js | 22 ++++++++++++++--------
 install.sh        |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/conf/Gruntfile.js b/conf/Gruntfile.js
index 103039bd..b39d74eb 100644
--- a/conf/Gruntfile.js
+++ b/conf/Gruntfile.js
@@ -9,15 +9,21 @@ module.exports = function (grunt) {
     var compilerPackage = require('google-closure-compiler');
     compilerPackage.grunt(grunt);
 
+    var devMode = grunt.option('dev');
+
     var sHome = '../';
+    if (devMode) {
+        sHome = '../client/';
+    }
+
     var sClosureDepsHome = '../../../../../';
 
-    // Project configuration. 
+    // Project configuration.
     grunt.initConfig({
         'closure-compiler': {
             vMap: {
                 files: {
-                    '../javascript/vmap.min.js': [
+                    [sHome + 'javascript/vmap.min.js']: [
                         // Fichiers Vitis
                         sHome + 'javascript/require/*.js',
                         sHome + 'javascript/app/**/*.js',
@@ -62,13 +68,13 @@ module.exports = function (grunt) {
                     language_in: 'ECMASCRIPT5',
                     language_out: 'ECMASCRIPT5',
                     closure_entry_point: ['vmap', 'vitis', 'oVFB'],
-                    create_source_map: '../javascript/vmap.min.js.map',
+                    create_source_map: sHome + 'javascript/vmap.min.js.map',
                     output_wrapper: '(function(){\n%output%\n}).call(this)\n//# sourceMappingURL=../javascript/vmap.min.js.map'
                 }
             },
             studio: {
                 files: {
-                    '../javascript/externs/studio/javascript/studio.min.js': [
+                    [sHome + 'javascript/externs/studio/javascript/studio.min.js']: [
                         // Fichiers Studio
                         sHome + 'javascript/externs/studio/properties/properties.js',
                         sHome + 'javascript/externs/studio/javascript/app/**/*.js'
@@ -84,7 +90,7 @@ module.exports = function (grunt) {
             },
             formReader: {
                 files: {
-                    '../javascript/externs/formReader/formReader.min.js': [
+                    [sHome + 'javascript/externs/formReader/formReader.min.js']: [
                         // Fichiers FormReader
                         sHome + 'javascript/externs/formReader/**/*.js'
                     ]
@@ -124,14 +130,14 @@ module.exports = function (grunt) {
                 ]
             },
             targetName: {
-                dest: '../javascript/vmap.deps.js'
+                dest: sHome + 'javascript/vmap.deps.js'
             }
         }
     });
 
     grunt.loadNpmTasks('grunt-closure-tools');
 
-    // Tache par défaut 
+    // Tache par défaut
     // cmd: grunt
     grunt.registerTask('default', ['closureDepsWriter', 'closure-compiler:vMap']);
     // cmd: grunt generate-deps
@@ -144,4 +150,4 @@ module.exports = function (grunt) {
     grunt.registerTask('minify-libs', ['closure-compiler:formReader', 'closure-compiler:studio']);
     // cmd: grunt compile
     grunt.registerTask('compile', ['closure-compiler:vMap']);
-};
\ No newline at end of file
+};
diff --git a/install.sh b/install.sh
index 39bbde77..a085f034 100755
--- a/install.sh
+++ b/install.sh
@@ -21,5 +21,5 @@ else
     npm install grunt-closure-tools --save
     npm install google-closure-compiler@20160911.0.0 --save
     npm install google-closure-library@20160911.0.0 --save
-    grunt
+    grunt --dev
 fi
-- 
GitLab