Adding mingw to testing tcp apps.

Signed-off-by: Dusan Cervenka <[email protected]>

Author: Hadatko

.circleci/config.yml

@@ -49,7 +49,8 @@ jobs:
     steps:
       - checkout
       - run: powershell.exe .\install_dependencies.ps1
-      - run: powershell.exe .\mingw64\bin\mingw32-make erpcgen
+      - run: .\mingw64\bin\mingw32-make all
+      - run: .\mingw64\opt\bin\python3.exe .\test\run_unit_tests.py
       # - store_artifacts:
       #     path: ./Release/MINGW64/erpcgen/erpcgen.exe
   build-windows-VS:

erpc_c/Makefile

@@ -63,7 +63,6 @@ SOURCES += 	$(ERPC_C_ROOT)/infra/erpc_arbitrated_client_manager.cpp \
 			$(ERPC_C_ROOT)/infra/erpc_pre_post_action.cpp \
 			$(ERPC_C_ROOT)/port/erpc_port_stdlib.cpp \
 			$(ERPC_C_ROOT)/port/erpc_threading_pthreads.cpp \
-			$(ERPC_C_ROOT)/port/erpc_serial.cpp \
 			$(ERPC_C_ROOT)/setup/erpc_arbitrated_client_setup.cpp \
 			$(ERPC_C_ROOT)/setup/erpc_client_setup.cpp \
 			$(ERPC_C_ROOT)/setup/erpc_setup_mbf_dynamic.cpp \
@@ -72,8 +71,11 @@ SOURCES += 	$(ERPC_C_ROOT)/infra/erpc_arbitrated_client_manager.cpp \
 			$(ERPC_C_ROOT)/setup/erpc_setup_serial.cpp \
 			$(ERPC_C_ROOT)/setup/erpc_setup_tcp.cpp \
 			$(ERPC_C_ROOT)/transports/erpc_inter_thread_buffer_transport.cpp \
-			$(ERPC_C_ROOT)/transports/erpc_serial_transport.cpp \
 			$(ERPC_C_ROOT)/transports/erpc_tcp_transport.cpp
+ifeq "$(is_mingw)" ""
+	SOURCES += $(ERPC_C_ROOT)/transports/erpc_serial_transport.cpp \
+				$(ERPC_C_ROOT)/port/erpc_serial.cpp
+endif
 
 HEADERS += 	$(ERPC_C_ROOT)/config/erpc_config.h \
 			$(ERPC_C_ROOT)/infra/erpc_arbitrated_client_manager.hpp \

erpc_c/port/erpc_config_internal.h

@@ -22,7 +22,8 @@
 #if !defined(ERPC_HAS_POSIX)
     // Detect Linux, BSD, Cygwin, and Mac OS X.
     #if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
-        defined(__OpenBSD__) || defined(__DragonFly__) || defined(__CYGWIN__) || defined(__MACH__)
+        defined(__OpenBSD__) || defined(__DragonFly__) || defined(__CYGWIN__) || defined(__MACH__) || \
+        defined(__MINGW32__)
         #define ERPC_HAS_POSIX (1)
     #else
         #define ERPC_HAS_POSIX (0)

erpc_c/port/erpc_port_stdlib.cpp

@@ -15,6 +15,7 @@
 
 using namespace std;
 
+#if !defined(__MINGW32__)
 void *operator new(size_t count) THROW_BADALLOC
 {
     void *p = erpc_malloc(count);
@@ -62,6 +63,7 @@ void operator delete[](void *ptr, std::size_t count) THROW NOEXCEPT
     (void)count;
     erpc_free(ptr);
 }
