Support msys2 and add CI jobs ##build

radareorg · Nov 29, 2024 · 988ddeb · 988ddeb
1 parent ce04bb2
commit 988ddeb
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -523,7 +523,35 @@ jobs:
         path: |
           radare2-${{ steps.r2v.outputs.branch }}-w64.zip
 #          radare2-win-installer\Output\radare2.exe
-
+  msys2-w64-meson:
+    strategy:
+      fail-fast: false
+      matrix:
+        sys: [MINGW64, UCRT64]
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.sys }}
+        update: true
+        install: base-devel git
+        pacboy: >-
+          cc:p
+          meson:p
+          ninja:p
+    - name: Configure Build
+      shell: msys2 {0}
+      run: |
+        prefix=$(case "${{ matrix.sys }}" in
+          MINGW64) echo /mingw64 ;;
+          UCRT64) echo /ucrt64 ;;
+        esac)
+        meson setup build --prefix=$prefix
+    - name: Compile Project
+      shell: msys2 {0}
+      run: meson compile -C build
 
   # FreeBSD
 #  freebsd:

diff --git a/libr/debug/p/debug_windbg.c b/libr/debug/p/debug_windbg.c
@@ -116,7 +116,7 @@ static RDebugReasonType exception_to_reason(DWORD ExceptionCode) {
 	}
 }
 
-static int windbg_stop(RDebug *dbg) {
+static bool windbg_stop(RDebug *dbg) {
 	DbgEngContext *idbg = dbg->user;
 	R_RETURN_VAL_IF_FAIL (idbg && idbg->initialized, 0);
 	return SUCCEEDED (ITHISCALL (dbgCtrl, SetInterrupt, DEBUG_INTERRUPT_ACTIVE));

diff --git a/libr/include/r_th.h b/libr/include/r_th.h
@@ -8,6 +8,7 @@
 #include "r_types.h"
 #include "r_userconf.h"
 #include <r_list.h>
+#include <r_util/r_w32.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/libr/include/r_types.h b/libr/include/r_types.h
@@ -288,6 +288,9 @@
 
 #if __MINGW32__
 #include <sys/time.h>
+#include <unistd.h>
+#define PFMT64x "I64x"
+#define PFMT64x PRIx64
 #endif
 
 

diff --git a/libr/include/r_util/r_w32.h b/libr/include/r_util/r_w32.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#if R2__WINDOWS__
+#if R2__WINDOWS__ || __MINGW32__
 #include <windows.h> // CreateToolhelp32Snapshot
 #include <tlhelp32.h> // CreateToolhelp32Snapshot
 #include <psapi.h> // GetModuleFileNameEx, GetProcessImageFileName

diff --git a/libr/util/w32.c b/libr/util/w32.c
@@ -3,7 +3,7 @@
 #include <r_userconf.h>
 #include <r_util.h>
 
-#if R2__WINDOWS__
+#if R2__WINDOWS__ || __MINGW32__
 #include <windows.h>
 
 #if 1