summaryrefslogtreecommitdiff
path: root/js/bin/HttpServer.js
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-12-16 11:00:45 -0500
committerJoe George <joe@zeroc.com>2016-12-21 10:46:34 -0500
commitdbf8fb5053d9a3ace17e319379c5e29dd8158738 (patch)
treede526af8eeccf15c0ed367504c4b626db1f0d2ef /js/bin/HttpServer.js
parentAdded support for running browser test with WebWorkers (diff)
downloadice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.tar.bz2
ice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.tar.xz
ice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.zip
Replaced USE_BIN_DIST with ICE_BIN_DIST
ICE_BIN_DIST is a list of binary distributions to build against
Diffstat (limited to 'js/bin/HttpServer.js')
-rw-r--r--js/bin/HttpServer.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js
index 9fb42a0dd57..307dc598ebd 100644
--- a/js/bin/HttpServer.js
+++ b/js/bin/HttpServer.js
@@ -200,7 +200,11 @@ function Init()
var iceLibMap = libraryMaps.indexOf(req.url.pathname) !== -1;
var basePath;
- if(process.env.USE_BIN_DIST == "yes" && (iceLib || iceLibMap))
+ function checkIceBinDist(dist) = {
+ return dist == "js" || dist == "all"
+ }
+ var useBinDist = (process.env.ICE_BIN_DIST || "").split(" ").find(checkBinDist) !== undefined;
+ if(useBinDist && (iceLib || iceLibMap))
{
basePath = path.resolve(path.join(require.resolve("ice"), "..", ".."));
}