FEAT: Transition to CMake

.github/scripts/install-macos-build-deps.sh

@@ -8,7 +8,7 @@ brew update
 brew outdated openssl || brew upgrade openssl
 
 # Install packages needed to build lib-secp256k1
-for pkg in automake libtool pkg-config; do
+for pkg in pkg-config; do
  brew list $pkg > /dev/null || brew install $pkg
  brew outdated --quiet $pkg || brew upgrade $pkg
 done

.github/workflows/build.yml

@@ -17,11 +17,14 @@ concurrency:
 env:
  COINCURVE_UPSTREAM_REF: 1ad5185cd42c0636104129fcc9f6a4bf9c67cc40
  COINCURVE_IGNORE_SYSTEM_LIB: '1'
- CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8"
- CIBW_BEFORE_ALL_MACOS: ./.github/scripts/install-macos-build-deps.sh
+ # Only 'SHARED' is recognized, any other string means 'not SHARED'
+ COINCURVE_SECP256K1_BUILD: 'STATIC'
  CIBW_ENVIRONMENT_PASS_LINUX: >
  COINCURVE_UPSTREAM_REF
  COINCURVE_IGNORE_SYSTEM_LIB
+ COINCURVE_SECP256K1_BUILD
+ CIBW_PROJECT_REQUIRES_PYTHON: '>=3.8'
+ CIBW_BEFORE_ALL_MACOS: ./.github/scripts/install-macos-build-deps.sh
  CIBW_TEST_REQUIRES: pytest pytest-benchmark
  CIBW_TEST_COMMAND: >
  python -c
@@ -113,29 +116,98 @@ jobs:
  if-no-files-found: error
 
  macos-wheels-arm:
- name: Build macOS wheels for ARM
+ name: Build macOS wheels for ARM (Native)
  needs:
  - test
- runs-on: macos-latest
+ runs-on: macos-14
 
  steps:
  - uses: actions/checkout@v4
 
  - name: Build wheels
  uses: pypa/cibuildwheel@v2.17
