Merge branch 'master' into forceatlas2-transferable

Yomguithereal · Yomguithereal · commit a1394ebb53d7 · 2014-05-21T14:26:48.000+02:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,3 +1,5 @@
+var fs = require('fs');
+
 module.exports = function(grunt) {
   var coreJsFiles = [
     // Core:
@@ -52,19 +54,34 @@ module.exports = function(grunt) {
   var npmJsFiles = coreJsFiles.slice(0);
   npmJsFiles.splice(2, 0, 'src/sigma.export.js');
 
-  var pluginFiles = [
-    'plugins/sigma.layout.forceAtlas2/*.js',
-    'plugins/sigma.parsers.gexf/*.js',
-    'plugins/sigma.parsers.json/*.js',
-    'plugins/sigma.plugins.animate/*.js',
-    'plugins/sigma.plugins.dragNodes/*.js',
-    'plugins/sigma.plugins.neighborhoods/*.js',
-    'plugins/sigma.renderers.customShapes/*.js'
+  var plugins = [
+    'layout.forceAtlas2',
+    'parsers.gexf',
+    'parsers.json',
+    'plugins.animate',
+    'plugins.dragNodes',
+    'plugins.neighborhoods',
+    'renderers.customShapes'
   ];
 
+  var pluginFiles = [],
+      subGrunts = {};
+
+  plugins.forEach(function(p) {
+    var dir = 'plugins/sigma.' + p + '/';
+
+    if (fs.existsSync(dir + 'Gruntfile.js'))
+      subGrunts[p] = {
+        gruntfile: dir + 'Gruntfile.js'
+      };
+    else
+      pluginFiles.push(dir + '*.js');
+  });
+
   // Project configuration:
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
+    grunt: subGrunts,
     closureLint: {
       app: {
         closureLinterPath: '/usr/local/bin',
diff --git a/package.json b/package.json
@@ -21,7 +21,8 @@
     "load-grunt-tasks": "~0.4.0",
     "grunt-sed": "~0.1.1",
     "grunt-zip": "~0.13.0",
-    "http-server": "~0.6.1"
+    "http-server": "~0.6.1",
+    "grunt-grunt": "^0.2.2"
   },
   "scripts": {
     "start": "http-server -p 8000",
