Repository: qpid-proton
Updated Branches:
  refs/heads/master 5c6207f6a -> e9db8dfba


Updates to the ws WebSocket library have caused issues with the JavaScript 
bindings. Updating FindNodePackages.cmake to explicitly use ws version 0.5.0 
pending actually figuring out what has changed


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/e9db8dfb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/e9db8dfb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/e9db8dfb

Branch: refs/heads/master
Commit: e9db8dfba24646d17e7caf17c7e1fea3319cc603
Parents: 5c6207f
Author: Fraser Adams <fad...@apache.org>
Authored: Sat Jan 31 10:11:25 2015 +0000
Committer: Fraser Adams <fad...@apache.org>
Committed: Sat Jan 31 10:11:25 2015 +0000

----------------------------------------------------------------------
 tools/cmake/Modules/FindNodePackages.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e9db8dfb/tools/cmake/Modules/FindNodePackages.cmake
----------------------------------------------------------------------
diff --git a/tools/cmake/Modules/FindNodePackages.cmake 
b/tools/cmake/Modules/FindNodePackages.cmake
index bfbb36f..f6c0e49 100644
--- a/tools/cmake/Modules/FindNodePackages.cmake
+++ b/tools/cmake/Modules/FindNodePackages.cmake
@@ -58,8 +58,11 @@ if (NOT NODE_PACKAGES_FOUND)
         endif()
     endmacro()
 
-    # Check if ws WebSocket library https://github.com/einaros/ws is installed
-    InstallPackage("NODE_WS_FOUND" "ws")
+    # Check if ws WebSocket library https://github.com/websockets/ws is 
installed
+    # N.B. something changed between ws 0.5.0 and 0.6.0 that breaks proton js
+    # so explicitly pulling version 0.5.0
+    # TODO update javascript binding/emscripten/both to work with latest ws.
+    InstallPackage("NODE_WS_FOUND" "ws@0.5.0")
 
     # Check if jsdoc3 API documentation generator 
https://github.com/jsdoc3/jsdoc is installed
     InstallPackage("NODE_JSDOC_FOUND" "jsdoc")


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to