embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-02-20 01:18:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:iurimatias/embark-framework into develop

Browse Source
This commit is contained in:
Iuri Matias 2016-12-02 06:51:10 -05:00
commit 910cee5431
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/index.js
View File

@ -151,7 +151,13 @@ var Embark = {
}); });
}, },
function buildPipeline(abi, callback) { function buildPipeline(abi, callback) {
var pipeline = new Pipeline({}); self.logger.trace("Building Assets");
var pipeline = new Pipeline({
buildDir: self.config.buildDir,
contractsFiles: self.config.contractsFiles,
assetFiles: self.config.assetFiles,
logger: self.logger
});
pipeline.build(abi); pipeline.build(abi);
callback(); callback();
} }
@ -227,8 +233,8 @@ var Embark = {
var self = this; var self = this;
async.waterfall([ async.waterfall([
function buildAndDeploy(callback) { function buildAndDeploy(callback) {
Embark.buildAndDeploy(function(contractsManager) { Embark.buildAndDeploy(function(err, contractsManager) {
callback(null, contractsManager); callback(err, contractsManager);
}); });
}, },
function generateABI(contractsManager, callback) { function generateABI(contractsManager, callback) {