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-18088] Updated to ioslib 0.2.11 which includes support for iOS de... #6399

Merged
merged 1 commit into from
Nov 25, 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 18 additions & 2 deletions iphone/cli/commands/_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2829,12 +2829,28 @@ iOSBuilder.prototype.invokeXcodeBuild = function invokeXcodeBuild(next) {
xcodeArgs.push('CODE_SIGN_ENTITLEMENTS=Entitlements.plist');
}

var keychains = this.iosInfo.certs.keychains;

if (this.target === 'device') {
xcodeArgs.push('CODE_SIGN_IDENTITY=iPhone Developer: ' + this.certDeveloperName);
Object.keys(keychains).some(function (keychain) {
return (keychains[keychain].developer || []).some(function (d) {
if (!d.invalid && d.name === this.certDeveloperName) {
xcodeArgs.push('CODE_SIGN_IDENTITY=' + d.fullname);
return true;
}
}, this);
}, this);
}

if (/dist-appstore|dist\-adhoc/.test(this.target)) {
xcodeArgs.push('CODE_SIGN_IDENTITY=iPhone Distribution: ' + this.certDistributionName);
Object.keys(keychains).some(function (keychain) {
return (keychains[keychain].developer || []).some(function (d) {
if (!d.invalid && d.name === this.certDistributionName) {
xcodeArgs.push('CODE_SIGN_IDENTITY=' + d.fullname);
return true;
}
}, this);
}, this);
}

var xcodebuildHook = this.cli.createHook('build.ios.xcodebuild', this, function (exe, args, opts, done) {
Expand Down
7 changes: 7 additions & 0 deletions node_modules/ioslib/README.md

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

13 changes: 10 additions & 3 deletions node_modules/ioslib/index.js

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

20 changes: 20 additions & 0 deletions node_modules/ioslib/lib/certs.js

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

4 changes: 2 additions & 2 deletions node_modules/ioslib/lib/device.js

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

2 changes: 1 addition & 1 deletion node_modules/ioslib/lib/env.js

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

2 changes: 0 additions & 2 deletions node_modules/ioslib/lib/simulator.js

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

20 changes: 15 additions & 5 deletions node_modules/ioslib/node_modules/node-ios-device/package.json

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

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

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

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