IGNITE-3319 Fixed build.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aee2a5c5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aee2a5c5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aee2a5c5 Branch: refs/heads/ignite-3262 Commit: aee2a5c52533d1618ae2b6a3681b374c3568ab04 Parents: 598c72b Author: Andrey Novikov <[email protected]> Authored: Tue Jun 28 09:07:58 2016 +0700 Committer: Andrey Novikov <[email protected]> Committed: Tue Jun 28 09:07:58 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/gulpfile.babel.js/tasks/build.js | 2 +- .../src/main/js/gulpfile.babel.js/tasks/copy.js | 14 +++----------- .../src/main/js/gulpfile.babel.js/tasks/watch.js | 6 +++--- 3 files changed, 7 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/aee2a5c5/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js index cc95e04..7d7401b 100644 --- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js +++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js @@ -18,4 +18,4 @@ import gulp from 'gulp'; import sequence from 'gulp-sequence'; -gulp.task('build', (cb) => sequence(['clean', 'clean:ignite-modules-temp'], 'ignite:modules', ['copy', 'jade'], 'bundle', cb)); +gulp.task('build', (cb) => sequence(['clean', 'clean:ignite-modules-temp'], 'ignite:modules', ['copy:resource', 'jade'], 'bundle', cb)); http://git-wip-us.apache.org/repos/asf/ignite/blob/aee2a5c5/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js index 18bd35a..f274921 100644 --- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js +++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js @@ -20,22 +20,14 @@ import sequence from 'gulp-sequence'; import { destDir, rootDir, jsModulePaths, resourcePaths, resourceModulePaths, igniteModulesTemp } from '../paths'; -gulp.task('copy', (cb) => { - const tasks = ['copy:resource', 'copy:ignite_modules:js', 'copy:ignite_modules:resource']; +gulp.task('copy:resource', (cb) => sequence('copy:resource:app', 'copy:resource:ignite_modules', cb)); - return sequence(tasks, cb); -}); - -gulp.task('copy:resource', () => +gulp.task('copy:resource:app', () => gulp.src(resourcePaths) .pipe(gulp.dest(destDir)) ); -gulp.task('copy:ignite_modules:js', () => - gulp.src(jsModulePaths).pipe(gulp.dest(igniteModulesTemp)) -); - -gulp.task('copy:ignite_modules:resource', () => +gulp.task('copy:resource:ignite_modules', () => gulp.src(resourceModulePaths) .pipe(gulp.dest(`${destDir}/ignite_modules`)) ); http://git-wip-us.apache.org/repos/asf/ignite/blob/aee2a5c5/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js index f708e67..8fce2c4 100644 --- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js +++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js @@ -20,12 +20,12 @@ import sequence from 'gulp-sequence'; import { jadePaths, jadeModulePaths, resourcePaths, resourceModulePaths, appPaths, appModulePaths } from '../paths'; -gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', 'copy:ignite_modules:js', cb)); +gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', cb)); // Build + watch task. gulp.task('watch', ['build'], () => { gulp.watch(jadePaths.concat(jadeModulePaths), ['jade']); - gulp.watch(resourcePaths, ['copy:resource']); - gulp.watch(resourceModulePaths, ['copy:ignite_modules:resource']); + gulp.watch(resourcePaths, ['copy:resource:app']); + gulp.watch(resourceModulePaths, ['copy:resource:ignite_modules']); gulp.watch(appModulePaths, ['watch:ignite-modules']); });
