Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-15 18:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-05-23 18:00:52 -06:00
parent 90da6d889d b2cef4846c
commit cd1f0ddc79
73 changed files with 2688 additions and 11305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/meta/build.js
View File

@@ -2,7 +2,6 @@
var async = require('async');
var winston = require('winston');
var os = require('os');
var nconf = require('nconf');
var padstart = require('lodash.padstart');
@@ -183,11 +182,14 @@ function build(targets, callback) {
var startTime;
var totalTime;
async.series([
async.apply(beforeBuild, targets),
function (next) {
beforeBuild(targets, next);
},
function (next) {
var parallel = os.cpus().length > 1 && !nconf.get('series');
var threads = parseInt(nconf.get('threads'), 10);
if (threads) {
require('./minifier').maxThreads = threads - 1;
}
var parallel = !nconf.get('series');
if (parallel) {
winston.info('[build] Building in parallel mode');
} else {