Skip to content

L
libzmq
Commit 8bee4e25 authored by Luca Boccassi's avatar Luca Boccassi
Browse files
Options

Merge pull request #1799 from hintjens/master 

Making gyp builds work
parents 22e830be 8230c0d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 374 additions and 176 deletions
CMakeLists.txt
View file @ 8bee4e25
......@@ -176,7 +176,7 @@ check_function_exists (gethrtime HAVE_GETHRTIME)
set (CMAKE_REQUIRED_INCLUDES)
add_definitions (-D_REENTRANT -D_THREAD_SAFE)
add_definitions (-DZMQ_USING_CMAKE)
add_definitions (-DZMQ_CUSTOM_PLATFORM_HPP)
option (ENABLE_EVENTFD "Enable/disable eventfd" ZMQ_HAVE_EVENTFD)
......
Makefile.am
View file @ 8bee4e25
......@@ -388,7 +388,7 @@ test_apps = \
tests/test_atomics \
tests/test_client_server \
tests/test_thread_safe \
tests/test_socketopt_hwm \
tests/test_sockopt_hwm \
tests/test_heartbeats \
tests/test_stream_exceeds_buffer \
tests/test_poller \
......@@ -593,8 +593,8 @@ tests_test_client_server_LDADD = src/libzmq.la
tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
tests_test_thread_safe_LDADD = src/libzmq.la
tests_test_socketopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
tests_test_socketopt_hwm_LDADD = src/libzmq.la
tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
tests_test_sockopt_hwm_LDADD = src/libzmq.la
tests_test_setsockopt_SOURCES = tests/test_setsockopt.cpp
tests_test_setsockopt_LDADD = src/libzmq.la
......
builds/gyp/platform.hpp
View file @ 8bee4e25
......@@ -43,6 +43,7 @@
#elif defined ZMQ_HAVE_OSX
# define ZMQ_USE_KQUEUE 1
# define HAVE_POSIX_MEMALIGN 1
# define ZMQ_HAVE_IFADDRS 1
# define ZMQ_HAVE_SO_KEEPALIVE 1
# define ZMQ_HAVE_TCP_KEEPALIVE 1
# define ZMQ_HAVE_TCP_KEEPCNT 1
......
builds/gyp/project-tests.gsl 0 → 100644
View file @ 8bee4e25
.echo "Generating project-tests.gypi..."
.output "project-tests.gypi"
{
'targets': [
.for test
{
'target_name': '$(name)',
'type': 'executable',
'sources': [
'../../tests/$(name).cpp',
'../../tests/testutil.hpp'
],
'dependencies': [
'libzmq'
],
}$(last ()?? ""? ",")
.endfor
]
}
builds/gyp/project-tests.gypi 0 → 100644
View file @ 8bee4e25
This diff is collapsed.
builds/gyp/project-tests.xml 0 → 100644
View file @ 8bee4e25
<tests script = "project-tests">
<test name = "test_system" />
<test name = "test_pair_inproc" />
<test name = "test_pair_tcp" />
<test name = "test_reqrep_inproc" />
<test name = "test_reqrep_tcp" />
<test name = "test_hwm" />
<test name = "test_hwm_pubsub" />
<test name = "test_reqrep_device" />
<test name = "test_sub_forward" />
<test name = "test_invalid_rep" />
<test name = "test_msg_flags" />
<test name = "test_msg_ffn" />
<test name = "test_large_msg" />
<test name = "test_connect_resolve" />
<test name = "test_immediate" />
<test name = "test_last_endpoint" />
<test name = "test_term_endpoint" />
<test name = "test_srcfd" />
<test name = "test_monitor" />
<test name = "test_router_mandatory" />
<test name = "test_router_mandatory_hwm" />
<test name = "test_router_handover" />
<test name = "test_probe_router" />
<test name = "test_stream" />
<test name = "test_stream_empty" />
<test name = "test_stream_disconnect" />
<test name = "test_stream_timeout" />
<test name = "test_disconnect_inproc" />
<test name = "test_unbind_inproc" />
<test name = "test_unbind_wildcard" />
<test name = "test_ctx_options" />
<test name = "test_ctx_destroy" />
<test name = "test_security_null" />
<test name = "test_security_plain" />
<test name = "test_security_curve" />
<test name = "test_iov" />
<test name = "test_spec_req" />
<test name = "test_spec_rep" />
<test name = "test_spec_dealer" />
<test name = "test_spec_router" />
<test name = "test_spec_pushpull" />
<test name = "test_req_correlate" />
<test name = "test_req_relaxed" />
<test name = "test_conflate" />
<test name = "test_inproc_connect" />
<test name = "test_issue_566" />
<test name = "test_proxy" />
<test name = "test_proxy_single_socket" />
<test name = "test_proxy_terminate" />
<test name = "test_getsockopt_memset" />
<test name = "test_setsockopt" />
<test name = "test_many_sockets" />
<test name = "test_ipc_wildcard" />
<test name = "test_diffserv" />
<test name = "test_connect_rid" />
<test name = "test_bind_src_address" />
<test name = "test_metadata" />
<test name = "test_capabilities" />
<test name = "test_xpub_nodrop" />
<test name = "test_xpub_manual" />
<test name = "test_xpub_welcome_msg" />
<test name = "test_atomics" />
<test name = "test_client_server" />
<test name = "test_thread_safe" />
<test name = "test_sockopt_hwm" />
<test name = "test_heartbeats" />
<test name = "test_stream_exceeds_buffer" />
<test name = "test_poller" />
<test name = "test_timers" />
<test name = "test_radio_dish" />
<test name = "test_udp" />
<test name = "test_shutdown_stress" />
<test name = "test_pair_ipc" />
<test name = "test_reqrep_ipc" />
<test name = "test_use_fd_ipc" />
<test name = "test_use_fd_tcp" />
<test name = "test_timeo" />
<test name = "test_filter_ipc" />
<test name = "test_fork" />
<test name = "test_abstract_ipc" />
</tests>
builds/gyp/project.gyp 0 → 100644
View file @ 8bee4e25
#
# This is the gyp script for libzmq
#
# Run in builds/gyp, as follows:
#
# gyp --depth=. --format=make
# make
#
{
'includes': [
'project-tests.gypi',
],
'target_defaults': {
'include_dirs': [
'../../include',
'.'
],
'defines': [
'ZMQ_CUSTOM_PLATFORM_HPP'
],
'conditions': [
[ 'OS=="win"', {
'defines': [
'ZMQ_HAVE_WINDOWS=1'
]
}],
[ 'OS=="mac"', {
'defines': [
'ZMQ_HAVE_OSX=1'
]
}],
[ 'OS=="linux"', {
'defines': [
'ZMQ_HAVE_LINUX=1'
],
'libraries': [
'-lpthread'
]
}]
]
},
'targets': [
{
'target_name': 'libzmq',
'type': 'static_library',
'sources': [
'platform.hpp',
'../../include/zmq.h',
'../../src/address.cpp',
'../../src/address.hpp',
'../../src/array.hpp',
'../../src/atomic_counter.hpp',
'../../src/atomic_ptr.hpp',
'../../src/blob.hpp',
'../../src/client.cpp',
'../../src/client.hpp',
'../../src/clock.cpp',
'../../src/clock.hpp',
'../../src/command.hpp',
'../../src/condition_variable.hpp',
'../../src/config.hpp',
'../../src/ctx.cpp',
'../../src/ctx.hpp',
'../../src/curve_client.cpp',
'../../src/curve_client.hpp',
'../../src/curve_server.cpp',
'../../src/curve_server.hpp',
'../../src/dbuffer.hpp',
'../../src/dealer.cpp',
'../../src/dealer.hpp',
'../../src/decoder.hpp',
'../../src/decoder_allocators.cpp',
'../../src/decoder_allocators.hpp',
'../../src/devpoll.cpp',
'../../src/devpoll.hpp',
'../../src/dish.cpp',
'../../src/dish.hpp',
'../../src/dist.cpp',
'../../src/dist.hpp',
'../../src/encoder.hpp',
'../../src/epoll.cpp',
'../../src/epoll.hpp',
'../../src/err.cpp',
'../../src/err.hpp',
'../../src/fd.hpp',
'../../src/fq.cpp',
'../../src/fq.hpp',
'../../src/gssapi_client.cpp',
'../../src/gssapi_client.hpp',
'../../src/gssapi_mechanism_base.cpp',
'../../src/gssapi_mechanism_base.hpp',
'../../src/gssapi_server.cpp',
'../../src/gssapi_server.hpp',
'../../src/i_decoder.hpp',
'../../src/i_encoder.hpp',
'../../src/i_engine.hpp',
'../../src/i_mailbox.hpp',
'../../src/i_poll_events.hpp',
'../../src/io_object.cpp',
'../../src/io_object.hpp',
'../../src/io_thread.cpp',
'../../src/io_thread.hpp',
'../../src/ip.cpp',
'../../src/ip.hpp',
'../../src/ipc_address.cpp',
'../../src/ipc_address.hpp',
'../../src/ipc_connecter.cpp',
'../../src/ipc_connecter.hpp',
'../../src/ipc_listener.cpp',
'../../src/ipc_listener.hpp',
'../../src/kqueue.cpp',
'../../src/kqueue.hpp',
'../../src/lb.cpp',
'../../src/lb.hpp',
'../../src/likely.hpp',
'../../src/mailbox.cpp',
'../../src/mailbox.hpp',
'../../src/mailbox_safe.cpp',
'../../src/mailbox_safe.hpp',
'../../src/mechanism.cpp',
'../../src/mechanism.hpp ',
'../../src/metadata.cpp',
'../../src/metadata.hpp',
'../../src/msg.cpp',
'../../src/msg.hpp',
'../../src/mtrie.cpp',
'../../src/mtrie.hpp',
'../../src/mutex.hpp',
'../../src/norm_engine.cpp',
'../../src/norm_engine.hpp',
'../../src/null_mechanism.cpp',
'../../src/null_mechanism.hpp',
'../../src/object.cpp',
'../../src/object.hpp',
'../../src/options.cpp',
'../../src/options.hpp',
'../../src/own.cpp',
'../../src/own.hpp',
'../../src/pair.cpp',
'../../src/pair.hpp',
'../../src/pgm_receiver.cpp',
'../../src/pgm_receiver.hpp',
'../../src/pgm_sender.cpp',
'../../src/pgm_sender.hpp',
'../../src/pgm_socket.cpp',
'../../src/pgm_socket.hpp',
'../../src/pipe.cpp',
'../../src/pipe.hpp',
'../../src/plain_client.cpp',
'../../src/plain_client.hpp',
'../../src/plain_server.cpp',
'../../src/plain_server.hpp',
'../../src/poll.cpp',
'../../src/poll.hpp',
'../../src/poller.hpp',
'../../src/poller_base.cpp',
'../../src/poller_base.hpp',
'../../src/proxy.cpp',
'../../src/proxy.hpp',
'../../src/pub.cpp',
'../../src/pub.hpp',
'../../src/pull.cpp',
'../../src/pull.hpp',
'../../src/push.cpp',
'../../src/push.hpp',
'../../src/radio.cpp',
'../../src/radio.hpp',
'../../src/random.cpp',
'../../src/random.hpp',
'../../src/raw_decoder.cpp',
'../../src/raw_decoder.hpp',
'../../src/raw_encoder.cpp',
'../../src/raw_encoder.hpp',
'../../src/reaper.cpp',
'../../src/reaper.hpp',
'../../src/rep.cpp',
'../../src/rep.hpp',
'../../src/req.cpp',
'../../src/req.hpp',
'../../src/router.cpp',
'../../src/router.hpp',
'../../src/select.cpp',
'../../src/select.hpp',
'../../src/server.cpp',
'../../src/server.hpp',
'../../src/session_base.cpp',
'../../src/session_base.hpp',
'../../src/signaler.cpp',
'../../src/signaler.hpp',
'../../src/socket_base.cpp',
'../../src/socket_base.hpp',
'../../src/socket_poller.cpp',
'../../src/socket_poller.hpp',
'../../src/socks.cpp',
'../../src/socks.hpp',
'../../src/socks_connecter.cpp',
'../../src/socks_connecter.hpp',
'../../src/stdint.hpp',
'../../src/stream.cpp',
'../../src/stream.hpp',
'../../src/stream_engine.cpp',
'../../src/stream_engine.hpp',
'../../src/sub.cpp',
'../../src/sub.hpp',
'../../src/tcp.cpp',
'../../src/tcp.hpp',
'../../src/tcp_address.cpp',
'../../src/tcp_address.hpp',
'../../src/tcp_connecter.cpp',
'../../src/tcp_connecter.hpp',
'../../src/tcp_listener.cpp',
'../../src/tcp_listener.hpp',
'../../src/thread.cpp',
'../../src/thread.hpp',
'../../src/timers.cpp',
'../../src/timers.hpp',
'../../src/tipc_address.cpp',
'../../src/tipc_address.hpp',
'../../src/tipc_connecter.cpp',
'../../src/tipc_connecter.hpp',
'../../src/tipc_listener.cpp',
'../../src/tipc_listener.hpp',
'../../src/trie.cpp',
'../../src/trie.hpp',
'../../src/tweetnacl.c',
'../../src/tweetnacl.h',
'../../src/udp_address.cpp',
'../../src/udp_address.hpp',
'../../src/udp_engine.cpp',
'../../src/udp_engine.hpp',
'../../src/v1_decoder.cpp',
'../../src/v1_decoder.hpp',
'../../src/v1_encoder.cpp',
'../../src/v1_encoder.hpp',
'../../src/v2_decoder.cpp',
'../../src/v2_decoder.hpp',
'../../src/v2_encoder.cpp',
'../../src/v2_encoder.hpp',
'../../src/v2_protocol.hpp',
'../../src/vmci.cpp',
'../../src/vmci.hpp',
'../../src/vmci_address.cpp',
'../../src/vmci_address.hpp',
'../../src/vmci_connecter.cpp',
'../../src/vmci_connecter.hpp',
'../../src/vmci_listener.cpp',
'../../src/vmci_listener.hpp',
'../../src/windows.hpp',
'../../src/wire.hpp',
'../../src/xpub.cpp',
'../../src/xpub.hpp',
'../../src/xsub.cpp',
'../../src/xsub.hpp',
'../../src/ypipe.hpp',
'../../src/ypipe_base.hpp',
'../../src/ypipe_conflate.hpp',
'../../src/yqueue.hpp',
'../../src/zmq.cpp',
'../../src/zmq_utils.cpp'
]
}
]
}
project.gyp deleted 100644 → 0
View file @ 22e830be
#
# This is the gyp script for libzmq
#
# Use:
# gyp --depth=.
{
'targets': [
{
'target_name': 'libzmq',
'type': 'static_library',
'sources': [
'include/zmq.h',
'builds/gyp/platform.hpp',
'src/address.cpp', 'src/address.hpp',
'src/array.hpp',
'src/atomic_counter.hpp',
'src/atomic_ptr.hpp',
'src/blob.hpp',
'src/client.cpp', 'src/client.hpp',
'src/clock.cpp', 'src/clock.hpp',
'src/command.hpp',
'src/condition_variable.hpp',
'src/config.hpp',
'src/ctx.cpp', 'src/ctx.hpp',
'src/curve_client.cpp', 'src/curve_client.hpp',
'src/curve_server.cpp', 'src/curve_server.hpp',
'src/dbuffer.hpp',
'src/dealer.cpp', 'src/dealer.hpp',
'src/decoder.hpp',
'src/devpoll.cpp', 'src/devpoll.hpp',
'src/dish.cpp', 'src/dish.hpp',
'src/dist.cpp', 'src/dist.hpp',
'src/encoder.hpp',
'src/epoll.cpp', 'src/epoll.hpp',
'src/err.cpp', 'src/err.hpp',
'src/fd.hpp',
'src/fq.cpp', 'src/fq.hpp',
'src/gssapi_mechanism_base.cpp', 'src/gssapi_mechanism_base.hpp',
'src/gssapi_client.cpp', 'src/gssapi_client.hpp',
'src/gssapi_server.cpp', 'src/gssapi_server.hpp',
'src/i_encoder.hpp',
'src/i_engine.hpp',
'src/i_decoder.hpp',
'src/i_mailbox.hpp',
'src/i_poll_events.hpp',
'src/io_object.cpp', 'src/io_object.hpp',
'src/io_thread.cpp', 'src/io_thread.hpp',
'src/ip.cpp', 'src/ip.hpp',
'src/ipc_address.cpp', 'src/ipc_address.hpp',
'src/ipc_connecter.cpp', 'src/ipc_connecter.hpp',
'src/ipc_listener.cpp', 'src/ipc_listener.hpp',
'src/kqueue.cpp', 'src/kqueue.hpp',
'src/lb.cpp', 'src/lb.hpp',
'src/likely.hpp',
'src/mailbox.cpp', 'src/mailbox.hpp',
'src/mailbox_safe.cpp', 'src/mailbox_safe.hpp',
'src/mechanism.cpp', 'src/mechanism.hpp ',
'src/metadata.cpp', 'src/metadata.hpp',
'src/msg.cpp', 'src/msg.hpp',
'src/mtrie.cpp', 'src/mtrie.hpp',
'src/mutex.hpp',
'src/norm_engine.cpp', 'src/norm_engine.hpp',
'src/null_mechanism.cpp', 'src/null_mechanism.hpp',
'src/object.cpp', 'src/object.hpp',
'src/options.cpp', 'src/options.hpp',
'src/own.cpp', 'src/own.hpp',
'src/pair.cpp', 'src/pair.hpp',
'src/pgm_receiver.cpp', 'src/pgm_receiver.hpp',
'src/pgm_sender.cpp', 'src/pgm_sender.hpp',
'src/pgm_socket.cpp', 'src/pgm_socket.hpp',
'src/pipe.cpp', 'src/pipe.hpp',
'src/plain_client.cpp', 'src/plain_client.hpp',
'src/plain_server.cpp', 'src/plain_server.hpp',
'src/poll.cpp', 'src/poll.hpp',
'src/poller.hpp', 'src/poller_base.cpp',
'src/poller_base.hpp',
'src/proxy.cpp', 'src/proxy.hpp',
'src/pub.cpp', 'src/pub.hpp',
'src/pull.cpp', 'src/pull.hpp',
'src/push.cpp', 'src/push.hpp',
'src/radio.cpp', 'src/radio.hpp',
'src/random.cpp', 'src/random.hpp',
'src/raw_decoder.cpp', 'src/raw_decoder.hpp',
'src/raw_encoder.cpp', 'src/raw_encoder.hpp',
'src/reaper.cpp', 'src/reaper.hpp',
'src/rep.cpp', 'src/rep.hpp',
'src/req.cpp', 'src/req.hpp',
'src/router.cpp', 'src/router.hpp',
'src/select.cpp', 'src/select.hpp',
'src/server.cpp', 'src/server.hpp',
'src/session_base.cpp', 'src/session_base.hpp',
'src/signaler.cpp', 'src/signaler.hpp',
'src/socket_base.cpp', 'src/socket_base.hpp',
'src/socks.cpp', 'src/socks.hpp',
'src/socks_connecter.cpp', 'src/socks_connecter.hpp',
'src/stdint.hpp',
'src/stream.cpp', 'src/stream.hpp',
'src/stream_engine.cpp', 'src/stream_engine.hpp',
'src/sub.cpp', 'src/sub.hpp',
'src/tcp.cpp', 'src/tcp.hpp',
'src/tcp_address.cpp', 'src/tcp_address.hpp',
'src/tcp_connecter.cpp', 'src/tcp_connecter.hpp',
'src/tcp_listener.cpp', 'src/tcp_listener.hpp',
'src/thread.cpp', 'src/thread.hpp',
'src/timers.cpp', 'src/timers.hpp',
'src/tipc_address.cpp', 'src/tipc_address.hpp',
'src/tipc_connecter.cpp', 'src/tipc_connecter.hpp',
'src/tipc_listener.cpp', 'src/tipc_listener.hpp',
'src/trie.cpp', 'src/trie.hpp',
'src/tweetnacl.c', 'src/tweetnacl.h',
'src/udp_address.cpp', 'src/udp_address.hpp',
'src/udp_engine.cpp', 'src/udp_engine.hpp',
'src/v1_decoder.cpp', 'src/v1_decoder.hpp',
'src/v2_decoder.cpp', 'src/v2_decoder.hpp',
'src/v1_encoder.cpp', 'src/v1_encoder.hpp',
'src/v2_encoder.cpp', 'src/v2_encoder.hpp',
'src/v2_protocol.hpp',
'src/vmci.cpp', 'src/vmci.hpp',
'src/vmci_address.cpp', 'src/vmci_address.hpp',
'src/vmci_connecter.cpp', 'src/vmci_connecter.hpp',
'src/vmci_listener.cpp', 'src/vmci_listener.hpp',
'src/windows.hpp',
'src/wire.hpp',
'src/xpub.cpp', 'src/xpub.hpp',
'src/xsub.cpp', 'src/xsub.hpp',
'src/ypipe.hpp',
'src/ypipe_base.hpp',
'src/ypipe_conflate.hpp',
'src/yqueue.hpp',
'src/zmq.cpp',
'src/zmq_utils.cpp',
'src/decoder_allocators.cpp', 'src/decoder_allocators.hpp',
'src/socket_poller.cpp' 'src/socket_poller.hpp',
],
'include_dirs': [
'include',
'builds/gyp'
],
'conditions': [
[ 'OS=="win"', {
"defines": [
"ZMQ_HAVE_WINDOWS=1"
]
}],
[ 'OS=="mac"', {
"defines": [
"ZMQ_HAVE_OSX=1"
]
}],
[ 'OS=="linux"', {
"defines": [
"ZMQ_HAVE_LINUX=1"
]
}]
]
}
]
}
src/tcp_address.cpp
View file @ 8bee4e25
......@@ -32,27 +32,23 @@
#include "macros.hpp"
#include "tcp_address.hpp"
#include "platform.hpp"
#include "stdint.hpp"
#include "err.hpp"
#include "ip.hpp"
#ifdef ZMQ_HAVE_WINDOWS
#include "windows.hpp"
#else
#ifndef ZMQ_HAVE_WINDOWS
#include <sys/types.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <net/if.h>
#include <netdb.h>
#include <ctype.h>
#include <unistd.h>
#include <stdlib.h>
#endif
#ifdef ZMQ_HAVE_SOLARIS
#include <sys/sockio.h>
#include <net/if.h>
#include <unistd.h>
#include <stdlib.h>
// On Solaris platform, network interface name can be queried by ioctl.
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
......@@ -116,11 +112,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_
}
#elif defined ZMQ_HAVE_AIX || defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_ANDROID
#include <sys/types.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <net/if.h>
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
{
......@@ -182,7 +174,6 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_
&& defined ZMQ_HAVE_IFADDRS)
#include <ifaddrs.h>
#include <net/if.h>
// On these platforms, network interface name can be queried
// using getifaddrs function.
......
tests/testutil.hpp
View file @ 8bee4e25
......@@ -32,7 +32,7 @@
#include "../include/zmq.h"
#include "../src/stdint.hpp"
#ifdef ZMQ_USING_CMAKE
#if defined ZMQ_CUSTOM_PLATFORM_HPP
# include "platform.hpp"
#else
# include "../src/platform.hpp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment