diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:14:03 +0000 |
commit | bcbcf005b4864ac5557c31da10521126d8880849 (patch) | |
tree | 444cafefb16e1c5a4ba13ce2db07d6ec1f37675e /src/core | |
parent | 119193d6350bbbd8c6ecbd60ccc8301223d6f6d6 (diff) | |
download | gnunet-bcbcf005b4864ac5557c31da10521126d8880849.tar.gz gnunet-bcbcf005b4864ac5557c31da10521126d8880849.zip |
installing all service, daemon and helper binaries to lib/gnunet/libexec/; updating code to run binaries from new location, which is no longer in PATH
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Makefile.am | 6 | ||||
-rw-r--r-- | src/core/test_core_api.c | 13 | ||||
-rw-r--r-- | src/core/test_core_api_reliability.c | 6 | ||||
-rw-r--r-- | src/core/test_core_api_start_only.c | 12 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 6 |
5 files changed, 32 insertions, 11 deletions
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 4aa7a7c73..3091249f8 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -2,6 +2,8 @@ INCLUDES = -I$(top_srcdir)/src/include | |||
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | 3 | pkgcfgdir= $(pkgdatadir)/config.d/ |
4 | 4 | ||
5 | libexecdir= $(pkglibdir)/libexec/ | ||
6 | |||
5 | pkgcfg_DATA = \ | 7 | pkgcfg_DATA = \ |
6 | core.conf | 8 | core.conf |
7 | 9 | ||
@@ -30,8 +32,10 @@ libgnunetcore_la_LDFLAGS = \ | |||
30 | -version-info 0:0:0 | 32 | -version-info 0:0:0 |
31 | 33 | ||
32 | 34 | ||
35 | libexec_PROGRAMS = \ | ||
36 | gnunet-service-core | ||
37 | |||
33 | bin_PROGRAMS = \ | 38 | bin_PROGRAMS = \ |
34 | gnunet-service-core \ | ||
35 | gnunet-core | 39 | gnunet-core |
36 | 40 | ||
37 | gnunet_service_core_SOURCES = \ | 41 | gnunet_service_core_SOURCES = \ |
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 0512c9617..11fd14504 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -316,20 +316,23 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server, | |||
316 | static void | 316 | static void |
317 | setup_peer (struct PeerContext *p, const char *cfgname) | 317 | setup_peer (struct PeerContext *p, const char *cfgname) |
318 | { | 318 | { |
319 | char *binary; | ||
320 | |||
321 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | ||
319 | p->cfg = GNUNET_CONFIGURATION_create (); | 322 | p->cfg = GNUNET_CONFIGURATION_create (); |
320 | #if START_ARM | 323 | #if START_ARM |
321 | p->arm_proc = | 324 | p->arm_proc = |
322 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-arm", | 325 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
323 | "gnunet-service-arm", | 326 | NULL, NULL, |
324 | #if VERBOSE | 327 | binary, |
325 | "-L", "DEBUG", | 328 | "gnunet-service-arm", |
326 | #endif | ||
327 | "-c", cfgname, NULL); | 329 | "-c", cfgname, NULL); |
328 | #endif | 330 | #endif |
329 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 331 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
330 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); | 332 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); |
331 | GNUNET_assert (p->th != NULL); | 333 | GNUNET_assert (p->th != NULL); |
332 | p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); | 334 | p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); |
335 | GNUNET_free (binary); | ||
333 | } | 336 | } |
334 | 337 | ||
335 | 338 | ||
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index d4afbc27d..dd70d438a 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -426,10 +426,13 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) | |||
426 | static void | 426 | static void |
427 | setup_peer (struct PeerContext *p, const char *cfgname) | 427 | setup_peer (struct PeerContext *p, const char *cfgname) |
428 | { | 428 | { |
429 | char *binary; | ||
430 | |||
431 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | ||
429 | p->cfg = GNUNET_CONFIGURATION_create (); | 432 | p->cfg = GNUNET_CONFIGURATION_create (); |
430 | #if START_ARM | 433 | #if START_ARM |
431 | p->arm_proc = | 434 | p->arm_proc = |
432 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-arm", | 435 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, |
433 | "gnunet-service-arm", | 436 | "gnunet-service-arm", |
434 | "-c", cfgname, NULL); | 437 | "-c", cfgname, NULL); |
435 | #endif | 438 | #endif |
@@ -437,6 +440,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
437 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); | 440 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); |
438 | GNUNET_assert (p->th != NULL); | 441 | GNUNET_assert (p->th != NULL); |
439 | p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); | 442 | p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); |
443 | GNUNET_free (binary); | ||
440 | } | 444 | } |
441 | 445 | ||
442 | 446 | ||
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index a502fce6d..d9cb4150d 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c | |||
@@ -137,12 +137,18 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server, | |||
137 | static void | 137 | static void |
138 | setup_peer (struct PeerContext *p, const char *cfgname) | 138 | setup_peer (struct PeerContext *p, const char *cfgname) |
139 | { | 139 | { |
140 | char *binary; | ||
141 | |||
142 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | ||
140 | p->cfg = GNUNET_CONFIGURATION_create (); | 143 | p->cfg = GNUNET_CONFIGURATION_create (); |
141 | p->arm_proc = | 144 | p->arm_proc = |
142 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-arm", | 145 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
143 | "gnunet-service-arm", | 146 | NULL, NULL, |
144 | "-c", cfgname, NULL); | 147 | binary, |
148 | "gnunet-service-arm", | ||
149 | "-c", cfgname, NULL); | ||
145 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 150 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
151 | GNUNET_free (binary); | ||
146 | } | 152 | } |
147 | 153 | ||
148 | 154 | ||
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 61fe21626..88a915095 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -570,10 +570,13 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) | |||
570 | static void | 570 | static void |
571 | setup_peer (struct PeerContext *p, const char *cfgname) | 571 | setup_peer (struct PeerContext *p, const char *cfgname) |
572 | { | 572 | { |
573 | char *binary; | ||
574 | |||
575 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | ||
573 | p->cfg = GNUNET_CONFIGURATION_create (); | 576 | p->cfg = GNUNET_CONFIGURATION_create (); |
574 | #if START_ARM | 577 | #if START_ARM |
575 | p->arm_proc = | 578 | p->arm_proc = |
576 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-arm", | 579 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, |
577 | "gnunet-service-arm", | 580 | "gnunet-service-arm", |
578 | "-c", cfgname, NULL); | 581 | "-c", cfgname, NULL); |
579 | #endif | 582 | #endif |
@@ -583,6 +586,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
583 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); | 586 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); |
584 | GNUNET_assert (p->th != NULL); | 587 | GNUNET_assert (p->th != NULL); |
585 | p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); | 588 | p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); |
589 | GNUNET_free (binary); | ||
586 | } | 590 | } |
587 | 591 | ||
588 | 592 | ||