diff options
| author | Jose <jose@zeroc.com> | 2014-12-23 19:23:52 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-23 19:23:52 +0100 |
| commit | a5acb7766b106fe966ff02a9d5e02be4b6c5dcb1 (patch) | |
| tree | 416f977407e7d7240e491cc48d9964c4cc018064 /js | |
| parent | Minor JS fix (diff) | |
| download | ice-a5acb7766b106fe966ff02a9d5e02be4b6c5dcb1.tar.bz2 ice-a5acb7766b106fe966ff02a9d5e02be4b6c5dcb1.tar.xz ice-a5acb7766b106fe966ff02a9d5e02be4b6c5dcb1.zip | |
update HttpServer.js
Diffstat (limited to 'js')
| -rw-r--r-- | js/bin/HttpServer.js | 28 | ||||
| -rw-r--r-- | js/lib/.gitignore | 0 |
2 files changed, 24 insertions, 4 deletions
diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js index 88392d73616..2f133742972 100644 --- a/js/bin/HttpServer.js +++ b/js/bin/HttpServer.js @@ -103,10 +103,17 @@ if(!srcDist || useBinDist) iceLibDir = path.join(basePath, dist, "lib"); return true; } - else if(fs.statSync(path.join(basePath, dist, "share", "javascript", iceJs)).isFile()) + } + catch(e) + { + } + + try + { + if(fs.statSync(path.join(basePath, "share", "javascript", "ice-3.6b", iceJs)).isFile()) { - iceHome = path.join(basePath, dist); - iceLibDir = path.join(basePath, dist, "share", "javascript"); + iceHome = path.join(basePath); + iceLibDir = path.join(basePath, "share", "javascript", "ice-3.6b"); return true; } } @@ -133,11 +140,24 @@ if(iceHome) var iceHomeValid; try { + iceLibDir = path.join(iceHome, "lib"); iceHomeValid = fs.statSync(path.join(iceLibDir, iceJs)).isFile(); } catch(e) { } + + if(!iceHomeValid) + { + try + { + iceLibDir = path.join(basePath, "share", "javascript", "ice-3.6b"); + iceHomeValid = fs.statSync(path.join(iceLibDir, iceJs)).isFile(); + } + catch(e) + { + } + } if(!iceHomeValid) { @@ -145,7 +165,7 @@ if(iceHome) "please verify ICE_HOME is properly configured and Ice is correctly insetalled"); process.exit(1); } - console.log("Using Ice libraries from " + path.join(iceHome, "lib")); + console.log("Using Ice libraries from " + iceLibDir); } var libraries = ["/lib/Ice.js", "/lib/Ice.min.js", diff --git a/js/lib/.gitignore b/js/lib/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 --- a/js/lib/.gitignore +++ /dev/null |