Fix a couple small bugs in the build process

Author: KyleLomen

app/scripts/libs/iceplugmanager.js

@@ -203,16 +203,16 @@ var IcePlugManager = function () {
 
             newWin.on('loaded', function () {
                 let filter = ['WIN32', 'LINUX', 'DARWIN', 'VERSION', 'LOGFILE', 'BUILD_DIR'];
-                let env_filtered = {};
+                let envFiltered = {};
                 for (let prop in _this.env) {
                     if (filter.indexOf(prop) > -1) {
-                        env_filtered[prop] = _this.env[prop];
+                        envFiltered[prop] = _this.env[prop];
                     }
                 }
-                // this.window.postMessage({type:'ice-plugin-message', env:env_filtered});
+                // this.window.postMessage({type:'ice-plugin-message', env:envFiltered});
 
                 if (typeof this.window.onLoad !== 'undefined') {
-                    this.window.onLoad(env_filtered);
+                    this.window.onLoad(envFiltered);
                 }
             });
 

gruntfile.js

@@ -146,6 +146,7 @@
       options: {
         apioMin: '<%=pkg.apio.min%>',
         apioMax: '<%=pkg.apio.max%>',
+        apioBranch: '<%=pkg.apio.branch%>',
         buildDir: 'dist/',
         extraPackages: '<%=pkg.apio.extras%>',
         platforms: platforms

tasks/toolchain_builder.js

@@ -142,10 +142,19 @@ ToolchainBuilder.prototype.downloadApio = function () {
   self.emit('log', '> Download apio');
   return new Promise(function(resolve, reject) {
     var versionRange = '">=' + self.options.apioMin + ',<' + self.options.apioMax + '"';
-    var command = [
-      self.options.venvPip, 'download', '--dest', self.options.apioDir,
-      'apio[' + self.options.extraPackages.toString() + ']' + versionRange
-    ];
+    var command = [];
+    if(self.options.apioBranch === "develop") {
+      command = [
+        self.options.venvPip, 'download', '--dest', self.options.apioDir,
+        'git+https://github.com/FPGAwars/apio.git@develop#egg=apio[' + self.options.extraPackages.toString() + ']' + versionRange
+      ];
+    }
+    else {
+      command = [
+        self.options.venvPip, 'download', '--dest', self.options.apioDir,
+        'apio[' + self.options.extraPackages.toString() + ']' + versionRange
+      ];
+    }
     childProcess.exec(command.join(' '),
       function(error/*, stdout, stderr*/) {
         if (error) { reject(error); }