Merge pull request tidev#329 from appcelerator/ALOY-680

tonylukasavage · tonylukasavage · commit e745c495a05d · 2014-02-05T18:11:10.000-05:00
[ALOY-680] add DIST_ADHOC and DIST_STORE
diff --git a/Alloy/commands/compile/ast/compress.js b/Alloy/commands/compile/ast/compress.js
@@ -11,6 +11,9 @@ exports.process = function(ast, config) {
 	_.each(CONST.DEPLOY_TYPES, function(d) {
 		defines[d.key] = config.deploytype === d.value;
 	});
+	_.each(CONST.DIST_TYPES, function(d) {
+		defines[d.key] = _.contains(d.value, config.target);
+	});
 	_.each(CONST.PLATFORMS, function(p) {
 		defines['OS_' + p.toUpperCase()] = config.platform === p;
 	});
diff --git a/Alloy/common/constants.js b/Alloy/common/constants.js
@@ -71,6 +71,10 @@ exports.DEPLOY_TYPES = [
 	{ key: 'ENV_PROD', value: 'production' },
 	{ key: 'ENV_PRODUCTION', value: 'production' }
 ];
+exports.DIST_TYPES = [
+	{ key: 'DIST_ADHOC', value: ['dist-adhoc'] },
+	{ key: 'DIST_STORE', value: ['dist-appstore', 'dist-playstore'] }
+];
 
 // mappings of file extensions and folders for each file type
 exports.FILE_EXT = {
diff --git a/hooks/alloy.js b/hooks/alloy.js
@@ -18,7 +18,7 @@ exports.init = function (logger, config, cli, appc) {
 		spawn = require('child_process').spawn,
 		parallel = appc.async.parallel;
 
-	function run(deviceFamily, deployType, finished) {
+	function run(deviceFamily, deployType, target, finished) {
 		var appDir = path.join(cli.argv['project-dir'], 'app');
 		if (!afs.exists(appDir)) {
 			logger.info(__('Project not an Alloy app, continuing'));
@@ -41,7 +41,8 @@ exports.init = function (logger, config, cli, appc) {
 				version: '0',
 				simtype: 'none',
 				devicefamily: /(?:iphone|ios)/.test(cli.argv.platform) ? deviceFamily : 'none',
-				deploytype: deployType || cli.argv['deploy-type'] || 'development'
+				deploytype: deployType || cli.argv['deploy-type'] || 'development',
+				target: target
 			};
 
 		config = Object.keys(config).map(function (c) {
@@ -154,8 +155,10 @@ exports.init = function (logger, config, cli, appc) {
 	cli.addHook('build.pre.compile', function (build, finished) {
 		// TODO: Remove this workaround when the CLI reports the right deploy type for android
 		var deployType = build.deployType;
+		var target = build.target;
+
 		if (cli.argv.platform === 'android') {
-			switch(cli.argv.target) {
+			switch(target) {
 				case 'dist-playstore':
 					deployType = 'production';
 					break;
@@ -168,10 +171,10 @@ exports.init = function (logger, config, cli, appc) {
 					break;
 			}
 		}
-		run(build.deviceFamily, deployType, finished);
+		run(build.deviceFamily, deployType, target, finished);
 	});
 
 	cli.addHook('codeprocessor.pre.run', function (build, finished) {
-		run('none', 'development', finished);
+		run('none', 'development', undefined, finished);
 	});
 };
diff --git a/test/apps/testing/ALOY-680/controllers/index.js b/test/apps/testing/ALOY-680/controllers/index.js
@@ -0,0 +1,18 @@
+var deployType, dist;
+if (ENV_DEV) {
+	deployType = 'development';
+} else if (ENV_TEST) {
+	deployType = 'test';
+} else if (ENV_PROD) {
+	deployType = 'production';
+}
+
+if (DIST_ADHOC) {
+	dist = 'adhoc';
+} else if (DIST_STORE) {
+	dist = 'store';
+}
+
+$.build.text = deployType + (dist ? ':' + dist : '');
+
+$.index.open();
diff --git a/test/apps/testing/ALOY-680/styles/index.tss b/test/apps/testing/ALOY-680/styles/index.tss
@@ -0,0 +1,13 @@
+'#index': {
+	backgroundColor: '#fff',
+	fullscreen: false,
+	exitOnClose: true
+}
+
+'#build': {
+	font: {
+		fontSize: '24dp',
+		fontWeight: 'bold'
+	},
+	color: '#27ae60'
+}
diff --git a/test/apps/testing/ALOY-680/views/index.xml b/test/apps/testing/ALOY-680/views/index.xml
@@ -0,0 +1,5 @@
+<Alloy>
+	<Window>
+		<Label id="build"/>
+	</Window>
+</Alloy>
