Merge pull request #3571 from cb1kenobi/timob-12001_3_0_X

[TIMOB-12001] Fixed forking of build commands for projects where the tia...
tidev · Dec 11, 2012 · 06c03bd · 06c03bd
2 parents b73f165 + 694f557
commit 06c03bd
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 13 deletions.
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
@@ -202,7 +202,7 @@ exports.validate = function (logger, config, cli) {
 		i;
 
 	ti.validateProjectDir(logger, cli, cli.argv, 'project-dir');
-	if (!ti.validateCorrectSDK(logger, config, cli)) {
+	if (!ti.validateCorrectSDK(logger, config, cli, 'build')) {
 		// we're running the build command for the wrong SDK version, gracefully return
 		return false;
 	}

diff --git a/iphone/cli/commands/_build.js b/iphone/cli/commands/_build.js
@@ -352,7 +352,7 @@ exports.validate = function (logger, config, cli) {
 
 	ti.validateProjectDir(logger, cli, cli.argv, 'project-dir');
 
-	if (!ti.validateCorrectSDK(logger, config, cli)) {
+	if (!ti.validateCorrectSDK(logger, config, cli, 'build')) {
 		// we're running the build command for the wrong SDK version, gracefully return
 		return false;
 	}

diff --git a/mobileweb/cli/commands/_build.js b/mobileweb/cli/commands/_build.js
@@ -55,7 +55,7 @@ exports.config = function (logger, config, cli) {
 
 exports.validate = function (logger, config, cli) {
 	ti.validateProjectDir(logger, cli, cli.argv, 'project-dir');
-	if (!ti.validateCorrectSDK(logger, config, cli)) {
+	if (!ti.validateCorrectSDK(logger, config, cli, 'build')) {
 		// we're running the build command for the wrong SDK version, gracefully return
 		return false;
 	}

diff --git a/support/node_modules/titanium-sdk/lib/titanium.js b/support/node_modules/titanium-sdk/lib/titanium.js