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 "aesop Repository". The branch, master has been updated via fc2284c8031c4507b33af0dd7beef85cd99dc806 (commit) via 6755a02f21096b5718ebeed5e0a400218a7509de (commit) from 4f797c1277d3fb7a83222119351bfff6478ce4d5 (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 fc2284c8031c4507b33af0dd7beef85cd99dc806 Author: Phil Carns <[email protected]> Date: Mon Mar 26 16:56:20 2012 -0400 update c-utils commit 6755a02f21096b5718ebeed5e0a400218a7509de Author: Phil Carns <[email protected]> Date: Mon Mar 26 16:52:55 2012 -0400 adjust include paths in test programs - also add aesop-support.hae to installed headers ----------------------------------------------------------------------- Summary of changes: aesop-support.hae | 5 ++--- module.mk.in | 3 ++- parser/tests/blocking/afterwhile.ae | 2 +- parser/tests/blocking/basic-struct-init.ae | 2 +- parser/tests/blocking/basic-struct-return.ae | 2 +- parser/tests/blocking/basic.ae | 2 +- parser/tests/blocking/cancel-pbranch-loop.ae | 4 ++-- parser/tests/blocking/cancel-pbranch1.ae | 4 ++-- parser/tests/blocking/cancel-pbranch2.ae | 4 ++-- parser/tests/blocking/cancel-pbranch3.ae | 4 ++-- parser/tests/blocking/cancel-pbranch4.ae | 4 ++-- parser/tests/blocking/compound.ae | 2 +- parser/tests/blocking/dowhileloop.ae | 2 +- parser/tests/blocking/forloop.ae | 2 +- parser/tests/blocking/forloop2.ae | 2 +- parser/tests/blocking/forloop3.ae | 2 +- parser/tests/blocking/funptrs.ae | 2 +- parser/tests/blocking/icpfor.ae | 2 +- parser/tests/blocking/if.ae | 2 +- parser/tests/blocking/ifnbelse.ae | 2 +- parser/tests/blocking/ifnoelse.ae | 2 +- parser/tests/blocking/ifnoelse2.ae | 2 +- .../blocking/lonely-pbranch-variable-scope.ae | 4 ++-- parser/tests/blocking/lonely-pbranch.ae | 4 ++-- parser/tests/blocking/lonely-pbranch2.ae | 4 ++-- parser/tests/blocking/lonely-pbranch3.ae | 4 ++-- parser/tests/blocking/lonely-pbranch4.ae | 4 ++-- parser/tests/blocking/mixed.ae | 2 +- parser/tests/blocking/multif.ae | 2 +- parser/tests/blocking/nbfun.ae | 2 +- parser/tests/blocking/nested-forloop.ae | 2 +- parser/tests/blocking/nested.ae | 2 +- parser/tests/blocking/parallel1.ae | 2 +- parser/tests/blocking/parallel2.ae | 2 +- parser/tests/blocking/parallel3.ae | 2 +- parser/tests/blocking/parallel4.ae | 2 +- parser/tests/blocking/parallelfor.ae | 2 +- parser/tests/blocking/parallelfor2.ae | 2 +- parser/tests/blocking/parallelfor3.ae | 2 +- parser/tests/blocking/params.ae | 2 +- parser/tests/blocking/pbranch-completion.ae | 2 +- parser/tests/blocking/pbranch-with-return.ae | 2 +- parser/tests/blocking/pbreak-before-blocking.ae | 5 ++--- parser/tests/blocking/pbreak-immed-cancel.ae | 4 ++-- parser/tests/blocking/pbreak.ae | 4 ++-- parser/tests/blocking/pbreak2.ae | 4 ++-- parser/tests/blocking/pbreak3.ae | 4 ++-- parser/tests/blocking/pbreak4.ae | 4 ++-- parser/tests/blocking/pbreak5.ae | 4 ++-- parser/tests/blocking/pbreak6.ae | 4 ++-- parser/tests/blocking/pbreak7.ae | 4 ++-- parser/tests/blocking/pbreak8.ae | 4 ++-- parser/tests/blocking/pprivate.ae | 2 +- parser/tests/blocking/pshared.ae | 2 +- parser/tests/blocking/pwait-in-for.ae | 2 +- parser/tests/blocking/pwait-in-while.ae | 2 +- parser/tests/blocking/tcpfor.ae | 2 +- parser/tests/blocking/threefors.ae | 2 +- parser/tests/blocking/twofors.ae | 2 +- parser/tests/blocking/whilebreak.ae | 2 +- parser/tests/blocking/whilebreak2.ae | 2 +- parser/tests/blocking/whilebreak3.ae | 2 +- parser/tests/blocking/whileloop.ae | 2 +- resources/thread/test/aethread-cancel.ae | 8 ++++---- resources/thread/test/aethread-example.ae | 4 ++-- resources/timer/test/pthread-compare.ae | 4 ++-- resources/timer/test/timer-cancel.ae | 6 +++--- resources/timer/test/timer1.ae | 4 ++-- resources/timer/test/timer2.ae | 4 ++-- src/aefile/test/aefile-example.ae | 6 +++--- src/c-utils | 2 +- src/socket/aesocket.hae | 2 +- src/socket/module.mk.in | 1 + src/socket/test/simple.ae | 8 ++++---- src/ssm/test/ssmget.ae | 6 +++--- src/ssm/test/ssmmsg.ae | 6 +++--- src/ssm/test/ssmping.ae | 6 +++--- src/ssm/test/ssmput.ae | 6 +++--- tests/test-hints.ae | 4 ++-- 79 files changed, 124 insertions(+), 124 deletions(-) Diff of changes: diff --git a/aesop-support.hae b/aesop-support.hae index 012f89e..805ec16 100644 --- a/aesop-support.hae +++ b/aesop-support.hae @@ -1,9 +1,8 @@ #ifndef __AESOP_SUPPORT_HAE__ #define __AESOP_SUPPORT_HAE__ -#include "aesop.h" -#include "resource.h" -#include "resources/timer/timer.hae" +#include <aesop/aesop.h> +#include <aesop/timer.hae> /** TODO: need to fix this. depends on timer */ diff --git a/module.mk.in b/module.mk.in index ffe87c5..bd236c1 100644 --- a/module.mk.in +++ b/module.mk.in @@ -15,4 +15,5 @@ INSTALL_HDR += ae-types.h \ ae-blocking-parser.h \ hints.h \ ae-init.h \ - ae-debug.h + ae-debug.h \ + aesop-support.hae diff --git a/parser/tests/blocking/afterwhile.ae b/parser/tests/blocking/afterwhile.ae index 01e6ca1..e1e9bf5 100644 --- a/parser/tests/blocking/afterwhile.ae +++ b/parser/tests/blocking/afterwhile.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static int here = 0; diff --git a/parser/tests/blocking/basic-struct-init.ae b/parser/tests/blocking/basic-struct-init.ae index 3f0440a..cb58ac6 100644 --- a/parser/tests/blocking/basic-struct-init.ae +++ b/parser/tests/blocking/basic-struct-init.ae @@ -3,7 +3,7 @@ */ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" struct foo diff --git a/parser/tests/blocking/basic-struct-return.ae b/parser/tests/blocking/basic-struct-return.ae index ad25659..69d08ac 100644 --- a/parser/tests/blocking/basic-struct-return.ae +++ b/parser/tests/blocking/basic-struct-return.ae @@ -1,6 +1,6 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" struct foo diff --git a/parser/tests/blocking/basic.ae b/parser/tests/blocking/basic.ae index 91af433..442fdf2 100644 --- a/parser/tests/blocking/basic.ae +++ b/parser/tests/blocking/basic.ae @@ -1,6 +1,6 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_basic(void) diff --git a/parser/tests/blocking/cancel-pbranch-loop.ae b/parser/tests/blocking/cancel-pbranch-loop.ae index 3a4582b..626c7e0 100644 --- a/parser/tests/blocking/cancel-pbranch-loop.ae +++ b/parser/tests/blocking/cancel-pbranch-loop.ae @@ -1,8 +1,8 @@ #include <unistd.h> -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_test(void) { diff --git a/parser/tests/blocking/cancel-pbranch1.ae b/parser/tests/blocking/cancel-pbranch1.ae index 2b04650..8a22f70 100644 --- a/parser/tests/blocking/cancel-pbranch1.ae +++ b/parser/tests/blocking/cancel-pbranch1.ae @@ -1,8 +1,8 @@ #include <unistd.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" +#include <aesop/aesop-support.hae> static __blocking void foo_fn(void) { diff --git a/parser/tests/blocking/cancel-pbranch2.ae b/parser/tests/blocking/cancel-pbranch2.ae index 92a56bc..21bbbb2 100644 --- a/parser/tests/blocking/cancel-pbranch2.ae +++ b/parser/tests/blocking/cancel-pbranch2.ae @@ -1,8 +1,8 @@ #include <unistd.h> -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_test(void) { diff --git a/parser/tests/blocking/cancel-pbranch3.ae b/parser/tests/blocking/cancel-pbranch3.ae index 502bf4e..f21ca57 100644 --- a/parser/tests/blocking/cancel-pbranch3.ae +++ b/parser/tests/blocking/cancel-pbranch3.ae @@ -1,8 +1,8 @@ #include <unistd.h> -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_test(void) { diff --git a/parser/tests/blocking/cancel-pbranch4.ae b/parser/tests/blocking/cancel-pbranch4.ae index 22f371d..cfcf5f9 100644 --- a/parser/tests/blocking/cancel-pbranch4.ae +++ b/parser/tests/blocking/cancel-pbranch4.ae @@ -1,8 +1,8 @@ #include <unistd.h> -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_test(void) { diff --git a/parser/tests/blocking/compound.ae b/parser/tests/blocking/compound.ae index 9bb0039..135b552 100644 --- a/parser/tests/blocking/compound.ae +++ b/parser/tests/blocking/compound.ae @@ -2,7 +2,7 @@ #include <assert.h> #include <unistd.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" __blocking int blah(void) diff --git a/parser/tests/blocking/dowhileloop.ae b/parser/tests/blocking/dowhileloop.ae index 6964b41..cb2b202 100644 --- a/parser/tests/blocking/dowhileloop.ae +++ b/parser/tests/blocking/dowhileloop.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/forloop.ae b/parser/tests/blocking/forloop.ae index 560c8ba..1ab2a0d 100644 --- a/parser/tests/blocking/forloop.ae +++ b/parser/tests/blocking/forloop.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/forloop2.ae b/parser/tests/blocking/forloop2.ae index 998ce57..8096efa 100644 --- a/parser/tests/blocking/forloop2.ae +++ b/parser/tests/blocking/forloop2.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/forloop3.ae b/parser/tests/blocking/forloop3.ae index beaed32..d3d21ca 100644 --- a/parser/tests/blocking/forloop3.ae +++ b/parser/tests/blocking/forloop3.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/funptrs.ae b/parser/tests/blocking/funptrs.ae index cefa61f..f567228 100644 --- a/parser/tests/blocking/funptrs.ae +++ b/parser/tests/blocking/funptrs.ae @@ -1,5 +1,5 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" struct mystruct diff --git a/parser/tests/blocking/icpfor.ae b/parser/tests/blocking/icpfor.ae index ec51759..77ac9e4 100644 --- a/parser/tests/blocking/icpfor.ae +++ b/parser/tests/blocking/icpfor.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_parfor(void) diff --git a/parser/tests/blocking/if.ae b/parser/tests/blocking/if.ae index c0ee71b..0de4446 100644 --- a/parser/tests/blocking/if.ae +++ b/parser/tests/blocking/if.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/ifnbelse.ae b/parser/tests/blocking/ifnbelse.ae index 7e42c74..3eb7d35 100644 --- a/parser/tests/blocking/ifnbelse.ae +++ b/parser/tests/blocking/ifnbelse.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/ifnoelse.ae b/parser/tests/blocking/ifnoelse.ae index 57f0ef6..a4c5f93 100644 --- a/parser/tests/blocking/ifnoelse.ae +++ b/parser/tests/blocking/ifnoelse.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/ifnoelse2.ae b/parser/tests/blocking/ifnoelse2.ae index fb10dd8..83a1b57 100644 --- a/parser/tests/blocking/ifnoelse2.ae +++ b/parser/tests/blocking/ifnoelse2.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/lonely-pbranch-variable-scope.ae b/parser/tests/blocking/lonely-pbranch-variable-scope.ae index e55aef1..c533b36 100644 --- a/parser/tests/blocking/lonely-pbranch-variable-scope.ae +++ b/parser/tests/blocking/lonely-pbranch-variable-scope.ae @@ -1,8 +1,8 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/timer.hae> #include "parser/tests/blocking/btest.hae" -#include "resources/timer/timer.hae" static __blocking void lonely_pbranch(void) { diff --git a/parser/tests/blocking/lonely-pbranch.ae b/parser/tests/blocking/lonely-pbranch.ae index 9a7eacc..39893c3 100644 --- a/parser/tests/blocking/lonely-pbranch.ae +++ b/parser/tests/blocking/lonely-pbranch.ae @@ -1,8 +1,8 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/timer.hae> #include "parser/tests/blocking/btest.hae" -#include "resources/timer/timer.hae" static __blocking void lonely_pbranch(void) { diff --git a/parser/tests/blocking/lonely-pbranch2.ae b/parser/tests/blocking/lonely-pbranch2.ae index 52f8b32..909bacc 100644 --- a/parser/tests/blocking/lonely-pbranch2.ae +++ b/parser/tests/blocking/lonely-pbranch2.ae @@ -1,8 +1,8 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" -#include "resources/timer/timer.hae" +#include <aesop/timer.hae> static __blocking void lonely_pbranch(void) { diff --git a/parser/tests/blocking/lonely-pbranch3.ae b/parser/tests/blocking/lonely-pbranch3.ae index e101276..6bf8a76 100644 --- a/parser/tests/blocking/lonely-pbranch3.ae +++ b/parser/tests/blocking/lonely-pbranch3.ae @@ -1,8 +1,8 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/timer.hae> #include "parser/tests/blocking/btest.hae" -#include "resources/timer/timer.hae" static __blocking void noop(void) { diff --git a/parser/tests/blocking/lonely-pbranch4.ae b/parser/tests/blocking/lonely-pbranch4.ae index fc6371c..ec9a298 100644 --- a/parser/tests/blocking/lonely-pbranch4.ae +++ b/parser/tests/blocking/lonely-pbranch4.ae @@ -1,8 +1,8 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/timer.hae> #include "parser/tests/blocking/btest.hae" -#include "resources/timer/timer.hae" static __blocking void lonely_pbranch(void) { diff --git a/parser/tests/blocking/mixed.ae b/parser/tests/blocking/mixed.ae index 76baba6..aa8c5e8 100644 --- a/parser/tests/blocking/mixed.ae +++ b/parser/tests/blocking/mixed.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/multif.ae b/parser/tests/blocking/multif.ae index 6d9da4d..b3b8503 100644 --- a/parser/tests/blocking/multif.ae +++ b/parser/tests/blocking/multif.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" int val = 0; diff --git a/parser/tests/blocking/nbfun.ae b/parser/tests/blocking/nbfun.ae index d62639a..5694faa 100644 --- a/parser/tests/blocking/nbfun.ae +++ b/parser/tests/blocking/nbfun.ae @@ -1,5 +1,5 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking int run_inner_nbfun1(void) diff --git a/parser/tests/blocking/nested-forloop.ae b/parser/tests/blocking/nested-forloop.ae index 047e51a..4a3a6d2 100644 --- a/parser/tests/blocking/nested-forloop.ae +++ b/parser/tests/blocking/nested-forloop.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/nested.ae b/parser/tests/blocking/nested.ae index 9d996b5..038a960 100644 --- a/parser/tests/blocking/nested.ae +++ b/parser/tests/blocking/nested.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static int here = 0; diff --git a/parser/tests/blocking/parallel1.ae b/parser/tests/blocking/parallel1.ae index 8d065f6..9f861e7 100644 --- a/parser/tests/blocking/parallel1.ae +++ b/parser/tests/blocking/parallel1.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/parallel2.ae b/parser/tests/blocking/parallel2.ae index 1e50c2b..b81b96d 100644 --- a/parser/tests/blocking/parallel2.ae +++ b/parser/tests/blocking/parallel2.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/parallel3.ae b/parser/tests/blocking/parallel3.ae index c2b138e..372beec 100644 --- a/parser/tests/blocking/parallel3.ae +++ b/parser/tests/blocking/parallel3.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/parallel4.ae b/parser/tests/blocking/parallel4.ae index 4b1f64a..451698c 100644 --- a/parser/tests/blocking/parallel4.ae +++ b/parser/tests/blocking/parallel4.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/parallelfor.ae b/parser/tests/blocking/parallelfor.ae index 11eac19..907ab88 100644 --- a/parser/tests/blocking/parallelfor.ae +++ b/parser/tests/blocking/parallelfor.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_parfor(void) diff --git a/parser/tests/blocking/parallelfor2.ae b/parser/tests/blocking/parallelfor2.ae index 292186e..c67989e 100644 --- a/parser/tests/blocking/parallelfor2.ae +++ b/parser/tests/blocking/parallelfor2.ae @@ -4,7 +4,7 @@ * See COPYING in top-level directory. */ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_parfor( diff --git a/parser/tests/blocking/parallelfor3.ae b/parser/tests/blocking/parallelfor3.ae index 1f7f42e..780c522 100644 --- a/parser/tests/blocking/parallelfor3.ae +++ b/parser/tests/blocking/parallelfor3.ae @@ -4,7 +4,7 @@ * See COPYING in top-level directory. */ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_parfor( diff --git a/parser/tests/blocking/params.ae b/parser/tests/blocking/params.ae index c5d72a6..712e741 100644 --- a/parser/tests/blocking/params.ae +++ b/parser/tests/blocking/params.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_params(int a, const char *b, const char *c) diff --git a/parser/tests/blocking/pbranch-completion.ae b/parser/tests/blocking/pbranch-completion.ae index d2bdd23..f399975 100644 --- a/parser/tests/blocking/pbranch-completion.ae +++ b/parser/tests/blocking/pbranch-completion.ae @@ -3,7 +3,7 @@ #include <unistd.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" __blocking void do_random_test(void) diff --git a/parser/tests/blocking/pbranch-with-return.ae b/parser/tests/blocking/pbranch-with-return.ae index 041fc78..3d98d42 100644 --- a/parser/tests/blocking/pbranch-with-return.ae +++ b/parser/tests/blocking/pbranch-with-return.ae @@ -1,5 +1,5 @@ #include <assert.h> -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking int pbranch_with_return(void) diff --git a/parser/tests/blocking/pbreak-before-blocking.ae b/parser/tests/blocking/pbreak-before-blocking.ae index e175653..7b45382 100644 --- a/parser/tests/blocking/pbreak-before-blocking.ae +++ b/parser/tests/blocking/pbreak-before-blocking.ae @@ -1,8 +1,7 @@ - -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_par1(void) { diff --git a/parser/tests/blocking/pbreak-immed-cancel.ae b/parser/tests/blocking/pbreak-immed-cancel.ae index 55b5492..9f0ac5e 100644 --- a/parser/tests/blocking/pbreak-immed-cancel.ae +++ b/parser/tests/blocking/pbreak-immed-cancel.ae @@ -1,7 +1,7 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_pbreak(void) { diff --git a/parser/tests/blocking/pbreak.ae b/parser/tests/blocking/pbreak.ae index cdd6e7a..82a9435 100644 --- a/parser/tests/blocking/pbreak.ae +++ b/parser/tests/blocking/pbreak.ae @@ -1,7 +1,7 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_pbreak(void) { diff --git a/parser/tests/blocking/pbreak2.ae b/parser/tests/blocking/pbreak2.ae index b9ab983..bffe5fd 100644 --- a/parser/tests/blocking/pbreak2.ae +++ b/parser/tests/blocking/pbreak2.ae @@ -1,6 +1,6 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" -#include "aesop-support.hae" static __blocking void run_pbreak2(void) { diff --git a/parser/tests/blocking/pbreak3.ae b/parser/tests/blocking/pbreak3.ae index 2ef6154..785e249 100644 --- a/parser/tests/blocking/pbreak3.ae +++ b/parser/tests/blocking/pbreak3.ae @@ -1,6 +1,6 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" -#include "aesop-support.hae" static __blocking void run_pbreak3(void) { diff --git a/parser/tests/blocking/pbreak4.ae b/parser/tests/blocking/pbreak4.ae index 04c26d4..c2e4063 100644 --- a/parser/tests/blocking/pbreak4.ae +++ b/parser/tests/blocking/pbreak4.ae @@ -1,6 +1,6 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" -#include "aesop-support.hae" static __blocking void run_pbreak4(void) { diff --git a/parser/tests/blocking/pbreak5.ae b/parser/tests/blocking/pbreak5.ae index dfb89ad..9ca11d6 100644 --- a/parser/tests/blocking/pbreak5.ae +++ b/parser/tests/blocking/pbreak5.ae @@ -1,6 +1,6 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" -#include "aesop-support.hae" static __blocking void run_pbreak5(void) { diff --git a/parser/tests/blocking/pbreak6.ae b/parser/tests/blocking/pbreak6.ae index d0f6748..ef469cf 100644 --- a/parser/tests/blocking/pbreak6.ae +++ b/parser/tests/blocking/pbreak6.ae @@ -1,6 +1,6 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" -#include "aesop-support.hae" static __blocking void run_pbreak6(void) { diff --git a/parser/tests/blocking/pbreak7.ae b/parser/tests/blocking/pbreak7.ae index 7056963..b51fcf8 100644 --- a/parser/tests/blocking/pbreak7.ae +++ b/parser/tests/blocking/pbreak7.ae @@ -1,7 +1,7 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_par1(void) { diff --git a/parser/tests/blocking/pbreak8.ae b/parser/tests/blocking/pbreak8.ae index 7d4f3a7..117d09c 100644 --- a/parser/tests/blocking/pbreak8.ae +++ b/parser/tests/blocking/pbreak8.ae @@ -1,7 +1,7 @@ -#include "aesop.h" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> #include "parser/tests/blocking/btest.hae" #include <assert.h> -#include "aesop-support.hae" static __blocking void run_par1(void) { diff --git a/parser/tests/blocking/pprivate.ae b/parser/tests/blocking/pprivate.ae index 7959ebf..4e37240 100644 --- a/parser/tests/blocking/pprivate.ae +++ b/parser/tests/blocking/pprivate.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/pshared.ae b/parser/tests/blocking/pshared.ae index c9f947c..3f05e86 100644 --- a/parser/tests/blocking/pshared.ae +++ b/parser/tests/blocking/pshared.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/pwait-in-for.ae b/parser/tests/blocking/pwait-in-for.ae index e66005c..dec4ccd 100644 --- a/parser/tests/blocking/pwait-in-for.ae +++ b/parser/tests/blocking/pwait-in-for.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking int run_forloop(void) diff --git a/parser/tests/blocking/pwait-in-while.ae b/parser/tests/blocking/pwait-in-while.ae index 80c5ae8..0fb729d 100644 --- a/parser/tests/blocking/pwait-in-while.ae +++ b/parser/tests/blocking/pwait-in-while.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_whileloop(void) diff --git a/parser/tests/blocking/tcpfor.ae b/parser/tests/blocking/tcpfor.ae index 2596fb4..673fa2b 100644 --- a/parser/tests/blocking/tcpfor.ae +++ b/parser/tests/blocking/tcpfor.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_parfor(void) diff --git a/parser/tests/blocking/threefors.ae b/parser/tests/blocking/threefors.ae index 401972b..02227a7 100644 --- a/parser/tests/blocking/threefors.ae +++ b/parser/tests/blocking/threefors.ae @@ -1,5 +1,5 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" #include <assert.h> diff --git a/parser/tests/blocking/twofors.ae b/parser/tests/blocking/twofors.ae index e0cfd16..63c439b 100644 --- a/parser/tests/blocking/twofors.ae +++ b/parser/tests/blocking/twofors.ae @@ -1,5 +1,5 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" int val = 0; diff --git a/parser/tests/blocking/whilebreak.ae b/parser/tests/blocking/whilebreak.ae index 8dde7f0..3a81e22 100644 --- a/parser/tests/blocking/whilebreak.ae +++ b/parser/tests/blocking/whilebreak.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_whilebreak(void) diff --git a/parser/tests/blocking/whilebreak2.ae b/parser/tests/blocking/whilebreak2.ae index 07480d3..2518d96 100644 --- a/parser/tests/blocking/whilebreak2.ae +++ b/parser/tests/blocking/whilebreak2.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_whilebreak(void) diff --git a/parser/tests/blocking/whilebreak3.ae b/parser/tests/blocking/whilebreak3.ae index 46007ea..7fe3680 100644 --- a/parser/tests/blocking/whilebreak3.ae +++ b/parser/tests/blocking/whilebreak3.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_whilebreak(void) diff --git a/parser/tests/blocking/whileloop.ae b/parser/tests/blocking/whileloop.ae index 556b6ff..042bf68 100644 --- a/parser/tests/blocking/whileloop.ae +++ b/parser/tests/blocking/whileloop.ae @@ -1,4 +1,4 @@ -#include "aesop.h" +#include <aesop/aesop.h> #include "parser/tests/blocking/btest.hae" static __blocking void run_whileloop(void) diff --git a/resources/thread/test/aethread-cancel.ae b/resources/thread/test/aethread-cancel.ae index 17c28a8..fff0d6e 100644 --- a/resources/thread/test/aethread-cancel.ae +++ b/resources/thread/test/aethread-cancel.ae @@ -3,10 +3,10 @@ #include <unistd.h> #include <sys/time.h> -#include "aesop.h" -#include "resources/thread/aethread.hae" -#include "resources/timer/timer.hae" -#include "aesop-support.hae" +#include <aesop/aesop.h> +#include <aesop/aethread.hae> +#include <aesop/timer.hae> +#include <aesop/aesop-support.hae> static double wtime(void) { diff --git a/resources/thread/test/aethread-example.ae b/resources/thread/test/aethread-example.ae index 03d045e..69459e5 100644 --- a/resources/thread/test/aethread-example.ae +++ b/resources/thread/test/aethread-example.ae @@ -3,8 +3,8 @@ #include <unistd.h> #include <sys/time.h> -#include "aesop.h" -#include "resources/thread/aethread.hae" +#include <aesop/aesop.h> +#include <aesop/aethread.hae> static double wtime(void) { diff --git a/resources/timer/test/pthread-compare.ae b/resources/timer/test/pthread-compare.ae index 9dbba25..c3ac84a 100644 --- a/resources/timer/test/pthread-compare.ae +++ b/resources/timer/test/pthread-compare.ae @@ -1,8 +1,8 @@ #include <unistd.h> #include <sys/time.h> -#include "aesop.h" -#include "resources/timer/timer.hae" +#include <aesop/aesop.h> +#include <aesop/timer.hae> triton_mutex_t mutex = TRITON_MUTEX_INITIALIZER; diff --git a/resources/timer/test/timer-cancel.ae b/resources/timer/test/timer-cancel.ae index 647bdff..7c8c1bd 100644 --- a/resources/timer/test/timer-cancel.ae +++ b/resources/timer/test/timer-cancel.ae @@ -1,8 +1,8 @@ #include <stdio.h> -#include "aesop.h" -#include "resources/timer/timer.hae" -#include "aesop-support.hae" +#include <aesop/aesop.h> +#include <aesop/timer.hae> +#include <aesop/aesop-support.hae> static __blocking int dotimer(void) { diff --git a/resources/timer/test/timer1.ae b/resources/timer/test/timer1.ae index a8183ca..5a4f283 100644 --- a/resources/timer/test/timer1.ae +++ b/resources/timer/test/timer1.ae @@ -1,7 +1,7 @@ #include <stdio.h> -#include "aesop.h" -#include "resources/timer/timer.hae" +#include <aesop/aesop.h> +#include <aesop/timer.hae> static __blocking int dotimer(void) { diff --git a/resources/timer/test/timer2.ae b/resources/timer/test/timer2.ae index d18b139..2f053c6 100644 --- a/resources/timer/test/timer2.ae +++ b/resources/timer/test/timer2.ae @@ -1,7 +1,7 @@ #include <stdio.h> -#include "aesop.h" -#include "resources/timer/timer.hae" +#include <aesop/aesop.h> +#include <aesop/timer.hae> int exit_loop = 0; diff --git a/src/aefile/test/aefile-example.ae b/src/aefile/test/aefile-example.ae index 7f83c20..221a2ea 100644 --- a/src/aefile/test/aefile-example.ae +++ b/src/aefile/test/aefile-example.ae @@ -7,9 +7,9 @@ #include <fcntl.h> #include <stdlib.h> -#include "aesop.h" -#include "src/aefile/aefile.hae" -#include "resources/thread/aethread.hae" +#include <aesop/aesop.h> +#include <aesop/aefile.hae> +#include <aesop/aethread.hae> static double wtime(void) { diff --git a/src/c-utils b/src/c-utils index 7f4af54..33877b0 160000 --- a/src/c-utils +++ b/src/c-utils @@ -1 +1 @@ -Subproject commit 7f4af54f5af9a97f346cfb1d8fc122b1f2203178 +Subproject commit 33877b08245dc805447c83fcdf349a4cab227031 diff --git a/src/socket/aesocket.hae b/src/socket/aesocket.hae index 55db9ac..3be3276 100644 --- a/src/socket/aesocket.hae +++ b/src/socket/aesocket.hae @@ -3,7 +3,7 @@ #include <sys/types.h> #include <sys/socket.h> -#include "aesop.h" +#include <aesop/aesop.h> /** diff --git a/src/socket/module.mk.in b/src/socket/module.mk.in index 1b86cbb..1fe4808 100644 --- a/src/socket/module.mk.in +++ b/src/socket/module.mk.in @@ -2,4 +2,5 @@ DIR := src/socket AELIBSRC += $(DIR)/aesocket.ae AESOP_HDR += $(DIR)/aesocket.hae +INSTALL_HDR += $(DIR)/aesocket.hae diff --git a/src/socket/test/simple.ae b/src/socket/test/simple.ae index 2a68033..697d7cd 100644 --- a/src/socket/test/simple.ae +++ b/src/socket/test/simple.ae @@ -1,7 +1,7 @@ -#include "aesop.h" -#include "aesop-support.hae" -#include "resources/timer/timer.hae" -#include "src/socket/aesocket.hae" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> +#include <aesop/timer.hae> +#include <aesop/aesocket.hae> #include <unistd.h> #include <fcntl.h> diff --git a/src/ssm/test/ssmget.ae b/src/ssm/test/ssmget.ae index 9afebe8..23806f6 100644 --- a/src/ssm/test/ssmget.ae +++ b/src/ssm/test/ssmget.ae @@ -1,6 +1,6 @@ -#include "aesop.h" -#include "aesop-support.hae" -#include "src/ssm/aessm.hae" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> +#include <aesop/aessm.hae> #define DATAVAL 0xffbaffabffbaffab diff --git a/src/ssm/test/ssmmsg.ae b/src/ssm/test/ssmmsg.ae index 5c23dd9..0fa0655 100644 --- a/src/ssm/test/ssmmsg.ae +++ b/src/ssm/test/ssmmsg.ae @@ -1,6 +1,6 @@ -#include "aesop.h" -#include "aesop-support.hae" -#include "src/ssm/aessm.hae" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> +#include <aesop/aessm.hae> #define DATAVAL 0xffbaffabffbaffab diff --git a/src/ssm/test/ssmping.ae b/src/ssm/test/ssmping.ae index 5f511d4..be78bbb 100644 --- a/src/ssm/test/ssmping.ae +++ b/src/ssm/test/ssmping.ae @@ -1,6 +1,6 @@ -#include "aesop.h" -#include "aesop-support.hae" -#include "src/ssm/aessm.hae" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> +#include <aesop/aessm.hae> /* * This test demonstrates a ping to a remote host. diff --git a/src/ssm/test/ssmput.ae b/src/ssm/test/ssmput.ae index 4d58d77..431c040 100644 --- a/src/ssm/test/ssmput.ae +++ b/src/ssm/test/ssmput.ae @@ -1,6 +1,6 @@ -#include "aesop.h" -#include "aesop-support.hae" -#include "src/ssm/aessm.hae" +#include <aesop/aesop.h> +#include <aesop/aesop-support.hae> +#include <aesop/aessm.hae> #define DATAVAL 0xffbaffabffbaffab diff --git a/tests/test-hints.ae b/tests/test-hints.ae index 28b9de6..c0df784 100644 --- a/tests/test-hints.ae +++ b/tests/test-hints.ae @@ -1,6 +1,6 @@ -#include "aesop.h" -#include "resources/timer/timer.hae" +#include <aesop/aesop.h> +#include <aesop/timer.hae> __blocking void do_blocking3(void) { hooks/post-receive -- aesop Repository