[plc4x] 01/03: - Introduced a plc4c directory layer in the includes

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/c-api
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit eee41309ecfd22fae1a9daa114e22566eb83e17c
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Apr 23 13:50:11 2020 +0200

    - Introduced a plc4c directory layer in the includes
---
 sandbox/plc4c/api/src/main/include/plc4c.h                          | 6 +++---
 .../api/src/main/include/{plc4c_connection.h => plc4c/connection.h} | 2 +-
 .../plc4c/api/src/main/include/{plc4c_system.h => plc4c/system.h}   | 2 +-
 sandbox/plc4c/api/src/main/include/{plc4c_types.h => plc4c/types.h} | 0
 sandbox/plc4c/spi/src/main/c/{plc4c_connection.c => connection.c}   | 4 ++--
 sandbox/plc4c/spi/src/main/c/{plc4c_system.c => system.c}           | 4 ++--
 sandbox/plc4c/spi/src/main/c/{plc4c_types.c => types.c}             | 4 ++--
 .../main/include/{plc4c_types_private.h => plc4c/types_private.h}   | 0
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sandbox/plc4c/api/src/main/include/plc4c.h b/sandbox/plc4c/api/src/main/include/plc4c.h
index 8b4038d..ea09afd 100644
--- a/sandbox/plc4c/api/src/main/include/plc4c.h
+++ b/sandbox/plc4c/api/src/main/include/plc4c.h
@@ -24,9 +24,9 @@ extern "C" {
 
 /* Convenience header file that just imports all the different parts of the API */
 
-#include "plc4c_types.h"
-#include "plc4c_system.h"
-#include "plc4c_connection.h"
+#include "plc4c/types.h"
+#include "plc4c/system.h"
+#include "plc4c/connection.h"
 
 #ifdef __cplusplus
 }
diff --git a/sandbox/plc4c/api/src/main/include/plc4c_connection.h b/sandbox/plc4c/api/src/main/include/plc4c/connection.h
similarity index 96%
rename from sandbox/plc4c/api/src/main/include/plc4c_connection.h
rename to sandbox/plc4c/api/src/main/include/plc4c/connection.h
index b672166..44f4e8b 100644
--- a/sandbox/plc4c/api/src/main/include/plc4c_connection.h
+++ b/sandbox/plc4c/api/src/main/include/plc4c/connection.h
@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 #include <stdbool.h>
-#include "plc4c_types.h"
+#include "types.h"
 
 /**
  * CONNECTION CALLBACKS
diff --git a/sandbox/plc4c/api/src/main/include/plc4c_system.h b/sandbox/plc4c/api/src/main/include/plc4c/system.h
similarity index 99%
rename from sandbox/plc4c/api/src/main/include/plc4c_system.h
rename to sandbox/plc4c/api/src/main/include/plc4c/system.h
index fa5ca9b..bb2a34f 100644
--- a/sandbox/plc4c/api/src/main/include/plc4c_system.h
+++ b/sandbox/plc4c/api/src/main/include/plc4c/system.h
@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 #include <stdbool.h>
-#include "plc4c_types.h"
+#include "types.h"
 
 /**
  * SYSTEM CALLBACKS
diff --git a/sandbox/plc4c/api/src/main/include/plc4c_types.h b/sandbox/plc4c/api/src/main/include/plc4c/types.h
similarity index 100%
rename from sandbox/plc4c/api/src/main/include/plc4c_types.h
rename to sandbox/plc4c/api/src/main/include/plc4c/types.h
diff --git a/sandbox/plc4c/spi/src/main/c/plc4c_connection.c b/sandbox/plc4c/spi/src/main/c/connection.c
similarity index 94%
rename from sandbox/plc4c/spi/src/main/c/plc4c_connection.c
rename to sandbox/plc4c/spi/src/main/c/connection.c
index 54b66e8..d97bf63 100644
--- a/sandbox/plc4c/spi/src/main/c/plc4c_connection.c
+++ b/sandbox/plc4c/spi/src/main/c/connection.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "plc4c_connection.h"
-#include "plc4c_types_private.h"
+#include <plc4c/connection.h>
+#include <plc4c/types_private.h>
 
 return_code plc4c_connection_disconnect(plc4c_connection *connection) {
     return OK;
diff --git a/sandbox/plc4c/spi/src/main/c/plc4c_system.c b/sandbox/plc4c/spi/src/main/c/system.c
similarity index 97%
rename from sandbox/plc4c/spi/src/main/c/plc4c_system.c
rename to sandbox/plc4c/spi/src/main/c/system.c
index 487689e..7e96f05 100644
--- a/sandbox/plc4c/spi/src/main/c/plc4c_system.c
+++ b/sandbox/plc4c/spi/src/main/c/system.c
@@ -18,8 +18,8 @@
  */
 
 #include <stdlib.h>
-#include "plc4c_system.h"
-#include "plc4c_types_private.h"
+#include <plc4c/system.h>
+#include <plc4c/types_private.h>
 
 return_code plc4c_system_create(plc4c_system **system) {
     return OK;
diff --git a/sandbox/plc4c/spi/src/main/c/plc4c_types.c b/sandbox/plc4c/spi/src/main/c/types.c
similarity index 96%
rename from sandbox/plc4c/spi/src/main/c/plc4c_types.c
rename to sandbox/plc4c/spi/src/main/c/types.c
index c82eba6..dd3244e 100644
--- a/sandbox/plc4c/spi/src/main/c/plc4c_types.c
+++ b/sandbox/plc4c/spi/src/main/c/types.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "plc4c_types.h"
-#include "plc4c_types_private.h"
+#include <plc4c/types.h>
+#include <plc4c/types_private.h>
 
 char *plc4c_return_code_to_message(return_code err) {
     return "hurz";
diff --git a/sandbox/plc4c/spi/src/main/include/plc4c_types_private.h b/sandbox/plc4c/spi/src/main/include/plc4c/types_private.h
similarity index 100%
rename from sandbox/plc4c/spi/src/main/include/plc4c_types_private.h
rename to sandbox/plc4c/spi/src/main/include/plc4c/types_private.h