From 455139d03f01cbb85cebfef8efa5c5a4b828da7c Mon Sep 17 00:00:00 2001 From: pfremm Date: Fri, 13 Mar 2015 08:04:02 -0500 Subject: [PATCH 1/6] Updated to support creating just an xcarchive and not a ipa. --- tasks/xcode.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tasks/xcode.js b/tasks/xcode.js index e911883..4fc50a5 100644 --- a/tasks/xcode.js +++ b/tasks/xcode.js @@ -78,17 +78,18 @@ module.exports = function(grunt) { var options = this.options({ clean: true, - export: true, + export: false, + archive: false, project: '', configuration: '', workspace: '', scheme: '', - allTargets: true, + allTargets: false, target: '', archivePath: '', exportFormat: 'IPA', exportPath: process.cwd(), - exportFilename: 'export.ipa', + exportFilename: '', exportProvisioningProfile: '', exportSigningIdentity: '', exportInstallerIdentity: '', @@ -134,7 +135,7 @@ module.exports = function(grunt) { }); } function runArchiveCommand(){ - if(!options.export) { + if(!options.archive) { return Promise.resolve(); } From 9f89e1f236633734bf3ace8af0ffcb70c8e3898d Mon Sep 17 00:00:00 2001 From: pfremm Date: Wed, 6 May 2015 22:14:43 -0500 Subject: [PATCH 2/6] Update xcode.js Modified line 181 to only include exportWithOriginalSigningIdentity only if specified in the options object. --- tasks/xcode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/xcode.js b/tasks/xcode.js index 4fc50a5..227879b 100644 --- a/tasks/xcode.js +++ b/tasks/xcode.js @@ -178,7 +178,7 @@ module.exports = function(grunt) { if(options.exportProvisioningProfile) command.push('-exportProvisioningProfile', safelyWrap(options.exportProvisioningProfile)); if(options.exportSigningIdentity) command.push('-exportSigningIdentity', safelyWrap(options.exportSigningIdentity)); if(options.exportInstallerIdentity) command.push('-exportInstallerIdentity', safelyWrap(options.exportInstallerIdentity)); - if(!options.exportSigningIdentity) command.push('-exportWithOriginalSigningIdentity'); + if(options.exportWithOriginalSigningIdentity) command.push('-exportWithOriginalSigningIdentity'); grunt.log.write('Exporting: '); return executeCommand(command) From 54300e82bd8dd9516cb8a9dab60276b70afce224 Mon Sep 17 00:00:00 2001 From: pfremm Date: Fri, 13 Mar 2015 08:04:02 -0500 Subject: [PATCH 3/6] Updated to support creating just an xcarchive and not a ipa. --- tasks/xcode.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tasks/xcode.js b/tasks/xcode.js index ad26176..ccd96b2 100644 --- a/tasks/xcode.js +++ b/tasks/xcode.js @@ -78,17 +78,18 @@ module.exports = function(grunt) { var options = this.options({ clean: true, - export: true, + export: false, + archive: false, project: '', configuration: '', workspace: '', scheme: '', - allTargets: true, + allTargets: false, target: '', archivePath: '', exportFormat: 'IPA', exportPath: process.cwd(), - exportFilename: 'export.ipa', + exportFilename: '', exportProvisioningProfile: '', exportSigningIdentity: '', exportInstallerIdentity: '', @@ -134,7 +135,7 @@ module.exports = function(grunt) { }); } function runArchiveCommand(){ - if(!options.export) { + if(!options.archive) { return Promise.resolve(); } From 8612abe41496e1f4f55def1245bb895cbc4595ff Mon Sep 17 00:00:00 2001 From: pfremm Date: Wed, 6 May 2015 22:14:43 -0500 Subject: [PATCH 4/6] Update xcode.js Modified line 181 to only include exportWithOriginalSigningIdentity only if specified in the options object. --- tasks/xcode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/xcode.js b/tasks/xcode.js index ccd96b2..7852db4 100644 --- a/tasks/xcode.js +++ b/tasks/xcode.js @@ -178,7 +178,7 @@ module.exports = function(grunt) { if(options.exportProvisioningProfile) command.push('-exportProvisioningProfile', safelyWrap(options.exportProvisioningProfile)); if(options.exportSigningIdentity) command.push('-exportSigningIdentity', safelyWrap(options.exportSigningIdentity)); if(options.exportInstallerIdentity) command.push('-exportInstallerIdentity', safelyWrap(options.exportInstallerIdentity)); - if(!options.exportSigningIdentity) command.push('-exportWithOriginalSigningIdentity'); + if(options.exportWithOriginalSigningIdentity) command.push('-exportWithOriginalSigningIdentity'); grunt.log.write('Exporting: '); return executeCommand(command) From 0d40435c5ee4aedd9062cc935a082f16f917cd1a Mon Sep 17 00:00:00 2001 From: Bryan Pfremmer Date: Tue, 16 Feb 2016 23:26:23 -0600 Subject: [PATCH 5/6] Added option to allow you to set bitcode as an option with the default being disabled. --- tasks/xcode.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tasks/xcode.js b/tasks/xcode.js index 7852db4..1ff68a4 100644 --- a/tasks/xcode.js +++ b/tasks/xcode.js @@ -94,7 +94,8 @@ module.exports = function(grunt) { exportSigningIdentity: '', exportInstallerIdentity: '', arch: '', - sdk: '' + sdk: '', + bitcode: false }); which('xcodebuild', function(err, path){ @@ -151,6 +152,7 @@ module.exports = function(grunt) { if(options.sdk) command.push('-sdk', safelyWrap(options.sdk)); if(!options.exportSigningIdentity) command.push('CODE_SIGN_IDENTITY=""', 'CODE_SIGN_ENTITLEMENTS=""', 'CODE_SIGNING_REQUIRED=NO'); + if(!options.bitcode) command.push('ENABLE_BITCODE=NO'); if(options.target){ command.push('-target', safelyWrap(options.target)); @@ -178,7 +180,8 @@ module.exports = function(grunt) { if(options.exportProvisioningProfile) command.push('-exportProvisioningProfile', safelyWrap(options.exportProvisioningProfile)); if(options.exportSigningIdentity) command.push('-exportSigningIdentity', safelyWrap(options.exportSigningIdentity)); if(options.exportInstallerIdentity) command.push('-exportInstallerIdentity', safelyWrap(options.exportInstallerIdentity)); - if(options.exportWithOriginalSigningIdentity) command.push('-exportWithOriginalSigningIdentity'); + if(options.exportWithOriginalSigningIdentity) command.push('-exportWithOriginalSigningIdentity ENABLE_BITCODE=NO'); + if(!options.bitcode) command.push('ENABLE_BITCODE=NO'); grunt.log.write('Exporting: '); return executeCommand(command) From bac984786c6a7d9de5d1f2206abb3017a18b373f Mon Sep 17 00:00:00 2001 From: Bryan Pfremmer Date: Wed, 17 Feb 2016 09:15:08 -0600 Subject: [PATCH 6/6] Removing custom changes before submitting pull request --- tasks/xcode.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/xcode.js b/tasks/xcode.js index 1ff68a4..3a31e36 100644 --- a/tasks/xcode.js +++ b/tasks/xcode.js @@ -78,13 +78,13 @@ module.exports = function(grunt) { var options = this.options({ clean: true, - export: false, + export: true, archive: false, project: '', configuration: '', workspace: '', scheme: '', - allTargets: false, + allTargets: true, target: '', archivePath: '', exportFormat: 'IPA', @@ -180,7 +180,7 @@ module.exports = function(grunt) { if(options.exportProvisioningProfile) command.push('-exportProvisioningProfile', safelyWrap(options.exportProvisioningProfile)); if(options.exportSigningIdentity) command.push('-exportSigningIdentity', safelyWrap(options.exportSigningIdentity)); if(options.exportInstallerIdentity) command.push('-exportInstallerIdentity', safelyWrap(options.exportInstallerIdentity)); - if(options.exportWithOriginalSigningIdentity) command.push('-exportWithOriginalSigningIdentity ENABLE_BITCODE=NO'); + if(options.exportWithOriginalSigningIdentity) command.push('-exportWithOriginalSigningIdentity'); if(!options.bitcode) command.push('ENABLE_BITCODE=NO'); grunt.log.write('Exporting: ');