Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-17651] Updated code to fork the correct Titanium command as soon ... #6036

Merged
merged 1 commit into from
Sep 9, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions cli/commands/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ exports.config = function (logger, config, cli) {
// make sure the tiapp.xml is sane
ti.validateTiappXml(logger, config, tiapp);

// check that the Titanium SDK version is correct
if (!ti.validateCorrectSDK(logger, config, cli, 'build')) {
throw new cli.GracefulShutdown();
}

return projectDir;
},
desc: __('the directory containing the project'),
Expand Down Expand Up @@ -181,11 +186,6 @@ exports.validate = function (logger, config, cli) {
// TODO: set the type to 'app' for now, but we'll need to determine if the project is an app or a module
cli.argv.type = 'app';

// check that the Titanium SDK version is correct
if (!ti.validateCorrectSDK(logger, config, cli, 'build')) {
return false;
}

ti.validatePlatform(logger, cli, 'platform');

// since we need validate() to be async, we return a function in which the cli
Expand Down
2 changes: 2 additions & 0 deletions iphone/cli/commands/_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2739,6 +2739,8 @@ iOSBuilder.prototype.invokeXcodeBuild = function invokeXcodeBuild(next) {
xcodeArgs.push('CODE_SIGN_IDENTITY=iPhone Distribution: ' + this.certDistributionName);
}

xcodeArgs.push('clean', 'build');

var xcodebuildHook = this.cli.createHook('build.ios.xcodebuild', this, function (exe, args, opts, done) {
var p = spawn(exe, args, opts),
out = [],
Expand Down
4 changes: 2 additions & 2 deletions node_modules/titanium-sdk/lib/titanium.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.