Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:JustinTulloss/zeromq.node

  • Loading branch information...
commit f020b6afc8da4cb705fbf8f4773cff8aff7f4e6e 2 parents 16f435e + 6f8237a
@mscdex mscdex authored
View
2  .travis.yml
@@ -17,4 +17,4 @@ before_install:
language: node_js
node_js:
- "0.8"
- - "0.9"
+ - "0.10"
View
21 History.md
@@ -1,29 +1,40 @@
+2.3.0 / 2013-03-15
+==================
+
+ * added: xpub/xsub socket types [xla]
+ * added: support for zmq_disconnect [matehat]
+ * added: LAST_ENDPOINT socket option [ronkorving]
+ * added: local/remote_lat local/remote_thr perf test [wavded]
+ * fixed: tests improved [qubyte, jeremybarnes, ronkorving]
+ * fixed: Node v0.9.4+ compatibility [mscdex]
+ * fixed: SNDHWM and RCVHWM options were given the wrong type [freehaha]
+ * removed: waf support [mscdex]
-2.2.0 / 2012-10-17
+2.2.0 / 2012-10-17
==================
* add support for pkg-config
* add libzmq 3.x support [aaudis]
* fix: prevent GC happening too soon for connect/bindSync
-2.1.0 / 2012-06-29
+2.1.0 / 2012-06-29
==================
* fix require() for 0.8.0
* change: use uv_poll in place of IOWatcher
* remove stupid engines field
-2.0.3 / 2012-03-14
+2.0.3 / 2012-03-14
==================
* Removed -Wall (libuv unused vars caused the build to fail...)
-2.0.2 / 2012-02-16
+2.0.2 / 2012-02-16
==================
* Added back `.createSocket()` for BC. Closes #86
-2.0.1 / 2012-01-26
+2.0.1 / 2012-01-26
==================
* Added `.zmqVersion` [patricklucas]
View
2  Makefile
@@ -20,6 +20,6 @@ docclean:
rm -fr docs/index.{json,html}
distclean:
- node-waf distclean
+ node-gyp clean
.PHONY: clean distclean test docs docclean
View
2  binding.cc
@@ -50,7 +50,7 @@
};
#endif
-#define ZMQ_CAN_DISCONNECT (ZMQ_VERSION_MAJOR == 3 and ZMQ_VERSION_MINOR >= 2) or ZMQ_VERSION_MAJOR > 3
+#define ZMQ_CAN_DISCONNECT (ZMQ_VERSION_MAJOR == 3 && ZMQ_VERSION_MINOR >= 2) || ZMQ_VERSION_MAJOR > 3
using namespace v8;
using namespace node;
View
11 package.json
@@ -1,6 +1,6 @@
{
"name": "zmq",
- "version": "2.2.0",
+ "version": "2.3.0",
"description": "Bindings for node.js to zeromq",
"main": "index",
"repository": {
@@ -37,11 +37,14 @@
"Iskren Ivov Chernev <iskren.chernev@gmail.com>",
"Seth Fitzsimmons",
"Patrick Lucas",
- "Alexander Simmerl",
+ "Alexander Simmerl (https://github.com/xla)",
"Ian Babrou",
"Niall O'Higgins",
- "Brian White",
+ "Brian White (https://github.com/mscdex)",
+ "Mathieu D'Amours (https://github.com/matehat)",
"Joshua Gourneau",
- "Yaroslav Shirokov"
+ "Yaroslav Shirokov",
+ "Marc Harter (https://github.com/wavded)",
+ "John Sun (https://github.com/freehaha)"
]
}
View
4 perf/local_thr.js
@@ -25,13 +25,13 @@ sub.on('message', function (data) {
function finish(){
var endtime = process.hrtime(timer)
var millis = (endtime[0]*1000) + (endtime[1]/1000000)
- var throughput = message_count / (millis/1000000)
+ var throughput = message_count / (millis / 1000)
var megabits = (throughput * message_size * 8) / 1000000
console.log('message size: %d [B]', message_size)
console.log('message count: %d', message_count)
console.log('mean throughput: %d [msg/s]', throughput.toFixed(0))
- console.log('mean throughput: %d [Mb/s]', megabits.toFixed(0))
+ console.log('mean throughput: %d [Mbit/s]', megabits.toFixed(0))
console.log('overall time: %d secs and %d nanoseconds', endtime[0], endtime[1])
sub.close()
}
View
6 test/test.exports.js
@@ -53,8 +53,8 @@ if (semver.satisfies(zmq.version, '2.x')) {
]);
}
-// 3.x only.
-if (semver.satisfies(zmq.version, '3.x')) {
+// 3.0 and above.
+if (semver.gte(zmq.version, '3.0.0')) {
constants.concat([
'XPUB',
'XSUB',
@@ -64,7 +64,7 @@ if (semver.satisfies(zmq.version, '3.x')) {
}
// 3.2 and above.
-if (semver.gte('3.2')) {
+if (semver.gte(zmq.version, '3.2.0')) {
constants.concat([
'LAST_ENDPOINT'
]);
View
36 wscript
@@ -1,36 +0,0 @@
-import Options
-from os import unlink, link
-from os.path import exists
-
-APPNAME = 'zeromq.node'
-VERSION = "1.0.0"
-
-def set_options(opt):
- opt.tool_options("compiler_cxx")
-
-def configure(conf):
- conf.check_tool("compiler_cxx")
- conf.check_tool("node_addon")
- conf.check_cfg(atleast_pkgconfig_version='0.0.0', mandatory=True, errmsg='pkg-config was not found')
- conf.check_cfg(package='libzmq', atleast_version='2.1.0', uselib_store='ZMQ', args='--cflags --libs', mandatory=True, errmsg='Package libzmq was not found')
- conf.check(lib='uuid', uselib_store='UUID')
-
-def build(bld):
- obj = bld.new_task_gen("cxx", "shlib", "node_addon")
- obj.target = "binding"
- obj.source = "binding.cc"
- obj.uselib = "ZMQ UUID"
-
-def shutdown():
- # HACK to get binding.node out of build directory.
- # better way to do this?
- if exists('./binding.node'):
- unlink('./binding.node')
- if Options.commands['build']:
- if exists('./build/default/binding.node'):
- link('./build/default/binding.node', './binding.node')
- elif exists('./build/Release/binding.node'):
- link('./build/Release/binding.node', './binding.node')
- else:
- raise Exception("Cannot locate build binding.node")
-
Please sign in to comment.
Something went wrong with that request. Please try again.