You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/03 04:14:26 UTC
[2/2] ignite git commit: IGNITE-2066 Review.
IGNITE-2066 Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8fa0895f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8fa0895f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8fa0895f
Branch: refs/heads/ignite-843-rc2
Commit: 8fa0895f808d10c1997a4f6113574fffa1bc36c8
Parents: 6886435
Author: Andrey <an...@gridgain.com>
Authored: Thu Dec 3 10:13:07 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Dec 3 10:13:07 2015 +0700
----------------------------------------------------------------------
.../src/main/js/gulpfile.js/tasks/build.js | 4 +---
.../src/main/js/gulpfile.js/tasks/bundle.js | 8 ++++----
.../src/main/js/gulpfile.js/tasks/clean.js | 1 +
.../src/main/js/gulpfile.js/tasks/connect.js | 3 +--
4 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8fa0895f/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
index acdad1d..195bdf4 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
@@ -19,7 +19,5 @@ var gulp = require('gulp');
var sequence = require('gulp-sequence');
gulp.task('build', function(cb) {
- var tasks = ['clean', ['copy', 'jade', 'sass'], 'bundle', 'inject:plugins'];
-
- sequence.apply(null, tasks)(cb)
+ return sequence('clean', ['copy', 'jade', 'sass'], 'bundle', 'inject:plugins', cb);
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/8fa0895f/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
index 9d76dbf..a21bdf8 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
@@ -33,15 +33,15 @@ var legacy_paths = [
'./helpers/generator/**/*.js'
];
-
var options = {
minify: true
};
gulp.task('bundle', function(cb) {
return sequence('bundle:ignite', 'bundle:legacy', cb);
-})
+});
+// Package all external dependencies and ignite-console
gulp.task('bundle:ignite', function() {
if (util.env.debug) {
delete options.minify;
@@ -54,17 +54,17 @@ gulp.task('bundle:ignite', function() {
return jspm.bundleSFX('app/index', 'build/app.min.js', options);
});
+// Package controllers and generators.
gulp.task('bundle:legacy', function() {
return gulp.src(legacy_paths)
.pipe(concat('all.js'))
.pipe(gulp.dest('./build'))
-})
+});
gulp.task('bundle:ignite:watch', function() {
return gulp.watch(paths, ['bundle:ignite'])
});
-
gulp.task('bundle:legacy:watch', function() {
return gulp.watch(legacy_paths, ['bundle:legacy'])
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/8fa0895f/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js
index bc90bed..86cffae 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js
@@ -18,6 +18,7 @@
var gulp = require('gulp');
var clean = require('gulp-rimraf');
+// Remove build folder.
gulp.task('clean', function() {
return gulp.src('./build', {read: false}).pipe(clean());
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/8fa0895f/modules/control-center-web/src/main/js/gulpfile.js/tasks/connect.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/connect.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/connect.js
index d05e9b6..f653975 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/connect.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/connect.js
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-// task run static server to local development
-
var gulp = require('gulp');
var connect = require('gulp-connect');
var modrewrite = require('connect-modrewrite');
@@ -31,6 +29,7 @@ var options = {
fallback: './build/index.html'
};
+// task run static server to local development
gulp.task('connect', function() {
connect.server(options);
});