+#endif
 
 void *erpc_malloc(size_t size)
 {

erpc_c/transports/erpc_tcp_transport.cpp

@@ -13,30 +13,34 @@
 #include <string>
 
 extern "C" {
+// Set this to 1 to enable debug logging.
+// TODO fix issue with the transport not working on Linux if debug logging is disabled.
+//#define TCP_TRANSPORT_DEBUG_LOG (1)
+
+#if TCP_TRANSPORT_DEBUG_LOG
 #if ERPC_HAS_POSIX
+#if defined(__MINGW32__)
+#error Missing implementation for mingw.
+#endif
 #include <err.h>
 #endif
+#endif
 #include <errno.h>
 #if defined(__MINGW32__)
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #include <ws2def.h>
 #else
 #include <netdb.h>
 #include <netinet/tcp.h>
+#include <sys/socket.h>
 #endif
 #include <signal.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 }
 
 using namespace erpc;
 
-// Set this to 1 to enable debug logging.
-// TODO fix issue with the transport not working on Linux if debug logging is disabled.
-//#define TCP_TRANSPORT_DEBUG_LOG (1)
-
 #if TCP_TRANSPORT_DEBUG_LOG
 #define TCP_DEBUG_PRINT(_fmt_, ...) printf(_fmt_, ##__VA_ARGS__)
 #define TCP_DEBUG_ERR(_msg_) err(errno, _msg_)

erpc_c/transports/erpc_tcp_transport.hpp

@@ -9,13 +9,13 @@
 #ifndef _EMBEDDED_RPC__TCP_TRANSPORT_H_
 #define _EMBEDDED_RPC__TCP_TRANSPORT_H_
 
-#include "erpc_framed_transport.hpp"
-#include "erpc_threading.h"
-
 #if defined(__MINGW32__)
 #include <winsock2.h>
 #endif
 
+#include "erpc_framed_transport.hpp"
+#include "erpc_threading.h"
+
 /*!
  * @addtogroup tcp_transport
  * @{

erpcgen/src/templates/c_common_functions.template

@@ -27,7 +27,11 @@
 {% if empty(crc16) == false %}
 // for mdk/keil do not forgett add "--muldefweak" for linker
 extern const uint32_t erpc_generated_crc;
+#if defined(__MINGW32__)
+__declspec( selectany )
+#else
 #pragma weak erpc_generated_crc
+#endif
 extern const uint32_t erpc_generated_crc = {$crc16};
 {% endif  -- empty(crc16) == false %}
 {% enddef --checkCrc %}
@@ -38,7 +42,11 @@ extern const uint32_t erpc_generated_crc = {$crc16};
 
 // Constant variable definitions
 {%  for c in consts %}
+#if defined(__MINGW32__)
+__declspec( selectany )
+#else
 #pragma weak {$c.name}
+#endif
 extern const {$c.typeAndName} = {$c.value};
 {%  endfor -- consts %}
 {% endif %}

mk/common.mk

@@ -75,7 +75,11 @@ else
     # Set to 1 if running on Linux.
     is_linux := $(and $(findstring Linux,$(os_name)),1)
 
-    is_mingw := $(and $(findstring MSYS_NT,$(os_name)),1)
+    # Set to 1 if running on Windows under Mingw.
+    is_mingw := $(and $(findstring MINGW,$(os_name)),1)
+    ifeq "$(is_mingw)" ""
+        is_mingw := $(and $(findstring MSYS_NT,$(os_name)),1)
+    endif
 endif
 
 ifeq "$(is_mingw)" "1"

mk/flags.mk

@@ -68,10 +68,6 @@ else
     CXXFLAGS += -g3 -O0 -DDEBUG -DYYDEBUG=1
 endif
 
-ifneq "$(is_mingw)" "1"
-    LIBRARIES += -lc
-endif
-
 ifneq "$(is_cygwin)" "1"
     LIBRARIES += -lstdc++
 endif
@@ -81,3 +77,9 @@ ifeq "$(is_linux)" "1"
 endif
 
 LIBRARIES += -lm
+
+ifeq "$(is_mingw)" "1"
+    LIBRARIES += -pthread -lws2_32
+else
+    LIBRARIES += -lc
+endif

mk/targets.mk

@@ -122,8 +122,8 @@ $(MAKE_TARGET): $(OBJECTS_ALL)
 	@$(call printmessage,link,Linking, $(APP_NAME))
 	$(at)$(LD) $(LDFLAGS) \
 		$(OBJECTS_ALL) \
-		$(LIBRARIES) \
-		-o $@
+		-o $@ \
+		$(LIBRARIES)
 	@echo "Output binary:" ; echo "  $(APP_NAME)"
 
 endif