Added external libraries from openXC CMake files.

Now libraries are cleanly included and built.

Change-Id: Iaa85639578b55b2da8357bc438426403e2cca8de
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

3 files changed, 0 insertions, 235 deletions

diff --git a/CAN-binder/libs/nanopb/tests/mem_release/SConscript b/CAN-binder/libs/nanopb/tests/mem_release/SConscript
deleted file mode 100644
index 6754e28..0000000
--- a/CAN-binder/libs/nanopb/tests/mem_release/SConscript
+++ /dev/null
@@ -1,13 +0,0 @@
-Import("env", "malloc_env")
-
-env.NanopbProto("mem_release.proto")
-
-test = malloc_env.Program(["mem_release.c",
-                    "mem_release.pb.c",
-                    "$COMMON/pb_encode_with_malloc.o",
-                    "$COMMON/pb_decode_with_malloc.o",
-                    "$COMMON/pb_common_with_malloc.o",
-                    "$COMMON/malloc_wrappers.o"])
-
-env.RunTest(test)
-
diff --git a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.c b/CAN-binder/libs/nanopb/tests/mem_release/mem_release.c
deleted file mode 100644
index dc6f87d..0000000
--- a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Make sure that all fields are freed in various scenarios. */
-
-#include <pb_decode.h>
-#include <pb_encode.h>
-#include <malloc_wrappers.h>
-#include <stdio.h>
-#include <test_helpers.h>
-#include "mem_release.pb.h"
-
-#define TEST(x) if (!(x)) { \
-    fprintf(stderr, "Test " #x " on line %d failed.\n", __LINE__); \
-    return false; \
-    }
-
-static char *test_str_arr[] = {"1", "2", ""};
-static SubMessage test_msg_arr[] = {SubMessage_init_zero, SubMessage_init_zero};
-static pb_extension_t ext1, ext2;
-
-static void fill_TestMessage(TestMessage *msg)
-{
-    msg->static_req_submsg.dynamic_str = "12345";
-    msg->static_req_submsg.dynamic_str_arr_count = 3;
-    msg->static_req_submsg.dynamic_str_arr = test_str_arr;
-    msg->static_req_submsg.dynamic_submsg_count = 2;
-    msg->static_req_submsg.dynamic_submsg = test_msg_arr;
-    msg->static_req_submsg.dynamic_submsg[1].dynamic_str = "abc";
-    msg->static_opt_submsg.dynamic_str = "abc";
-    msg->static_rep_submsg_count = 2;
-    msg->static_rep_submsg[1].dynamic_str = "abc";
-    msg->has_static_opt_submsg = true;
-    msg->dynamic_submsg = &msg->static_req_submsg;
-
-    msg->extensions = &ext1;
-    ext1.type = &dynamic_ext;
-    ext1.dest = &msg->static_req_submsg;
-    ext1.next = &ext2;
-    ext2.type = &static_ext;
-    ext2.dest = &msg->static_req_submsg;
-    ext2.next = NULL;
-}
-
-/* Basic fields, nested submessages, extensions */
-static bool test_TestMessage()
-{
-    uint8_t buffer[256];
-    size_t msgsize;
-    
-    /* Construct a message with various fields filled in */
-    {
-        TestMessage msg = TestMessage_init_zero;
-        pb_ostream_t stream;
-
-        fill_TestMessage(&msg);
-        
-        stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
-        if (!pb_encode(&stream, TestMessage_fields, &msg))
-        {
-            fprintf(stderr, "Encode failed: %s\n", PB_GET_ERROR(&stream));
-            return false;
-        }
-        msgsize = stream.bytes_written;
-    }
-    
-    /* Output encoded message for debug */
-    SET_BINARY_MODE(stdout);
-    fwrite(buffer, 1, msgsize, stdout);
-    
-    /* Decode memory using dynamic allocation */
-    {
-        TestMessage msg = TestMessage_init_zero;
-        pb_istream_t stream;
-        SubMessage ext2_dest;
-
-        msg.extensions = &ext1;
-        ext1.type = &dynamic_ext;
-        ext1.dest = NULL;
-        ext1.next = &ext2;
-        ext2.type = &static_ext;
-        ext2.dest = &ext2_dest;
-        ext2.next = NULL;
-        
-        stream = pb_istream_from_buffer(buffer, msgsize);
-        if (!pb_decode(&stream, TestMessage_fields, &msg))
-        {
-            fprintf(stderr, "Decode failed: %s\n", PB_GET_ERROR(&stream));
-            return false;
-        }
-        
-        /* Make sure it encodes back to same data */
-        {
-            uint8_t buffer2[256];
-            pb_ostream_t ostream = pb_ostream_from_buffer(buffer2, sizeof(buffer2));
-            TEST(pb_encode(&ostream, TestMessage_fields, &msg));
-            TEST(ostream.bytes_written == msgsize);
-            TEST(memcmp(buffer, buffer2, msgsize) == 0);
-        }
-        
-        /* Make sure that malloc counters work */
-        TEST(get_alloc_count() > 0);
-        
-        /* Make sure that pb_release releases everything */
-        pb_release(TestMessage_fields, &msg);
-        TEST(get_alloc_count() == 0);
-        
-        /* Check that double-free is a no-op */
-        pb_release(TestMessage_fields, &msg);
-        TEST(get_alloc_count() == 0);
-    }
-    
-    return true;
-}
-
-/* Oneofs */
-static bool test_OneofMessage()
-{
-    uint8_t buffer[256];
-    size_t msgsize;
-
-    {
-        pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
-
-        /* Encode first with TestMessage */
-        {
-            OneofMessage msg = OneofMessage_init_zero;
-            msg.which_msgs = OneofMessage_msg1_tag;
-
-            fill_TestMessage(&msg.msgs.msg1);
-
-            if (!pb_encode(&stream, OneofMessage_fields, &msg))
-            {
-                fprintf(stderr, "Encode failed: %s\n", PB_GET_ERROR(&stream));
-                return false;
-            }
-        }
-
-        /* Encode second with SubMessage, invoking 'merge' behaviour */
-        {
-            OneofMessage msg = OneofMessage_init_zero;
-            msg.which_msgs = OneofMessage_msg2_tag;
-
-            msg.first = 999;
-            msg.msgs.msg2.dynamic_str = "ABCD";
-            msg.last = 888;
-
-            if (!pb_encode(&stream, OneofMessage_fields, &msg))
-            {
-                fprintf(stderr, "Encode failed: %s\n", PB_GET_ERROR(&stream));
-                return false;
-            }
-        }
-        msgsize = stream.bytes_written;
-    }
-
-    {
-        OneofMessage msg = OneofMessage_init_zero;
-        pb_istream_t stream = pb_istream_from_buffer(buffer, msgsize);
-        if (!pb_decode(&stream, OneofMessage_fields, &msg))
-        {
-            fprintf(stderr, "Decode failed: %s\n", PB_GET_ERROR(&stream));
-            return false;
-        }
-
-        TEST(msg.first == 999);
-        TEST(msg.which_msgs == OneofMessage_msg2_tag);
-        TEST(msg.msgs.msg2.dynamic_str);
-        TEST(strcmp(msg.msgs.msg2.dynamic_str, "ABCD") == 0);
-        TEST(msg.msgs.msg2.dynamic_str_arr == NULL);
-        TEST(msg.msgs.msg2.dynamic_submsg == NULL);
-        TEST(msg.last == 888);
-
-        pb_release(OneofMessage_fields, &msg);
-        TEST(get_alloc_count() == 0);
-        pb_release(OneofMessage_fields, &msg);
-        TEST(get_alloc_count() == 0);
-    }
-
-    return true;
-}
-
-int main()
-{
-    if (test_TestMessage() && test_OneofMessage())
-        return 0;
-    else
-        return 1;
-}
-
diff --git a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.proto b/CAN-binder/libs/nanopb/tests/mem_release/mem_release.proto
deleted file mode 100644
index 0816dc2..0000000
--- a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.proto
+++ /dev/null
@@ -1,35 +0,0 @@
-syntax = "proto2";
-import "nanopb.proto";
-
-message SubMessage
-{
-    optional string dynamic_str = 1 [(nanopb).type = FT_POINTER];
-    repeated string dynamic_str_arr = 2 [(nanopb).type = FT_POINTER];
-    repeated SubMessage dynamic_submsg = 3 [(nanopb).type = FT_POINTER];
-}
-
-message TestMessage
-{
-    required SubMessage static_req_submsg = 1 [(nanopb).type = FT_STATIC];
-    optional SubMessage dynamic_submsg = 2 [(nanopb).type = FT_POINTER];
-    optional SubMessage static_opt_submsg = 3 [(nanopb).type = FT_STATIC];
-    repeated SubMessage static_rep_submsg = 4 [(nanopb).type = FT_STATIC, (nanopb).max_count=2];
-    extensions 100 to 200;
-}
-
-extend TestMessage
-{
-    optional SubMessage dynamic_ext = 100 [(nanopb).type = FT_POINTER];
-    optional SubMessage static_ext = 101 [(nanopb).type = FT_STATIC];
-}
-
-message OneofMessage
-{
-    required int32 first = 1;
-    oneof msgs
-    {
-        TestMessage msg1 = 2;
-        SubMessage msg2 = 3;
-    }
-    required int32 last = 4;
-}