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

[WIP] GH-407: supports autormatic provisioning in Xcode 10 #504

Closed
wants to merge 3 commits into from
Closed

[WIP] GH-407: supports autormatic provisioning in Xcode 10 #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e81a02
select appropriate provisioning file to exportArchive in build.js whe…
knaito-asial Jan 25, 2019
46681b0
provisoning priority is corrected
knaito-asial Jan 25, 2019
1f4d579
skip Xcode managed provisioning and distinguish develop/release provi…
knaito-asial Jan 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 100 additions & 36 deletions bin/templates/scripts/cordova/lib/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ var util = require('util');

var check_reqs = require('./check_reqs');
var projectFile = require('./projectFile');
var pv = require('./provisioning');

var events = require('cordova-common').events;

Expand Down Expand Up @@ -231,54 +232,117 @@ module.exports.run = function (buildOpts) {
return;
}

var project = createProjectObject(projectPath, projectName);
var bundleIdentifier = getBundleIdentifier(project);
var exportOptions = { 'compileBitcode': false, 'method': 'development' };
const project = createProjectObject(projectPath, projectName);
const bundleIdentifier = getBundleIdentifier(project);
const exportOptions = { 'compileBitcode': false, 'method': 'development' };

if (buildOpts.packageType) {
exportOptions.method = buildOpts.packageType;
}
const promise = buildOpts.automaticProvisioning ? pv.findValidProvisioingsPromise().then((validProvs) => {
return validProvs.sort((a, b) => {
if (a.bundleId.length > b.bundleId.length) {
return -1;
} else if (a.bundleId.length < b.bundleId.length) {
return +1;
}
if (a.creationDateMilli > b.creationDateMilli) {
return -1;
} else if (a.creationDateMilli < b.creationDateMilli) {
return +1;
}
return 0;
});
}).then((validProvs) => {
return pv.findPluggedDevicesPromise().then((pluggedDevices) => {
const pluggedDevice = pluggedDevices.find((device) => true);
return validProvs.filter((prov) => {
if (prov.isXcodeManaged) {
return false;
}
if (!buildOpts.release && prov.type !== 'development') {
return false;
}
if (buildOpts.release && prov.type === 'development') {
return false;
}
if (prov.teamId !== buildOpts.developmentTeam) {
return false;
}
if (pluggedDevice) {
const provisionedDevices = prov.provisionedDevices;
if (!provisionedDevices || !prov.provisionedDevices.includes(pluggedDevice)) {
return false;
}
}
const bundleId = prov.bundleId;
if (bundleId === bundleIdentifier) {
return true;
}
if (bundleId.slice(-1) === '*') {
const prefix = bundleId.slice(0, -1);
if (prefix === 0 || bundleIdentifier.indexOf(prefix) === 0) {
return true;
}
}
});
});
}) : Promise.resolve(null);

return promise.then((pvList) => {
if (pvList) {
if (pvList.length > 0) {
const uuid = pvList[0].UUID;
events.emit('verbose', 'Extract Package by using ProvisioningProfile:' + uuid);
buildOpts.provisioningProfile = uuid;
buildOpts.automaticProvisioning = '';
} else {
events.emit('warn', 'Failed to Select ProvisioningProfile');
}
}

if (buildOpts.iCloudContainerEnvironment) {
exportOptions.iCloudContainerEnvironment = buildOpts.iCloudContainerEnvironment;
}
if (buildOpts.packageType) {
exportOptions.method = buildOpts.packageType;
}

if (buildOpts.developmentTeam) {
exportOptions.teamID = buildOpts.developmentTeam;
}
if (buildOpts.iCloudContainerEnvironment) {
exportOptions.iCloudContainerEnvironment = buildOpts.iCloudContainerEnvironment;
}

if (buildOpts.provisioningProfile && bundleIdentifier) {
exportOptions.provisioningProfiles = { [ bundleIdentifier ]: String(buildOpts.provisioningProfile) };
exportOptions.signingStyle = 'manual';
}
if (buildOpts.developmentTeam) {
exportOptions.teamID = buildOpts.developmentTeam;
}

if (buildOpts.codeSignIdentity) {
exportOptions.signingCertificate = buildOpts.codeSignIdentity;
}
if (buildOpts.provisioningProfile && bundleIdentifier) {
exportOptions.provisioningProfiles = { [ bundleIdentifier ]: String(buildOpts.provisioningProfile) };
exportOptions.signingStyle = 'manual';
}

var exportOptionsPlist = plist.build(exportOptions);
var exportOptionsPath = path.join(projectPath, 'exportOptions.plist');
if (buildOpts.codeSignIdentity) {
exportOptions.signingCertificate = buildOpts.codeSignIdentity;
}

var buildOutputDir = path.join(projectPath, 'build', 'device');
var exportOptionsPlist = plist.build(exportOptions);
var exportOptionsPath = path.join(projectPath, 'exportOptions.plist');

function checkSystemRuby () {
var ruby_cmd = shell.which('ruby');
var buildOutputDir = path.join(projectPath, 'build', 'device');

if (ruby_cmd !== '/usr/bin/ruby') {
events.emit('warn', 'Non-system Ruby in use. This may cause packaging to fail.\n' +
'If you use RVM, please run `rvm use system`.\n' +
'If you use chruby, please run `chruby system`.');
function checkSystemRuby () {
var ruby_cmd = shell.which('ruby');

if (ruby_cmd !== '/usr/bin/ruby') {
events.emit('warn', 'Non-system Ruby in use. This may cause packaging to fail.\n' +
'If you use RVM, please run `rvm use system`.\n' +
'If you use chruby, please run `chruby system`.');
}
}
}

function packageArchive () {
var xcodearchiveArgs = getXcodeArchiveArgs(projectName, projectPath, buildOutputDir, exportOptionsPath, buildOpts.automaticProvisioning);
return superspawn.spawn('xcodebuild', xcodearchiveArgs, { cwd: projectPath, printCommand: true, stdio: 'inherit' });
}
function packageArchive () {
var xcodearchiveArgs = getXcodeArchiveArgs(projectName, projectPath, buildOutputDir, exportOptionsPath, buildOpts.automaticProvisioning);
return superspawn.spawn('xcodebuild', xcodearchiveArgs, { cwd: projectPath, printCommand: true, stdio: 'inherit' });
}

return Q.nfcall(fs.writeFile, exportOptionsPath, exportOptionsPlist, 'utf-8')
.then(checkSystemRuby)
.then(packageArchive);
return Q.nfcall(fs.writeFile, exportOptionsPath, exportOptionsPlist, 'utf-8')
.then(checkSystemRuby)
.then(packageArchive);
});
});
};

Expand Down
Loading