CPP Adaption

.github/workflows/build_test_linux.yml

@@ -1,65 +1,70 @@
-name: build_test_linux
+name: Linux Build
+
 on:
   push:
-    branches:
-    - main
+    branches: [ main ]
   pull_request:
-    branches:
-    - main
+    branches: [ main ]
+
 jobs:
-  build_test_linux:
-    name: ${{ matrix.python-version }} on ${{ matrix.os }}
+  build:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
-        os: ["ubuntu-latest"]
-        python-version: ["pypy-3.9",
-                         "pypy-3.8",
-                         # "pypy-3.7",
-                         "3.11",
-                         "3.10",
-                         "3.9",
-                         "3.8",
-                         # "3.7"
-                         ]
+        os: [ubuntu-latest]
+
+    env:
+      CMAKE_BUILD_TYPE: Release
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    - name: Setup py-${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-      # Caching improves build time, we use pythonLocation to cache everything including wheels to avoid building
-      # wheels at each build (pandas/Pypy is extremely time consuming)
-      # sed replacement is performed to rectify PyPy path which ends with /bin
-      # cache key takes into account the Python version of the runner to avoid version mismatch on updates.
-    - name: Get pip cache path
-      id: get-pip-path
-      run: |
-        id=$(echo ${{ env.pythonLocation }} | sed 's/\/bin//g')
-        echo "::set-output name=id::$id"
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up CMake
+        uses: lukka/get-cmake@v3.29.2
+
+      - name: Cache APT packages
+        uses: actions/cache@v4
+        with:
+          path: |
+            /var/cache/apt/archives
+          key: ${{ runner.os }}-apt-${{ hashFiles('**/CMakeLists.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-apt-${{ hashFiles('**/CMakeLists.txt') }}
 
-    - name: Pip cache
-      uses: actions/cache@v3
-      id: pip-cache
-      with:
-        path: ${{ steps.get-pip-path.outputs.id }}
-        key: ${{ steps.get-pip-path.outputs.id }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }}
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            build-essential \
+            libssl-dev \
+            libopencv-dev \
+            libpcap-dev \
+            libpthread-stubs0-dev \
+            git
 
-    - name: Install requirements
-      if: steps.pip-cache.outputs.cache-hit != 'true'
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install -r requirements.txt
+      - name: Install precompiled PcapPlusPlus
+        run: |
+          curl -LO https://github.com/seladb/PcapPlusPlus/releases/download/v25.05/pcapplusplus-25.05-ubuntu-22.04-gcc-11.4.0-x86_64.tar.gz
+          tar -xzf pcapplusplus-25.05-ubuntu-22.04-gcc-11.4.0-x86_64.tar.gz
+          cd pcapplusplus-25.05-ubuntu-22.04-gcc-11.4.0-x86_64
+          sudo cp -r include/* /usr/local/include/
+          sudo cp -r lib/* /usr/local/lib/
+          sudo ldconfig
 
-    - name: Build
-      run: |
-        python -m pip install .
+      - name: Configure and Build
+        run: |
+          cd heiFIP/
 
-    - name: Test
-      if: startsWith(matrix.os, 'ubuntu') && !startsWith(matrix.python-version, '3.10')
-      run: |
-        python -m pytest tests.py
+          mkdir -p build && cd build
+
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DUSE_MANUAL_PCAPPLUSPLUS=ON \
+            -DPcapPlusPlus_INCLUDE_DIRS="/usr/local/include/pcapplusplus/" \
+            -DPcapPlusPlus_LIBRARIES="/usr/local/lib/libCommon++.a;/usr/local/lib/libPacket++.a;/usr/local/lib/libPcap++.a" \
+            -DUSE_MANUAL_OPENSSL=ON \
+            -DOPENSSL_INCLUDE_DIR="/usr/include/openssl" \
+            -DOPENSSL_CRYPTO_LIBRARY="/usr/lib/x86_64-linux-gnu/libcrypto.a"
+
+          make -j$(nproc)

.github/workflows/build_test_macos.yml

@@ -1,67 +1,51 @@
-name: build_test_macos
+name: MacOS Build
+
 on:
   push:
-    branches:
-    - main
+    branches: [ main ]
   pull_request:
-    branches:
-    - main
+    branches: [ main ]
+
 jobs:
-  build_test_macos:
-    name: ${{ matrix.python-version }} on ${{ matrix.os }}
+  build:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
-        os: ["macos-12"]
-        python-version: ["pypy-3.9",
-                         "pypy-3.8",
-                         # "pypy-3.7",
-                         # "3.11",
-                         # Not available yet.
-                         "3.10",
-                         "3.9",
-                         "3.8",
-                         # "3.7"
-                         ]
+        os: [macos-latest]
+
+    env:
+      CMAKE_BUILD_TYPE: Release
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    - name: Setup py-${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-      # Caching improves build time, we use pythonLocation to cache everything including wheels to avoid building
-      # wheels at each build (pandas/Pypy is extremely time consuming)
-      # sed replacement is performed to rectify PyPy path which ends with /bin
-      # cache key takes into account the Python version of the runner to avoid version mismatch on updates.
-    - name: Get pip cache path
-      id: get-pip-path
-      run: |
-        id=$(echo ${{ env.pythonLocation }} | sed 's/\/bin//g')
-        echo "::set-output name=id::$id"
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up CMake
+        uses: lukka/get-cmake@v3.29.2
+
+      - name: Set up Homebrew cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            /Users/runner/Library/Caches/Homebrew
+            /usr/local/Homebrew/Library/Taps
+            /usr/local/Cellar
+          key: ${{ runner.os }}-brew-${{ hashFiles('**/CMakeLists.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-brew-${{ hashFiles('**/CMakeLists.txt') }}
 
-    - name: Pip cache
-      uses: actions/cache@v3
-      id: pip-cache
-      with:
-        path: ${{ steps.get-pip-path.outputs.id }}
-        key: ${{ steps.get-pip-path.outputs.id }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }}
+      - name: Install dependencies
+        run: |
+          brew update
+          brew install openssl opencv libpcap cmake git pcapplusplus
 
-    - name: Install requirements
-      if: steps.pip-cache.outputs.cache-hit != 'true'
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install -r requirements.txt
+      - name: Configure and Build
+        run: |
+          cd heiFIP/
 
-    - name: Build
-      run: |
-        python -m pip install .
+          mkdir -p build && cd build
 
-    - name: Test
-      # On other versions then 3.9, we test only. (without coverage generation)
-      if: startsWith(matrix.os, 'macos') && !startsWith(matrix.python-version, '3.9') && !startsWith(github.ref, 'refs/tags/')
-      run: |
-        python -m pytest tests.py
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=Release
+
+          make