diff -r 07239de796bb -r e756a8c72c3d server/src/gulpfile.js --- a/server/src/gulpfile.js Tue Jul 11 09:49:26 2017 +0200 +++ b/server/src/gulpfile.js Fri Sep 08 12:04:06 2017 +0200 @@ -3,6 +3,7 @@ var del = require('del'); var seq = require('run-sequence'); var minimist = require('minimist'); +var util = require("gulp-util"); var exec = require('child_process').execSync; @@ -41,17 +42,17 @@ }); gulp.task('do-copy-to-build', function() { - del(['../../build/root/var/www/corpusdelaparole/corpus-back/**/*'], {force: true}, function(err, files) { - if(err) { - return; - } + del(['../../build/root/var/www/corpusdelaparole/corpus-back/**/*'], {force: true}).then(function(files) { gulp.src(['**/*','!vendor', '!vendor/**', '!node_modules', /*'!public/corpus-app', '!public/corpus-app/**',*/ '!node_modules/**', '!.env', '!.git*', '!bootstrap/cache/**']) .pipe(gulp.dest('../../build/root/var/www/corpusdelaparole/corpus-back/')) + .on("finish", function() { + util.log("corpus-back files copied"); + }); }); }); elixir(function(mix) { - mix.sass('app.scss', 'public/css/app.css', {includePaths: [paths['bootstrap']+'stylesheets/']}) + mix.sass('app.scss', 'public/css/app.css', null, {includePaths: [paths['bootstrap']+'stylesheets/']}) .scripts(['sparqlclient.js'], 'public/js/sparqlclient.js') .copy('resources/assets/sass/img', 'public/css/img') .copy(paths.bootstrap + 'fonts/bootstrap', 'public/fonts')