From b9e1b4435a406a8a27c078ea05dee1240e51704a Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 2 May 2017 18:29:37 +0200
Subject: 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>
---
 .../libs/nanopb/tests/message_sizes/SConscript     | 11 --------
 CAN-binder/libs/nanopb/tests/message_sizes/dummy.c |  9 -------
 .../nanopb/tests/message_sizes/messages1.proto     | 29 ----------------------
 .../nanopb/tests/message_sizes/messages2.proto     | 10 --------
 4 files changed, 59 deletions(-)
 delete mode 100644 CAN-binder/libs/nanopb/tests/message_sizes/SConscript
 delete mode 100644 CAN-binder/libs/nanopb/tests/message_sizes/dummy.c
 delete mode 100644 CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto
 delete mode 100644 CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto

(limited to 'CAN-binder/libs/nanopb/tests/message_sizes')

diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/SConscript b/CAN-binder/libs/nanopb/tests/message_sizes/SConscript
deleted file mode 100644
index e7524e02..00000000
--- a/CAN-binder/libs/nanopb/tests/message_sizes/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-# Test the generation of message size #defines
-
-Import('env')
-
-incpath = env.Clone()
-incpath.Append(PROTOCPATH = '#message_sizes')
-
-incpath.NanopbProto("messages1")
-incpath.NanopbProto("messages2")
-
-incpath.Program(['dummy.c', 'messages1.pb.c', 'messages2.pb.c'])
diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/dummy.c b/CAN-binder/libs/nanopb/tests/message_sizes/dummy.c
deleted file mode 100644
index 767ad463..00000000
--- a/CAN-binder/libs/nanopb/tests/message_sizes/dummy.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Just test that the file can be compiled successfully. */
-
-#include "messages2.pb.h"
-
-int main()
-{
-    return xmit_size;
-}
-
diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto b/CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto
deleted file mode 100644
index b66fad71..00000000
--- a/CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto
+++ /dev/null
@@ -1,29 +0,0 @@
-syntax = "proto2";
-
-enum MessageStatus {
-    FAIL = 0;
-    OK = 1;
-};
-
-message MessageInfo {
-   required fixed32 msg_id = 1;
-   optional fixed32 interface_id = 2;
-}
-
-message MessageResponseInfo {
-   required fixed64 interface_id = 1;
-   required fixed32 seq = 2;
-   required fixed32 msg_id = 3;
-}
-
-message MessageHeader {
-   required MessageInfo info = 1;
-   optional MessageResponseInfo response_info = 2;
-   optional MessageResponse response = 3;
-}
-
-message MessageResponse {
-   required MessageStatus status = 1;
-   required fixed32 seq = 2;
-}
-
diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto b/CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto
deleted file mode 100644
index 67614080..00000000
--- a/CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto2";
-
-import 'nanopb.proto';
-import 'messages1.proto';
-
-message xmit {
-   required MessageHeader header = 1;
-   required bytes data = 2 [(nanopb).max_size = 128];
-}
-
-- 
cgit 1.2.3-korg