Remove hardcoded target in Main plugin

pillforge · Mar 3, 2016 · 8f3146d · 8f3146d
1 parent 1f6c898
commit 8f3146d
Show file tree

Hide file tree

Showing 7 changed files with 381,856 additions and 356,442 deletions.
diff --git a/src/plugins/Main/Main.js b/src/plugins/Main/Main.js
@@ -42,6 +42,11 @@ define([ 'plugin/PluginConfig',
   Main.prototype.main = function (callback) {
     var self = this;
     var path = require('path');
+    var target = self._getTarget(self.activeNode);
+
+    if ( (self._currentConfig.goal === 'compileApp'|| self._currentConfig.goal === 'generateModule') && !target) {
+      return callCallback('No target', false);
+    }
 
     switch (self._currentConfig.goal) {
       case 'generateNescCode':
@@ -57,7 +62,7 @@ define([ 'plugin/PluginConfig',
       case 'generateModule':
         self.logger.info('generateModule');
         var module_util = new ModuleUtil(self);
-        module_util.generateModule(self.activeNode, 'exp430')
+        module_util.generateModule(self.activeNode, target)
           .then (function () {
             return self.save('Internal structure of a module is generated');
           })
@@ -67,10 +72,10 @@ define([ 'plugin/PluginConfig',
         break;
       case 'compileApp':
         self.logger.info('compileApp');
-        NescUtil.compileApp(self, self.activeNode, 'exp430')
+        NescUtil.compileApp(self, self.activeNode, target)
           .then(function (tmp_path) {
             var name = self.core.getAttribute(self.activeNode, 'name');
-            return NescUtil.addBlobs(self, path.join(tmp_path, 'build/exp430'), name);
+            return NescUtil.addBlobs(self, path.join(tmp_path, 'build', target), name);
           })
           .then(function (download_url) {
             self.createMessage(self.activeNode, {
@@ -85,7 +90,7 @@ define([ 'plugin/PluginConfig',
         break;
       case 'importApp':
         self.logger.info('importApp for', self._currentConfig.app_path);
-        var importer_util = new ImporterUtil(self, 'exp430');
+        var importer_util = new ImporterUtil(self, self._currentConfig.target);
         importer_util.importAComponentFromPath(self._currentConfig.app_path)
           .then(function () {
             return self.save(self._currentConfig.app_path + ' ..imported');
@@ -98,11 +103,11 @@ define([ 'plugin/PluginConfig',
           });
         break;
       case 'importTos':
-        self.logger.info('import Tos for', 'exp430');
-        importer_util = new ImporterUtil(self, 'exp430');
+        self.logger.info('import Tos for', self._currentConfig.target);
+        importer_util = new ImporterUtil(self, self._currentConfig.target);
         importer_util.importAllTosComponents()
           .then(function () {
-            return self.save('Tos imported for exp430');
+            return self.save('Tos imported for ' + self._currentConfig.target);
           })
           .then(function () {
             callCallback(null, true);
@@ -120,5 +125,13 @@ define([ 'plugin/PluginConfig',
 
   };
 
+  Main.prototype._getTarget = function (node) {
+    var p = this.core.getParent(node);
+    if (p) {
+      return this.core.getAttribute(p, 'target');
+    }
+    return null;
+  };
+
   return Main;
 });
diff --git a/src/plugins/utils/ImporterUtil.js b/src/plugins/utils/ImporterUtil.js
@@ -449,6 +449,7 @@ ImporterUtil.prototype._mkdirp = function (file_path) {
         base: self._context.META.Folder
       });
       self._core.setAttribute(dir_node, 'name', dir);
+      self._core.setAttribute(dir_node, 'target', self._target);
       self._registry_paths.folders[curr_path] = self._core.getPath(dir_node);
       self._nodes[self._registry_paths.folders[curr_path]] = dir_node;
     }

diff --git a/src/scripts/cli-import b/src/scripts/cli-import
@@ -21,7 +21,7 @@ program
   .option('-n --new', 'Create new project')
   .option('-p --project [string]', 'Project [mandatory]')
   .option('-b --branch [string]', 'Branch [default is master]')
-  .option('-t --target', 'Target platform')
+  .option('-t --target', 'Target platform [default is exp430')
   .option('-r --recursive', 'Recursive')
   .option('-a --all', 'Import all TOS')
   .parse(process.argv);
@@ -50,7 +50,8 @@ if (program.new) {
 var obj = {};
 if (program.all) {
   obj = {
-    goal: 'importTos'
+    goal: 'importTos',
+    target: program.target || 'exp430'
   };
   run_plugin();
 } else if (program.recursive) {
@@ -61,7 +62,8 @@ if (program.all) {
       if (fs.existsSync(path.join(dir_path, file, 'Makefile'))) {
         obj = {
           goal: 'importApp',
-          app_path: path.join(dir_path, file)
+          app_path: path.join(dir_path, file),
+          target: program.target || 'exp430'
         };
         run_plugin();
       }
@@ -71,7 +73,8 @@ if (program.all) {
   var app_path = path.resolve(process.cwd(), program.args[0]);
   obj = {
     goal: 'importApp',
-    app_path: app_path
+    app_path: app_path,
+    target: program.target || 'exp430'
   };
   run_plugin();
 }