This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via a36d1ac8b63efc715b6c3e71f839654bdaa44b03 (commit) via 11aa5f440a2b03b2fecea3d7888a069abd99836a (commit) from 2de95fd20ecffd7f9385ec9eacf308c71ec5dd81 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a36d1ac8b63efc715b6c3e71f839654bdaa44b03 Author: Phil Carns <[email protected]> Date: Wed Jun 26 22:07:16 2013 -0400 init and finalize mercury svr engine commit 11aa5f440a2b03b2fecea3d7888a069abd99836a Author: Phil Carns <[email protected]> Date: Wed Jun 26 22:06:05 2013 -0400 hard code BMI paths temporarily ----------------------------------------------------------------------- Summary of changes: code/configure.ac | 1 + code/src/remote/mercury-svr.ae | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/configure.ac b/code/configure.ac index 6504eb4..a798411 100644 --- a/code/configure.ac +++ b/code/configure.ac @@ -69,6 +69,7 @@ AC_ARG_WITH(mercury, ]) AECC=${withval}/bin/aecc MERCURY_LIBS=`PKG_CONFIG_PATH=${withval}/lib/pkgconfig pkg-config mercury --libs` +MERCURY_LIBS="-L/home/pcarns/working/bmi/install/lib $MERCURY_LIBS -lbmi" MERCURY_CFLAGS=`PKG_CONFIG_PATH=${withval}/lib/pkgconfig pkg-config mercury --cflags` AC_SUBST(USE_MERCURY) diff --git a/code/src/remote/mercury-svr.ae b/code/src/remote/mercury-svr.ae index d981f88..220b07c 100644 --- a/code/src/remote/mercury-svr.ae +++ b/code/src/remote/mercury-svr.ae @@ -5,6 +5,7 @@ #include <aesop/aesop.h> #include "src/zeroconf/zeroconf.h" +#include "src/remote/mercury-engine.hae" static void triton_perror(const char *s, triton_ret_t ret); @@ -18,12 +19,21 @@ __blocking int aesop_main(int argc, char **argv) triton_ret_t ret; int test_ret; + ret = triton_mercury_svr_init(); + if(ret != TRITON_SUCCESS) + { + triton_perror("triton_mercury_svr_init", ret); + return(-1); + } + test_ret = run_server(); if(test_ret == 0) printf("Test success.\n"); else printf("Test failure.\n"); + triton_mercury_svr_finalize(); + return test_ret; } aesop_main_set(aesop_main); hooks/post-receive --