diff -r 4b66390442fd -r 4cd0f8c936ed server/src/gulpfile.js --- a/server/src/gulpfile.js Mon Oct 17 19:51:14 2016 +0530 +++ b/server/src/gulpfile.js Mon Oct 17 18:07:53 2016 +0200 @@ -1,33 +1,33 @@ -var gulp = require('gulp'), - elixir = require('laravel-elixir') - del = require('del'); - +var gulp = require('gulp'); +var elixir = require('laravel-elixir'); +var del = require('del'); +var seq = require('run-sequence'); +var minimist = require('minimist'); var exec = require('child_process').execSync; -/* - |-------------------------------------------------------------------------- - | Elixir Asset Management - |-------------------------------------------------------------------------- - | - | Elixir provides a clean, fluent API for defining some basic Gulp tasks - | for your Laravel application. By default, we are compiling the Less - | file for our application, as well as publishing vendor resources. - | - */ + +var options = minimist(process.argv.slice(2)); - var paths = { +var buildOption = "--prod"; +if(options.prod) { + buildOption = "--prod"; +} else if(options.dev) { + buildOption = "--dev"; +} + + +var paths = { 'bower_base_path': './vendor/bower_components/', 'bootstrap': './vendor/bower_components/bootstrap-sass/assets/' }; gulp.task('build-ember', function(cb) { - exec('node_modules/.bin/ember build -prod', { + exec('node_modules/.bin/ember build '+buildOption, { cwd: '../bo_client', stdio:[0,1,2] }); }); - gulp.task('copy-bo-ember', function() { gulp.src('../bo_client/dist/assets/*.js') .pipe(gulp.dest('public/js/vendor/')); @@ -40,12 +40,12 @@ }); -gulp.task('copy-to-build', function() { - del(['../../build/root'], {force: true}, function(err, files) { +gulp.task('do-copy-to-build', function() { + del(['../../build/root/var/www/corpusdelaparole/corpus-back/**/*'], {force: true}, function(err, files) { if(err) { return; } - gulp.src(['**/*','!vendor', '!vendor/**', '!node_modules', /*'!public/corpus-app', '!public/corpus-app/**',*/ '!node_modules/**', '!.env', '!.git*']) + 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/')) }); }); @@ -59,3 +59,8 @@ .task('build-ember') .task('copy-bo-ember'); }); + +gulp.task('copy-build', function(cb) { + return seq('default', 'do-copy-to-build', cb); +}); +