Merge pull request #7025 from cb1kenobi/timob-19297

[TIMOB-19297] Asset catalog support for app icons and launch images.
tidev · Aug 14, 2015 · bfa0e5c · bfa0e5c
2 parents 7d210cb + ae07798
commit bfa0e5c
Show file tree

Hide file tree

Showing 38 changed files with 849 additions and 275 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -3,7 +3,7 @@ module.exports = function (grunt) {
 	// Project configuration.
 	grunt.initConfig({
 		appcJs: {
-			src: ['Gruntfile.js', 'apidoc/**/*.js', '!apidoc/node_modules/**']
+			src: ['apidoc/**/*.js', '!apidoc/node_modules/**']
 		},
 		clangFormat: {
 			src: [] // unused ATM
@@ -37,6 +37,7 @@ module.exports = function (grunt) {
 		}
 
 		grunt.log.writeln('Removing old Node modules');
+
 		function rm(dir, ignore) {
 			fs.existsSync(dir) && fs.readdirSync(dir).forEach(function (name) {
 				var file = path.join(dir, name);

diff --git a/cli/commands/build.js b/cli/commands/build.js
@@ -309,7 +309,7 @@ exports.run = function (logger, config, cli, finished) {
 				logger.error(__('An error occurred during build after %s', delta));
 				if (err instanceof appc.exception) {
 					err.dump(logger.error);
-				} else {
+				} else if (err !== true) {
 					(err.message || err.toString()).trim().split('\n').forEach(function (msg) {
 						logger.error(msg);
 					});