Skip to content

Commit

Permalink
Merge pull request #42 from hintjens/master
Browse files Browse the repository at this point in the history
Adding support for Travis CI
  • Loading branch information
hintjens committed May 22, 2013
2 parents bf0cb10 + 42762ac commit 9f5c9c4
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 194 deletions.
36 changes: 36 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Majordomo

language: c

# Build required ZeroMQ projects first
before_script:

# libzmq
- git clone git://github.com/zeromq/libzmq.git
- cd libzmq
- ./autogen.sh
- ./configure && make check
- sudo make install
- sudo ldconfig
- cd ..

# libsodium
- git clone git://github.com/jedisct1/libsodium.git
- cd libsodium
- ./autogen.sh
- ./configure && make check
- sudo make install
- sudo ldconfig
- cd ..

# CZMQ
- git clone git://github.com/zeromq/czmq.git
- cd czmq
- ./autogen.sh
- ./configure && make check
- sudo make install
- sudo ldconfig
- cd ..

# Build and check libmdp
script: cd libmdp && ./autogen.sh && ./configure && make && make check
1 change: 0 additions & 1 deletion libmdp/include/mdp_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ CZMQ_EXPORT void
mdp_client_send (mdp_client_t *self, char *service, zmsg_t **request_p);
CZMQ_EXPORT zmsg_t *
mdp_client_recv (mdp_client_t *self, char **command_p, char **service_p);

// @end

#ifdef __cplusplus
Expand Down
162 changes: 0 additions & 162 deletions libmdp/src/mdcliapi2.c

This file was deleted.

29 changes: 0 additions & 29 deletions libmdp/src/mdclient2.c

This file was deleted.

4 changes: 2 additions & 2 deletions libmdp/src/test_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ int main (int argc, char *argv [])
if (reply)
zmsg_destroy (&reply);
else
break; // Interrupt or failure
break; // Interrupted by Ctrl-C
}
printf ("%d requests/replies processed\n", count);
printf ("%d replies received\n", count);
mdp_client_destroy (&session);
return 0;
}

0 comments on commit 9f5c9c4

Please sign in to comment.