diff options
author | Jose <jose@zeroc.com> | 2015-01-15 11:58:20 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2015-01-15 11:58:20 +0100 |
commit | f045ecdc42994faee130035511b5aaa77f962162 (patch) | |
tree | 1bbfe601c987b1a83274decd4a65bd14367d4893 /js/gulpfile.js | |
parent | Fixed (ICE-6150) - Browser WebJS test suite footer looks bad and behaves anno... (diff) | |
download | ice-f045ecdc42994faee130035511b5aaa77f962162.tar.bz2 ice-f045ecdc42994faee130035511b5aaa77f962162.tar.xz ice-f045ecdc42994faee130035511b5aaa77f962162.zip |
Fixed (ICE-6229) - no easy way to run JS tests again against binary distribution
Diffstat (limited to 'js/gulpfile.js')
-rw-r--r-- | js/gulpfile.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js index 5add2eee9e0..dac9c6b6f7f 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -186,7 +186,14 @@ gulp.task("bower", [], bower.commands.install().on("end", function(){ cb(); }); }); -gulp.task("dist", libs.map(minLibTask)); +gulp.task("dist:libs", ["bower"], + function() + { + return gulp.src(["bower_components/zeroc-icejs/lib/*"]) + .pipe(gulp.dest("lib")); + }); + +gulp.task("dist", useBinDist ? ["dist:libs"] : libs.map(minLibTask)); gulp.task("dist:watch", libs.map(libWatchTask)); gulp.task("dist:clean", libs.map(libCleanTask)); @@ -454,7 +461,7 @@ gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test", "demo" HttpServer(); var p = require("child_process").spawn("python", ["test/Common/run.py"], {stdio: "inherit"}); - var exit = function() { p.exit(); } + function exit() { p.exit(); } process.on("SIGINT", exit); process.on("exit", exit); return gulp.src("./index.html").pipe(open("", {url: "http://127.0.0.1:8080/index.html"})); @@ -464,7 +471,7 @@ gulp.task("test:run-with-node", (useBinDist ? ["test"] : ["build"]), function() { var p = require("child_process").spawn("python", ["allTests.py", "--all"], {stdio: "inherit"}); - var exit = function() { p.exit(); } + function exit() { p.exit(); } process.on("SIGINT", exit); process.on("exit", exit); }); @@ -498,6 +505,6 @@ gulp.task("lint:js", ["build"], }); gulp.task("lint", ["lint:js", "lint:html"]); -gulp.task("build", useBinDist ? ["test", "demo"] : ["dist", "test", "demo"]); +gulp.task("build", ["dist", "test", "demo"]); gulp.task("clean", ["test:clean", "demo:clean", "common:clean"].concat(useBinDist ? [] : ["dist:clean"])); gulp.task("default", ["build"]); |