Merge pull request #5 from Prevter/main

Update Broma, switch to CMake, fix Linux and CI

Author: CallocGD

.github/workflows/build.yml

@@ -0,0 +1,42 @@
+name: Build PyBroma
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: Windows
+            os: windows-latest
+          - name: macOS
+            os: macos-latest
+          - name: Linux
+            os: ubuntu-latest
+        python-version: ["3.11", "3.12", "3.13"]
+
+    name: Build ${{ matrix.config.name }} for ${{ matrix.python-version }}
+    runs-on: ${{ matrix.config.os }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install scikit-build cython wheel cmake ninja
+
+      - name: Build
+        run: pip wheel . --no-deps --wheel-dir dist
+
+      - name: Upload wheel
+        uses: actions/upload-artifact@v4
+        with:
+          name: pybroma-${{ matrix.config.name }}-${{ matrix.python-version }}
+          path: dist/*.whl

.gitignore

@@ -1,4 +1,11 @@
 *.pyd
 build
+
+# Auto-generated/output files
+_skbuild/
+*.egg-info/
+pybroma/PyBroma.cpp
+*.whl
+
 # External unittests I'll make a seperate repo for these in the future - Calloc
 tests

.gitmodules

@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.21)
+project(PyBroma)
+
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON) # fix for -fPIC
+
+include(cmake/CPM.cmake)
+CPMAddPackage("gh:geode-sdk/broma#aad1438")
+
+add_subdirectory(pybroma)

CMakeLists.txt

@@ -58,12 +58,8 @@ more efficiently. Including creating ghidra headerfiles that ghidra can understa
 I may not get to that due to the required 2FA stuff because scammers were using pypi to host malicious malware. I hear you can use a usb stick (thumbdrive) so know that I am thinking about buying up a few more usb sticks for this.
 
 # How To Install
-You need to clone this repository locally to install the library:
-1. `git clone https://github.com/CallocGD/PyBroma.git --recursive`
-2. `python setup.py build_ext --inplace`
-3. `pip install -U .`
-
-Installation using a zip archive of the repository is not available because it doesn't contain the broma submodule because of it not being in a mature state as of yet and it has been subject to constantly changing.
+Run this command to install the library:
+`pip install git+https://github.com/CallocGD/PyBroma`
 
 Also Some parsing Error Features may not be avalible just yet so don't complain to me if it crashes broma does not have a clean way to handle errors yet to my knowlege.
 

README.md

@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: MIT
+#
+# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
+
+set(CPM_DOWNLOAD_VERSION 0.40.8)
+set(CPM_HASH_SUM "78ba32abdf798bc616bab7c73aac32a17bbd7b06ad9e26a6add69de8f3ae4791")
+
+if(CPM_SOURCE_CACHE)
+  set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+elseif(DEFINED ENV{CPM_SOURCE_CACHE})
+  set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+else()
+  set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+endif()
+
+# Expand relative path. This is important if the provided path contains a tilde (~)
+get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
+
+file(DOWNLOAD
+     https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+     ${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
+)
+
+include(${CPM_DOWNLOAD_LOCATION})

cmake/CPM.cmake

@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.21)
+
+project(PyBroma)
+find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+
+set(CYTHON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.cpp)
+set(PYX_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pyx)
+add_custom_command(
+    OUTPUT ${CYTHON_SRC}
+    COMMAND ${Python3_EXECUTABLE} -m cython -3 --cplus ${PYX_SRC} -o ${CYTHON_SRC}
+    DEPENDS ${PYX_SRC}
+)
+
+add_library(${PROJECT_NAME} MODULE ${CYTHON_SRC})
+
+target_include_directories(${PROJECT_NAME} PRIVATE ${Python3_INCLUDE_DIRS})
+target_link_libraries(${PROJECT_NAME} PRIVATE Broma ${Python3_LIBRARIES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})

pybroma/CMakeLists.txt

@@ -8,7 +8,7 @@ from libcpp.utility cimport pair
 
 ctypedef long long ptrdiff_t
 
-cdef extern from "include/broma/include/ast.hpp" namespace "broma" nogil:
+cdef extern from "ast.hpp" namespace "broma" nogil:
 
     enum class Platform:
         pass
@@ -102,7 +102,7 @@ cdef extern from "include/broma/include/ast.hpp" namespace "broma" nogil:
 
 
 
-cdef extern from "include/helper.hpp" nogil:
+cdef extern from "helper.hpp" nogil:
     InlineField* Field_GetAs_InlineField(Field* f)
     FunctionBindField* Field_GetAs_FunctionBindField(Field* f)
     PadField* Field_GetAs_PadField(Field* f)
@@ -132,5 +132,5 @@ cdef extern from "include/helper.hpp" nogil:
     PyPlatform fix_platformname(Platform platform)
 
 
-cdef extern from "include/Broma/include/broma.hpp" namespace "broma" nogil:
+cdef extern from "broma.hpp" namespace "broma" nogil:
     Root parse_file(string fname)

pybroma/broma.pxd

@@ -1,8 +1,8 @@
 #ifndef __HELPER_HPP__
 #define __HELPER_HPP__
 
-#include "Broma/include/broma.hpp"
-#include "Broma/include/ast.hpp"
+#include <broma.hpp>
+#include <ast.hpp>
 
 /* Used as a primary helpers around Field's variant and other Types since variants
 are not supported by cython yet as far as I am aware... */