Permalink
Browse files

Merge pull request #3729 from cb1kenobi/timob-11919

[TIMOB-11919] Added support for the new Titanium module conflict detecti...
  • Loading branch information...
2 parents a508477 + 7ac1559 commit 7306c46b42ed14efa2bd8785b5820a1a615421e8 Bryan Hughes committed Jan 19, 2013
Showing with 18 additions and 0 deletions.
  1. +9 −0 iphone/cli/commands/_build.js
  2. +9 −0 mobileweb/cli/commands/_build.js
@@ -1530,6 +1530,15 @@ build.prototype = {
process.exit(1);
}
+ if (modules.conflict.length) {
+ this.logger.error(__('Found conflicting Titanium modules:'));
+ modules.conflict.forEach(function (m) {
+ this.logger.error(' ' + __('Titanium module "%s" requested for both iOS and CommonJS platforms, but only one may be used at a time.', m.id));
+ }, this);
+ this.logger.log();
+ process.exit(1);
+ }
+
this.modules = modules.found;
modules.found.forEach(function (module) {
@@ -354,6 +354,15 @@ build.prototype = {
process.exit(1);
}
+ if (modules.conflict.length) {
+ this.logger.error(__('Found conflicting Titanium modules:'));
+ modules.conflict.forEach(function (m) {
+ this.logger.error(' ' + __('Titanium module "%s" requested for both Mobile Web and CommonJS platforms, but only one may be used at a time.', m.id));
+ }, this);
+ this.logger.log();
+ process.exit(1);
+ }
+
modules.found.forEach(function (module) {
var moduleDir = module.modulePath,
pkgJson,

0 comments on commit 7306c46

Please sign in to comment.