Use app/package.json for grunt tasks. Add extras attribute to apio co…

…nfiguration
FPGAwars · Jan 11, 2018 · 15e66e2 · 15e66e2
1 parent 4f138af
commit 15e66e2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/app/package.json b/app/package.json
@@ -12,16 +12,20 @@
     "height": 620,
     "min_width": 800,
     "min_height": 200,
-    "toolbar": true,
+    "toolbar": false,
     "resizable": true,
     "position": "center",
     "icon": "resources/images/icestudio-logo.png"
   },
   "apio": {
     "min": "0.3.0b4",
     "max": "0.4.0",
+    "extras": [
+      "tinyfpgab"
+    ],
     "external": ""
   },
+  "collection": "0.3.0",
   "engines": {
     "node": ">= 0.10.0"
   },

diff --git a/app/scripts/services/tools.js b/app/scripts/services/tools.js
@@ -808,7 +808,8 @@ angular.module('icestudio')
     // Remote installation
 
     function installOnlineApio(callback) {
-      updateProgress('pip install -U apio[tinyfpgab]', 30);
+      var extraPackages = _package.apio.extras || [];
+      updateProgress('pip install -U apio[' + extraPackages.toString() + ']', 30);
       utils.installOnlineApio(callback);
     }
 

diff --git a/app/scripts/services/utils.js b/app/scripts/services/utils.js
@@ -171,10 +171,8 @@ angular.module('icestudio')
     };
 
     this.installOnlineApio = function(callback) {
-      var extraPackages = [
-        'tinyfpgab', // Used for the TinyFPGA B2 board
-      ];
       var versionRange = '">=' + _package.apio.min + ',<' + _package.apio.max + '"';
+      var extraPackages = _package.apio.extras || [];
       this.executeCommand([coverPath(common.ENV_PIP), 'install', '-U', 'apio[' + extraPackages.toString() + ']' + versionRange], callback);
     };
 

diff --git a/gruntfile.js b/gruntfile.js
@@ -41,7 +41,7 @@ module.exports = function(grunt) {
   // Project configuration
   grunt.initConfig({
 
-    pkg: grunt.file.readJSON('package.json'),
+    pkg: grunt.file.readJSON('app/package.json'),
 
     // Automatically inject Bower components into the app
     wiredep: {
@@ -139,6 +139,7 @@ module.exports = function(grunt) {
         apioMin: '<%=pkg.apio.min%>',
         apioMax: '<%=pkg.apio.max%>',
         buildDir: 'dist/',
+        extraPackages: '<%=pkg.apio.extras%>',
         platforms: platforms
       }
     },

diff --git a/package.json b/package.json
@@ -11,11 +11,6 @@
     "gettext": "grunt gettext",
     "postinstall": "npmpd && cd app && npm install && bower install && cd ../tasks && npm install && cd .. && grunt getcollection"
   },
-  "apio": {
-    "min": "0.3.0b4",
-    "max": "0.4.0"
-  },
-  "collection": "0.3.0",
   "devDependencies": {
     "bower": "^1.8.0",
     "grunt": "^1.0.1",

diff --git a/tasks/toolchain_builder.js b/tasks/toolchain_builder.js
@@ -23,6 +23,7 @@ function ToolchainBuilder(options) {
     apioMax: '',
     buildDir: './build',
     cacheDir: './cache',
+    extraPackages: [],
     platforms: ['linux32', 'linux64', 'win32', 'win64', 'osx32', 'osx64'],
   };
 
@@ -132,13 +133,10 @@ ToolchainBuilder.prototype.downloadApio = function () {
   var self = this;
   self.emit('log', '> Download apio');
   return new Promise(function(resolve, reject) {
-    var extraPackages = [
-      'tinyfpgab', // Used for the TinyFPGA B2 board
-    ];
     var versionRange = '">=' + self.options.apioMin + ',<' + self.options.apioMax + '"';
     var command = [
       self.options.venvPip, 'download', '--dest', self.options.apioDir,
-      'apio[' + extraPackages.toString() + ']' + versionRange
+      'apio[' + self.options.extraPackages.toString() + ']' + versionRange
     ];
     childProcess.exec(command.join(' '),
       function(error/*, stdout, stderr*/) {