- env:
- CIBW_ARCHS_MACOS: arm64
- COINCURVE_CROSS_HOST: aarch64-apple-darwin
- CFLAGS: -target arm64-apple-macos11
 
  - uses: actions/upload-artifact@v4
  with:
  name: artifact-macos-wheels-arm
  path: wheelhouse/*.whl
  if-no-files-found: error
 
- windows-wheels-and-sdist:
- name: Build Windows wheels and source distribution
+ windows-wheels-x86_64:
+ name: Build Windows wheels AMD64
+ needs:
+ - test
+ runs-on: windows-latest
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - uses: actions/setup-python@v5
+ with:
+ python-version: '3.12'
+
+ - name: Build wheels
+ uses: pypa/cibuildwheel@v2.17
+ env:
+ CIBW_ARCHS_WINDOWS: 'AMD64'
+ CIBW_BEFORE_ALL: choco install -y --no-progress --no-color cmake>=3.28 pkgconfiglite
+
+ - uses: actions/upload-artifact@v4
+ with:
+ name: artifact-windows-wheels-x86_64
+ path: wheelhouse/*.whl
+ if-no-files-found: error
+
+ windows-wheels-x86:
+ name: Build Windows wheels x86
+ needs:
+ - test
+ runs-on: windows-latest
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - uses: actions/setup-python@v5
+ with:
+ python-version: '3.12'
+
+ - name: Build wheels
+ uses: pypa/cibuildwheel@v2.17
+ env:
+ COINCURVE_CROSS_HOST: 'x86'
+ CIBW_ARCHS_WINDOWS: 'x86'
+ CIBW_BEFORE_ALL: choco install -y --no-progress --no-color cmake>=3.28 pkgconfiglite
+
+ - uses: actions/upload-artifact@v4
+ with:
+ name: artifact-windows-wheels-x86
+ path: wheelhouse/*.whl
+ if-no-files-found: error
+
+ windows-wheels-arm:
+ name: Build Windows wheels for ARM64
+ needs:
+ - test
+ runs-on: windows-latest
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Build wheels
+ uses: pypa/cibuildwheel@v2.17
+ env:
+ COINCURVE_CROSS_HOST: 'arm64'
+ CIBW_ARCHS_WINDOWS: 'ARM64'
+ CIBW_BEFORE_ALL: choco install -y --no-progress --no-color cmake>=3.28 pkgconfiglite
+
+ - uses: actions/upload-artifact@v4
+ with:
+ name: artifact-windows-wheels-arm
+ path: wheelhouse/*.whl
+ if-no-files-found: error
+
+ sdist:
+ name: Build source distribution
  needs:
  - test
  runs-on: ubuntu-latest
@@ -149,12 +221,9 @@ jobs:
  - name: Build source distribution
  run: python -m build --sdist
 
- - name: Build Windows wheels
- run: ./.github/scripts/build-windows-wheels.sh
-
  - uses: actions/upload-artifact@v4
  with:
- name: artifact-windows-wheels-and-sdist
+ name: artifact-sdist
  path: dist/*
  if-no-files-found: error
 
@@ -193,7 +262,10 @@ jobs:
  - linux-wheels-standard
  - macos-wheels-x86_64
  - macos-wheels-arm
- - windows-wheels-and-sdist
+ - windows-wheels-x86_64
+ - windows-wheels-x86
+ - windows-wheels-arm
+ - sdist
  - linux-wheels-arm
  runs-on: ubuntu-latest
  if: >

_cffi_build/build.py

@@ -1,36 +1,77 @@
+import argparse
+import logging
 import os
 from collections import namedtuple
+from typing import List
 
 from cffi import FFI
 
+logging.basicConfig(level=logging.INFO)
+
 here = os.path.dirname(os.path.abspath(__file__))
 
 Source = namedtuple('Source', ('h', 'include'))
 
 
-def _mk_ffi(sources, name='_libsecp256k1', **kwargs):
+def gather_sources_from_directory(directory: str) -> List[Source]:
+ """
+ Gather source files from a given directory.
+
+ :param directory: The directory where source files are located.
+ :return: A list of Source namedtuples.
+ """
+ sources = []
+ for filename in os.listdir(directory):
+ if filename.endswith('.h'):
+ include_line = f'#include <{filename}>'
+ sources.append(Source(filename, include_line))
+ return sorted(sources)
+
+
+define_static_lib = """
+#if defined(_WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+# define SECP256K1_STATIC 1
+#endif
+"""
+
+
+def mk_ffi(sources: List[Source],
+ static_lib: bool = False,
+ name: str = '_libsecp256k1') -> FFI:
+ """
+ Create an FFI object.
+
+ :param sources: A list of Source namedtuples.
+ :param static_lib: Whether to generate a static lib in Windows.
+ :param name: The name of the FFI object.
+ :return: An FFI object.
+ """
  _ffi = FFI()
- code = []
+ code = [define_static_lib] if static_lib else []
 
+ logging.info(f' Static {static_lib}...')
  for source in sources:
  with open(os.path.join(here, source.h)) as h:
- _ffi.cdef(h.read())
+ logging.info(f' Including {source.h}...')
+ c_header = h.read().replace('SECP256K1_API', '')
+ _ffi.cdef(c_header)
+
  code.append(source.include)
 
  code.append('#define PY_USE_BUNDLED')
- _ffi.set_source(name, '\n'.join(code), **kwargs)
+ _ffi.set_source(name, '\n'.join(code))
 
  return _ffi
 
 
-modules = [
- Source('secp256k1.h', '#include <secp256k1.h>'),
- Source('secp256k1_ecdh.h', '#include <secp256k1_ecdh.h>'),
- Source('secp256k1_extrakeys.h', '#include <secp256k1_extrakeys.h>'),
- Source('secp256k1_recovery.h', '#include <secp256k1_recovery.h>'),
- Source('secp256k1_schnorrsig.h', '#include <secp256k1_schnorrsig.h>'),
- Source('secp256k1_ellswift.h', '#include <secp256k1_ellswift.h>'),
- Source('secp256k1_preallocated.h', '#include <secp256k1_preallocated.h>'),
-]
+if __name__ == '__main__':
+ logging.info('Starting CFFI build process...')
+ parser = argparse.ArgumentParser(description='Generate C code using CFFI.')
+ parser.add_argument('c_file', help='Generated C code filename.')
+ parser.add_argument('static_lib', help='Generate static lib in Windows.', default='0', type=str)
+ args = parser.parse_args()
 
-ffi = _mk_ffi(modules, libraries=['secp256k1'])
+ modules = gather_sources_from_directory(here)
+ ffi = mk_ffi(modules, args.static_lib == '1')
+ ffi.emit_c_code(args.c_file)
+ logging.info(f' Generated C code: {args.c_file}')