Merge pull request #42 from euforic/TIMOB-14636

TIMOB-14636 LiveView: 'alloy compile' command is used to recompile the Alloy code without specifying the platform
tidev · Jul 25, 2013 · 279acde · 279acde
2 parents 4667cfd + bd05173
commit 279acde
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/bin/liveview-run b/bin/liveview-run
@@ -16,7 +16,8 @@ program.Command.prototype.unknownOption = function(){};
 
 // usage
 
-program.usage('run [options]');
+program
+  .usage('run [options]');
 
 // examples
 

diff --git a/bin/liveview-server b/bin/liveview-server
@@ -13,7 +13,8 @@ program
 program
   .option('-p, --project-dir [path]', 'path to project')
   .option('-d, --daemonize', 'server as background daemon')
-  .option('--no-colors', 'disable cli coloring');
+  .option('--no-colors', 'disable cli coloring')
+  .option('--platform [platform]', 'build platform *required for alloy compiles');
 
 // sub-command help
 

diff --git a/hook/lvhook.js b/hook/lvhook.js
@@ -194,8 +194,8 @@ exports.init = function(logger, config, cli) {
 			var cmdOpts = [
 				binDIR,
 				'start',
-				'--project-dir',
-				cli.argv['project-dir']
+				'--project-dir', cli.argv['project-dir'],
+				'--platform', cli.argv['platform']
 			];
 
 			if (!cli.argv.colors) { cmdOpts.push('--no-colors'); }

diff --git a/lib/fserver.js b/lib/fserver.js
@@ -107,7 +107,9 @@ FServer.stop = function (env) {
  */
 
 FServer.start = function(opts) {
+
 	opts = opts || {};
+	debug('Liveview File Server Opts', opts);
 
 	debug('Running PIDS:', FServer.pids());
 	console.log('[LiveView]'.green, 'version', pkgConf.version);
@@ -126,6 +128,7 @@ FServer.start = function(opts) {
 	var ALLOY_DIR = join(PROJECT_DIR, 'app');
 	var isBuilding = false;
 	var fileCount = {};
+	var PLATFORM = opts.platform;
 
 	if (!fs.existsSync(RESOURCE_DIR) || !fs.existsSync(join(PROJECT_DIR, 'tiapp.xml'))) {
 		console.error('[LiveView]'.red, 'Project directory "' + PROJECT_DIR + '" is not a valid Titanium project.\n');
@@ -288,8 +291,8 @@ FServer.start = function(opts) {
 		alloyWatcher.on('change', function (file) {
 			if (isBuilding) { return console.log('[LiveView]'.green, 'File changes ignored while Alloy compiling')}
 			isBuilding = true;
-			console.log('[LiveView]'.green, 'Alloy recompile initiated');
-			exec('alloy compile', {silent: true}, function (code, error) {
+			console.log('[LiveView]'.green, 'Alloy recompile initiated for', PLATFORM);
+			exec('alloy compile --config platform=' + PLATFORM, {silent: true}, function (code, error) {
 				isBuilding = false;
 				if(code) { return	console.error('[LiveView]'.red, error); }
 				evtServer.emit('change', file);