Merge pull request #7791 from cb1kenobi/timob-20489_5_2_X

[TIMOB-20489] (5_2_X) Added support for a 'Resource' dir for iOS modules that…
tidev · Mar 3, 2016 · 1d07a55 · 1d07a55
2 parents fa6abf7 + b983659
commit 1d07a55
Show file tree

Hide file tree

Showing 8 changed files with 239 additions and 283 deletions.
diff --git a/cli/commands/build.js b/cli/commands/build.js
@@ -36,14 +36,16 @@ exports.title = __('Build');
 exports.desc = __('builds a project');
 exports.extendedDesc = __('Builds an existing app or module project.');
 
-exports.config = function (logger, config, cli) {
+exports.config = function config(logger, config, cli) {
 	fields.setup({ colors: cli.argv.colors });
 
 	// start patching the logger here
 	patchLogger(logger, cli);
 
 	return function (finished) {
 		cli.createHook('build.config', function (callback) {
+			// note: it's currently impossible for the module build to declare any
+			// config options/flags.
 			ti.platformOptions(logger, config, cli, 'build', function (platformConf) {
 				var conf = {
 					flags: {
@@ -229,7 +231,7 @@ exports.config = function (logger, config, cli) {
 	};
 };
 
-exports.validate = function (logger, config, cli) {
+exports.validate = function validate(logger, config, cli) {
 	// Determine if the project is an app or a module, run appropriate build command
 	if (cli.argv.type === 'module') {
 
@@ -275,9 +277,8 @@ exports.validate = function (logger, config, cli) {
 	}
 };
 
-exports.run = function (logger, config, cli, finished) {
-
-	var buildFile = (cli.argv.type === 'module') ? '_buildModule.js' :'_build.js',
+exports.run = function run(logger, config, cli, finished) {
+	var buildFile = cli.argv.type === 'module' ? '_buildModule.js' :'_build.js',
 		platform = ti.resolvePlatform(cli.argv.platform),
 		buildModule = path.join(__dirname, '..', '..', platform, 'cli', 'commands', buildFile),
 		counter = 0;

diff --git a/iphone/cli/commands/_build.js b/iphone/cli/commands/_build.js
@@ -2094,7 +2094,7 @@ iOSBuilder.prototype.initialize = function initialize() {
 	this.xcodeTarget   = /^device|simulator$/.test(this.target) ? 'Debug' : 'Release';
 	this.xcodeTargetOS = this.target === 'simulator' ? 'iphonesimulator' : 'iphoneos';
 
-	this.iosBuildDir            = path.join(this.buildDir, 'build', 'Products', this.xcodeTarget + '-' + (this.target === 'simulator' ? 'iphonesimulator' : 'iphoneos'));
+	this.iosBuildDir            = path.join(this.buildDir, 'build', 'Products', this.xcodeTarget + '-' + this.xcodeTargetOS);
 	this.xcodeAppDir            = path.join(this.iosBuildDir, this.tiapp.name + '.app');
 	this.xcodeProjectConfigFile = path.join(this.buildDir, 'project.xcconfig');
 	this.buildAssetsDir         = path.join(this.buildDir, 'assets');
@@ -4291,6 +4291,7 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
 		walk(path.join(module.modulePath, 'assets'), path.join(this.xcodeAppDir, 'modules', module.id.toLowerCase()));
 		walk(path.join(module.modulePath, 'platform', 'iphone'), this.buildDir);
 		walk(path.join(module.modulePath, 'platform', 'ios'), this.buildDir);
+		walk(path.join(module.modulePath, 'Resources'), this.xcodeAppDir);
 	}, this);
 
 	this.logger.info(__('Analyzing localized launch images'));