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.

Sign up for GitHub

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

Jump to bottom

[TIMOB-24680] Fixed list of valid provisioning profiles for the given… #9055

Merged
merged 2 commits into from
May 31, 2017
Merged

[TIMOB-24680] Fixed list of valid provisioning profiles for the given… #9055

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a24726a
[TIMOB-24680] Fixed list of valid provisioning profiles for the given…
cb1kenobi May 11, 2017
0acc99e
Merge branch 'master' into timob-24680
May 31, 2017
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
43 changes: 22 additions & 21 deletions iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,26 @@ iOSBuilder.prototype.initTiappSettings = function initTiappSettings() {
.shift();
var globalBuildSettings = ext.objs.XCBuildConfiguration[globalCfgId].buildSettings;

// check that the PP UUID is correct
var pps = [];
if (cli.argv.target === 'device') {
pps = this.iosInfo.provisioning.development;
} else if (cli.argv.target === 'dist-appstore') {
pps = this.iosInfo.provisioning.distribution;
} else if (cli.argv.target === 'dist-adhoc') {
pps = [].concat(this.iosInfo.provisioning.adhoc, this.iosInfo.provisioning.enterprise).filter(function (p) { return p; });
}

function getPPbyUUID(ppuuid) {
return pps
.filter(function (p) {
if (!p.expired && !p.managed && p.uuid === ppuuid) {
return true;
}
})
.shift();
}

// find our targets
ext.project.targets.forEach(function (t) {
var targetName = t.comment;
Expand Down Expand Up @@ -1575,28 +1595,9 @@ iOSBuilder.prototype.initTiappSettings = function initTiappSettings() {
}
}

// check that the PP UUID is correct
// find the selected provisioning profile
var ppuuid = tiappTargets[targetName].ppUUIDs[cli.argv.target];
var pps = [];
var pp;

function getPPbyUUID() {
return pps
.filter(function (p) {
if (!p.expired && !p.managed && p.uuid === ppuuid) {
return true;
}
})
.shift();
}

if (cli.argv.target === 'device') {
pps = this.iosInfo.provisioning.development;
pp = getPPbyUUID();
} else if (cli.argv.target === 'dist-appstore' || cli.argv.target === 'dist-adhoc') {
pps = [].concat(this.iosInfo.provisioning.distribution, this.iosInfo.provisioning.adhoc);
pp = getPPbyUUID();
}
var pp = getPPbyUUID(ppuuid);

if (!pp) {
logger.error(__('iOS extension "%s" target "%s" has invalid provisioning profile UUID in tiapp.xml.', projectName, targetName));
Expand Down