From d432e7178ae472e7b8db4d70b4fde04332a4aebf Mon Sep 17 00:00:00 2001 From: Chris Barber Date: Thu, 1 Oct 2015 17:55:00 -0500 Subject: [PATCH] [TIMOB-19658] Removed the JDK 1.6 requirement and wired up the new titanium_prep. --- android/cli/commands/_build.js | 14 ++++---------- iphone/cli/commands/_build.js | 1 + support/android/titanium_prep.macos | Bin 12824 -> 13532 bytes support/android/titanium_prep.macos.jdk16 | Bin 0 -> 12792 bytes 4 files changed, 5 insertions(+), 10 deletions(-) create mode 100755 support/android/titanium_prep.macos.jdk16 diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js index 58da64f64a9..36a6ac5345f 100644 --- a/android/cli/commands/_build.js +++ b/android/cli/commands/_build.js @@ -177,15 +177,6 @@ AndroidBuilder.prototype.config = function config(logger, config, cli) { process.exit(1); } - // on OS X, we need JDK 1.6 for titanium_prep - if (process.platform === 'darwin' && !Object.keys(jdkInfo.jdks).some(function (ver) { return appc.version.satisfies(jdkInfo.jdks[ver].version, '1.6.x'); })) { - logger.error(__('Titanium requires JDK 1.6 when building on Mac OS X.')); - logger.error(__('You can download it from %s', 'http://appcelerator.com/jdk-osx')); - logger.error(__('If you still see this message, then you may need to set the JAVA_HOME to help Titanium locate the JDK.')); - logger.error(__('To see which JDKs Titanium finds, run "ti info --types jdk --output json".') + '\n'); - process.exit(1); - } - _t.jdkInfo = jdkInfo; next(); }); @@ -894,7 +885,7 @@ AndroidBuilder.prototype.validate = function validate(logger, config, cli) { cli.tiapp.properties['ti.deploytype'] = { type: 'string', value: this.deployType }; // get the javac params - this.javacMaxMemory = cli.tiapp.properties['android.javac.maxmemory'] && cli.tiapp.properties['android.javac.maxmemory'].value || config.get('android.javac.maxMemory', '256M'); + this.javacMaxMemory = cli.tiapp.properties['android.javac.maxmemory'] && cli.tiapp.properties['android.javac.maxmemory'].value || config.get('android.javac.maxMemory', '1024M'); this.javacSource = cli.tiapp.properties['android.javac.source'] && cli.tiapp.properties['android.javac.source'].value || config.get('android.javac.source', '1.6'); this.javacTarget = cli.tiapp.properties['android.javac.target'] && cli.tiapp.properties['android.javac.target'].value || config.get('android.javac.target', '1.6'); this.dxMaxMemory = cli.tiapp.properties['android.dx.maxmemory'] && cli.tiapp.properties['android.dx.maxmemory'].value || config.get('android.dx.maxMemory', '1024M'); @@ -2634,6 +2625,9 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) { var titaniumPrep = 'titanium_prep'; if (process.platform == 'darwin') { titaniumPrep += '.macos'; + if (appc.version.lt(this.jdkInfo.version, '1.7.0')) { + titaniumPrep += '.jdk16'; + } } else if (process.platform == 'win32') { titaniumPrep += '.win32.exe'; } else if (process.platform == 'linux') { diff --git a/iphone/cli/commands/_build.js b/iphone/cli/commands/_build.js index 30cd0660169..378ed7cc73f 100644 --- a/iphone/cli/commands/_build.js +++ b/iphone/cli/commands/_build.js @@ -4977,6 +4977,7 @@ iOSBuilder.prototype.processTiSymbols = function processTiSymbols() { } contents = contents.join('\n'); } + var infoPlist = this.infoPlist; if (Array.isArray(infoPlist.UIBackgroundModes) && infoPlist.UIBackgroundModes.indexOf('remote-notification') !== -1) { contents += '\n#define USE_TI_SILENTPUSH'; diff --git a/support/android/titanium_prep.macos b/support/android/titanium_prep.macos index 3811844ebb64e62d6d06ec40c4bbd5579b84e91f..92a91bcdeae7bb0fe28f29fe3c15ec1d7e8c791d 100755 GIT binary patch delta 4886 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 KZHYrk6aNo2bhr8d diff --git a/support/android/titanium_prep.macos.jdk16 b/support/android/titanium_prep.macos.jdk16 new file mode 100755 index 0000000000000000000000000000000000000000..9b996dcad70c9197a0a704406fd137710b15ca6b GIT binary patch literal 12792 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 wZ^s8~IM`