Add MinGW to CI

.github/workflows/package.yml → .github/workflows/linux-packages.yml

@@ -1,4 +1,4 @@
-name: Package
+name: Debian Packages
 
 on:
   workflow_dispatch:
@@ -27,6 +27,6 @@ jobs:
         with:
           path: 'indi'
 
-      - name: Build INDI Core Package
+      - name: Build INDI Core Packages
         run: |
           indi/scripts/indi-core-deb.sh

.github/workflows/pyindi.yml → .github/workflows/linux-pyindi.yml

@@ -9,7 +9,6 @@ on:
     branches:
       - 'master'
 
-
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/windows-mingw.yml

@@ -0,0 +1,60 @@
+name: MinGW
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+    branches:
+      - 'master'
+
+env:
+  # Path to the solution file relative to the root of the project.
+  SOLUTION_FILE_PATH: .
+
+  # Configuration type to build.
+  # You can convert this to a build matrix if you need coverage of multiple configuration types.
+  # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+  BUILD_CONFIGURATION: Debug
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    strategy:
+      matrix:
+        include:
+          - { sys: mingw64, env: x86_64 }
+#         - { sys: mingw32, env: i686 }
+
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{matrix.sys}}
+        update: true
+        install: >-
+          mingw-w64-${{matrix.env}}-openssl
+
+          base-devel
+          mingw-w64-${{matrix.env}}-cmake
+          mingw-w64-${{matrix.env}}-gcc
+          mingw-w64-${{matrix.env}}-libnova
+          zlib-devel
+
+    - name: Get INDI Sources
+      uses: actions/checkout@v3
+
+    - name: Build INDI Core
+      run: |
+        mkdir build
+        cd build
+        cmake .. -DINDI_BUILD_SERVER=OFF -DINDI_BUILD_DRIVERS=OFF
+        cmake --build .

.github/workflows/windows.yml → .github/workflows/windows-visual.yml

@@ -1,4 +1,4 @@
-name: Windows
+name: Visual Studio
 
 on:
   workflow_dispatch:

README.md

@@ -1,9 +1,11 @@
 # INDI Core Library
-[![Linux](https://github.com/indilib/indi/actions/workflows/default.yml/badge.svg)](https://github.com/indilib/indi/actions)
-[![Linux Deb Package](https://github.com/indilib/indi/actions/workflows/package.yml/badge.svg)](https://github.com/indilib/indi/actions)
+
+[![Linux](https://github.com/indilib/indi/actions/workflows/linux.yml/badge.svg)](https://github.com/indilib/indi/actions)
+[![Debian Packages](https://github.com/indilib/indi/actions/workflows/linux-packages.yml/badge.svg)](https://github.com/indilib/indi/actions)
 [![MacOS](https://github.com/indilib/indi/actions/workflows/macos.yml/badge.svg)](https://github.com/indilib/indi/actions)
-[![PyIndi](https://github.com/indilib/indi/actions/workflows/pyindi.yml/badge.svg)](https://github.com/indilib/indi/actions)
-[![Windows Client](https://github.com/indilib/indi/actions/workflows/windows.yml/badge.svg)](https://github.com/indilib/indi/actions)
+[![Visual Studio](https://github.com/indilib/indi/actions/workflows/windows-visual.yml/badge.svg)](https://github.com/indilib/indi/actions)
+[![MinGW](https://github.com/indilib/indi/actions/workflows/windows-mingw.yml/badge.svg)](https://github.com/indilib/indi/actions)
+[![PyIndi](https://github.com/indilib/indi/actions/workflows/linux-pyindi.yml/badge.svg)](https://github.com/indilib/indi/actions)
 
 INDI is a standard for astronomical instrumentation control. INDI Library is an Open Source POSIX implementation of the
 [Instrument-Neutral-Device-Interface protocol](http://www.clearskyinstitute.com/INDI/INDI.pdf).

libs/indicore/CMakeLists.txt

@@ -41,7 +41,7 @@ list(APPEND ${PROJECT_NAME}_SOURCES
     indiuserio.c
 )
 
-if(NOT WIN32)
+if(UNIX)
     list(APPEND ${PROJECT_NAME}_PRIVATE_HEADERS
         sharedblob_parse.h
         shm_open_anon.h)

libs/indidevice/indiutility.cpp

@@ -23,10 +23,31 @@
 #include "indiutility.h"
 #include <cerrno>
 
+#ifdef _MSC_VER
+
+#include <direct.h>
+
+#ifndef S_ISDIR
+#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR)
+#endif
+
+#define mkdir _mkdir
+
+#endif
+
 namespace INDI
 {
 
-#ifndef _WINDOWS
+int mkdir(const char *path, mode_t mode)
+{
+#ifdef _WIN32
+    INDI_UNUSED(mode);
+    return ::mkdir(path);
+#else
+    return ::mkdir(path, mode);
+#endif
+}
+
 int mkpath(std::string s, mode_t mode)
 {
     size_t pre = 0, pos;
@@ -61,7 +82,6 @@ int mkpath(std::string s, mode_t mode)
     }
     return mdret;
 }
-#endif
 
 std::string format_time(const std::tm &tm, const char *format)
 {

libs/indidevice/indiutility.h

@@ -60,16 +60,23 @@ inline static size_t indi_strlcpy(char * dst, const char * src, size_t maxlen)
 
 // C++
 #ifdef __cplusplus
+
+#ifdef _WINDOWS
+typedef unsigned int mode_t;
+#endif
+
 namespace INDI
 {
+/**
+ * @brief Create directory.
+ */
+int mkdir(const char *path, mode_t mode);
 
 /**
  * @brief Create a path directory - this function uses 'mkdir'
- * @note Not available on Windows. Need to use C++17 cross-platform std::filesystem later.
  */
-#ifndef _WINDOWS
 int mkpath(std::string path, mode_t mode);
-#endif
+
 /**
  * @brief Converts the date and time to string - this function uses 'strftime'
  */

libs/sockets/CMakeLists.txt

@@ -18,14 +18,15 @@ list(APPEND ${PROJECT_NAME}_SOURCES
     tcpsocket.cpp
 )
 
-if(WIN32)
+if(UNIX)
     list(APPEND ${PROJECT_NAME}_SOURCES
-        tcpsocket_win.cpp
+        tcpsocket_unix.cpp
     )
 else()
     list(APPEND ${PROJECT_NAME}_SOURCES
-        tcpsocket_unix.cpp
+        tcpsocket_win.cpp
     )
+    target_link_libraries(${PROJECT_NAME} -lws2_32)
 endif()
 
 # Setup Target

libs/sockets/tcpsocket_win.cpp

@@ -18,7 +18,9 @@
 #include "tcpsocket.h"
 #include "tcpsocket_p.h"
 
+#ifdef _MSC_VER
 #pragma comment(lib, "Ws2_32.lib")
+#endif
 
 bool TcpSocketPrivate::createSocket(int domain)
 {