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>

5 files changed, 0 insertions, 150 deletions

diff --git a/CAN-binder/libs/nanopb/tests/extensions/SConscript b/CAN-binder/libs/nanopb/tests/extensions/SConscript
deleted file mode 100644
index a2c87428..00000000
--- a/CAN-binder/libs/nanopb/tests/extensions/SConscript
+++ /dev/null
@@ -1,16 +0,0 @@
-# Test the support for extension fields.
-
-Import("env")
-
-# We use the files from the alltypes test case
-incpath = env.Clone()
-incpath.Append(PROTOCPATH = '$BUILD/alltypes')
-incpath.Append(CPPPATH = '$BUILD/alltypes')
-
-incpath.NanopbProto(["extensions", "extensions.options"])
-enc = incpath.Program(["encode_extensions.c", "extensions.pb.c", "$BUILD/alltypes/alltypes.pb$OBJSUFFIX", "$COMMON/pb_encode.o", "$COMMON/pb_common.o"])
-dec = incpath.Program(["decode_extensions.c", "extensions.pb.c", "$BUILD/alltypes/alltypes.pb$OBJSUFFIX", "$COMMON/pb_decode.o", "$COMMON/pb_common.o"])
-
-env.RunTest(enc)
-env.RunTest([dec, "encode_extensions.output"])
-
diff --git a/CAN-binder/libs/nanopb/tests/extensions/decode_extensions.c b/CAN-binder/libs/nanopb/tests/extensions/decode_extensions.c
deleted file mode 100644
index e4374380..00000000
--- a/CAN-binder/libs/nanopb/tests/extensions/decode_extensions.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Test decoding of extension fields. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <pb_decode.h>
-#include "alltypes.pb.h"
-#include "extensions.pb.h"
-#include "test_helpers.h"
-
-#define TEST(x) if (!(x)) { \
-    printf("Test " #x " failed.\n"); \
-    return 2; \
-    }
-
-int main(int argc, char **argv)
-{
-    uint8_t buffer[1024];
-    size_t count;
-    pb_istream_t stream;
-    
-    AllTypes alltypes = {0};
-    int32_t extensionfield1;
-    pb_extension_t ext1;
-    ExtensionMessage extensionfield2;
-    pb_extension_t ext2;
-    
-    /* Read the message data */
-    SET_BINARY_MODE(stdin);
-    count = fread(buffer, 1, sizeof(buffer), stdin);
-    stream = pb_istream_from_buffer(buffer, count);
-    
-    /* Add the extensions */
-    alltypes.extensions = &ext1;        
-
-    ext1.type = &AllTypes_extensionfield1;
-    ext1.dest = &extensionfield1;
-    ext1.next = &ext2;
-    
-    ext2.type = &ExtensionMessage_AllTypes_extensionfield2;
-    ext2.dest = &extensionfield2;
-    ext2.next = NULL;
-    
-    /* Decode the message */
-    if (!pb_decode(&stream, AllTypes_fields, &alltypes))
-    {
-        printf("Parsing failed: %s\n", PB_GET_ERROR(&stream));
-        return 1;
-    }
-
-    /* Check that the extensions decoded properly */
-    TEST(ext1.found)
-    TEST(extensionfield1 == 12345)
-    TEST(ext2.found)
-    TEST(strcmp(extensionfield2.test1, "test") == 0)
-    TEST(extensionfield2.test2 == 54321)
-    
-    return 0;
-}
-
diff --git a/CAN-binder/libs/nanopb/tests/extensions/encode_extensions.c b/CAN-binder/libs/nanopb/tests/extensions/encode_extensions.c
deleted file mode 100644
index 00745826..00000000
--- a/CAN-binder/libs/nanopb/tests/extensions/encode_extensions.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Tests extension fields.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pb_encode.h>
-#include "alltypes.pb.h"
-#include "extensions.pb.h"
-#include "test_helpers.h"
-
-int main(int argc, char **argv)
-{
-    uint8_t buffer[1024];
-    pb_ostream_t stream;
-
-    AllTypes alltypes = {0};
-    int32_t extensionfield1 = 12345;
-    pb_extension_t ext1;
-    ExtensionMessage extensionfield2 = {"test", 54321};
-    pb_extension_t ext2;
-
-    /* Set up the extensions */
-    alltypes.extensions = &ext1;
-
-    ext1.type = &AllTypes_extensionfield1;
-    ext1.dest = &extensionfield1;
-    ext1.next = &ext2;
-    
-    ext2.type = &ExtensionMessage_AllTypes_extensionfield2;
-    ext2.dest = &extensionfield2;
-    ext2.next = NULL;
-
-    /* Set up the output stream */
-    stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
-    
-    /* Now encode the message and check if we succeeded. */
-    if (pb_encode(&stream, AllTypes_fields, &alltypes))
-    {
-        SET_BINARY_MODE(stdout);
-        fwrite(buffer, 1, stream.bytes_written, stdout);
-        return 0; /* Success */
-    }
-    else
-    {
-        fprintf(stderr, "Encoding failed: %s\n", PB_GET_ERROR(&stream));
-        return 1; /* Failure */
-    }
-    
-    /* Check that the field tags are properly generated */
-    (void)AllTypes_extensionfield1_tag;
-    (void)ExtensionMessage_AllTypes_extensionfield2_tag;
-}
-
diff --git a/CAN-binder/libs/nanopb/tests/extensions/extensions.options b/CAN-binder/libs/nanopb/tests/extensions/extensions.options
deleted file mode 100644
index a5cd61dd..00000000
--- a/CAN-binder/libs/nanopb/tests/extensions/extensions.options
+++ /dev/null
@@ -1 +0,0 @@
-* max_size:16
diff --git a/CAN-binder/libs/nanopb/tests/extensions/extensions.proto b/CAN-binder/libs/nanopb/tests/extensions/extensions.proto
deleted file mode 100644
index fcd5b43b..00000000
--- a/CAN-binder/libs/nanopb/tests/extensions/extensions.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-syntax = "proto2";
-
-import 'alltypes.proto';
-
-extend AllTypes {
-    optional int32 AllTypes_extensionfield1 = 255 [default = 5];
-}
-
-message ExtensionMessage {
-    extend AllTypes {
-        optional ExtensionMessage AllTypes_extensionfield2 = 254;
-        // required ExtensionMessage AllTypes_extensionfield3 = 253; // No longer allowed by protobuf 3
-        repeated ExtensionMessage AllTypes_extensionfield4 = 252;
-    }
-    
-    required string test1 = 1;
-    required int32 test2 = 2;
-}
-