Merge pull request #6585 from skypanther/TIMOB-18399

[TIMOB-18399] Windows: Projects can not be deleted if it's built once
tidev · Jan 30, 2015 · 638f678 · 638f678
2 parents 2c8f6fb + 6d34f0f
commit 638f678
Showing 1 changed file with 24 additions and 12 deletions.
diff --git a/cli/commands/build.js b/cli/commands/build.js
@@ -257,9 +257,11 @@ exports.run = function (logger, config, cli, finished) {
 					logger.error(msg);
 				});
 				logger.log();
+				logger.log.end();
 				process.exit(1);
 			} else {
 				logger.info(__('Project built successfully in %s', delta.cyan) + '\n');
+				logger.log.end();
 			}
 
 			finished();
@@ -306,16 +308,18 @@ function patchLogger(logger, cli) {
 		// add [INFO] type prefixes for each line
 		prefix = (args[0] != '_') ? '[' + args[0].toUpperCase() + ']' + ((args[0].length===5) ? '  ' : '   ') : '';
 
-		if (logger.log.filestream) {
-			if (logger.log.buffer) {
-				logger.log.filestream.write(logger.log.buffer);
-				logger.log.buffer = null;
-			}
+		if(logger.fileWriteEnabled) {
+			if (logger.log.filestream) {
+				if (logger.log.buffer) {
+					logger.log.filestream.write(logger.log.buffer);
+					logger.log.buffer = null;
+				}
 
-			// log it to our log file, stripping out the color codes
-			logger.log.filestream.write('\n' + prefix + (args.length > 2 ? sprintf.apply(null, args.slice(1)) : args[1]).replace(/\x1B\[\d+m/g, ''));
-		} else {
-			logger.log.buffer += '\n' + prefix + args[1].replace(/\x1B\[\d+m/g, '');
+				// log it to our log file, stripping out the color codes
+				logger.log.filestream.write('\n' + prefix + (args.length > 2 ? sprintf.apply(null, args.slice(1)) : args[1]).replace(/\x1B\[\d+m/g, ''));
+			} else {
+				logger.log.buffer += '\n' + prefix + args[1].replace(/\x1B\[\d+m/g, '');
+			}
 		}
 
 		// call the original logger with our cleaned up args
@@ -329,10 +333,12 @@ function patchLogger(logger, cli) {
 		var platform = ti.resolvePlatform(cli.argv.platform),
 			buildDir = path.join(cli.argv['project-dir'], 'build');
 
-		fs.existsSync(buildDir) || wrench.mkdirSyncRecursive(buildDir);
+		logger.fileWriteEnabled = true;
+
+		fs.existsSync(buildDir) || wrench.mkdirSyncRecursive(buildDir, 0666);
 
 		// create our write stream
-		logger.log.filestream = fs.createWriteStream(path.join(buildDir, 'build_' + platform + '.log'), { 'flags': 'w', 'encoding': 'ascii' });
+		logger.log.filestream = fs.createWriteStream(path.join(buildDir, 'build_' + platform + '.log'), { 'flags': 'w', 'encoding': 'ascii', 'mode': 0666 });
 
 		function styleHeading(s) {
 			return ('' + s).bold;
@@ -380,11 +386,17 @@ function patchLogger(logger, cli) {
 	};
 
 	logger.log.flush = function () {
-		if (logger.log.filestream && logger.log.buffer) {
+		if (logger.log.filestream && logger.log.buffer && logger.fileWriteEnabled) {
 			logger.log.filestream.write(logger.log.buffer);
 			logger.log.buffer = null;
+			logger.log.filestream.end();
 		}
 	};
 
+	logger.log.end = function() {
+		logger.log.filestream && logger.log.filestream.end();
+		logger.fileWriteEnabled = false;
+	}
+
 	logger.log.buffer = '';
 }