Fix win compile (#14)

* Fix cmake build utf8 support

* Fix windows cmake takes --paralel

* Fix windows can't find dll

* refractor extension name to avoid namespace collision

* make source build static

* make source build static

* make autoconf build force static

Author: Qubitium

README.md

@@ -208,5 +208,5 @@ location.
 - All internal buffers (match data wrappers, JIT stack cache entries, error
   formatting scratch space) use the chosen allocator; CPython’s `PyMem_*`
   family is no longer used within the extension.
-- Call `pcre.cpcre2.get_allocator()` to inspect which backend is active at
+- Call `pcre_ext_c.get_allocator()` to inspect which backend is active at
   runtime.

pcre/__init__.py

@@ -6,7 +6,7 @@
 """High level Python bindings for PCRE2.
 
 This package exposes a Pythonic API on top of the low-level C extension found in
-``pcre.cpcre2``. The wrapper keeps friction low compared to :mod:`re` while
+``pcre_ext_c``. The wrapper keeps friction low compared to :mod:`re` while
 surfacing PCRE2-specific flags and behaviours.
 """
 
@@ -16,7 +16,9 @@
 from enum import IntEnum, IntFlag
 from typing import Any
 
-from . import cpcre2
+import pcre_ext_c as _backend
+
+pcre_ext_c = _backend
 from .cache import get_cache_limit, set_cache_limit
 from .flags import PY_ONLY_FLAG_MEMBERS
 from .pcre import (
@@ -42,17 +44,17 @@
 from .threads import configure_threads
 
 
-__version__ = getattr(cpcre2, "__version__", "0.0")
+__version__ = getattr(_backend, "__version__", "0.0")
 
-_cpu_ascii_vector_mode = getattr(cpcre2, "_cpu_ascii_vector_mode", None)
+_cpu_ascii_vector_mode = getattr(_backend, "_cpu_ascii_vector_mode", None)
 
 _FLAG_MEMBERS: dict[str, int] = {}
 _ERROR_CODE_MEMBERS: dict[str, int] = {}
 
-for _name in dir(cpcre2):
+for _name in dir(_backend):
     if not _name.startswith("PCRE2_"):
         continue
-    _value = getattr(cpcre2, _name)
+    _value = getattr(_backend, _name)
     if not isinstance(_value, int):
         continue
 
@@ -94,9 +96,9 @@ def _error_code_property(self) -> PcreErrorCode | None:
 
 
 _EXPORTED_ERROR_CLASSES: list[str] = []
-for _name in dir(cpcre2):
+for _name in dir(_backend):
     if _name.startswith("PcreError") and _name != "PcreError":
-        globals()[_name] = getattr(cpcre2, _name)
+        globals()[_name] = getattr(_backend, _name)
         _EXPORTED_ERROR_CLASSES.append(_name)
 
 

pcre/cache.py

@@ -11,7 +11,7 @@
 from threading import RLock
 from typing import Any, Callable, Tuple, TypeVar
 
-from . import cpcre2 as _pcre2
+import pcre_ext_c as _pcre2
 
 
 T = TypeVar("T")

pcre/flags.py

@@ -9,7 +9,7 @@
 
 from typing import Dict
 
-from . import cpcre2 as _pcre2
+import pcre_ext_c as _pcre2
 
 
 def _collect_native_flag_values() -> list[int]:

pcre/pcre.py

@@ -12,7 +12,7 @@
 from re import _parser
 from typing import Any, List
 
-from . import cpcre2 as _pcre2
+import pcre_ext_c as _pcre2
 from .cache import cached_compile
 from .cache import clear_cache as _clear_cache
 from .flags import (
@@ -167,7 +167,7 @@ def _call_with_optional_end(method, subject: Any, pos: int, endpos: int | None,
 
 
 class Pattern:
-    """High-level wrapper around the C-backed :class:`cpcre2.Pattern`."""
+    """High-level wrapper around the C-backed :class:`pcre_ext_c.Pattern`."""
 
     __slots__ = ("_pattern", "_groups_hint", "_thread_mode")
 

pcre/re_compat.py

@@ -12,7 +12,7 @@
 from re import _parser
 from typing import Any, List
 
-from . import cpcre2 as _pcre2
+import pcre_ext_c as _pcre2
 
 
 _CRawMatch = _pcre2.Match

pcre_ext/pcre2.c

@@ -2031,7 +2031,7 @@ static PyMethodDef module_methods[] = {
 
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
-    .m_name = "pcre.cpcre2",
+    .m_name = "pcre_ext_c",
     .m_doc = "Low-level bindings to the PCRE2 regular expression engine.",
     .m_size = -1,
     .m_methods = module_methods,
@@ -2096,7 +2096,7 @@ detect_offset_limit_support(void)
 }
 
 PyMODINIT_FUNC
-PyInit_cpcre2(void)
+PyInit_pcre_ext_c(void)
 {
     if (PyType_Ready(&PatternType) < 0) {
         return NULL;

setup.py

@@ -9,6 +9,7 @@
 from pathlib import Path
 
 from setuptools import Extension, setup
+from setuptools.command.build_ext import build_ext
 
 ROOT_DIR = Path(__file__).resolve().parent
 if str(ROOT_DIR) not in sys.path:
@@ -18,9 +19,9 @@
 
 
 EXTENSION = Extension(
-    name="pcre.cpcre2",
+    name="pcre_ext_c",
     sources=MODULE_SOURCES,
     **collect_build_config(),
 )
 
-setup(ext_modules=[EXTENSION])
+setup(ext_modules=[EXTENSION], cmdclass={"build_ext": build_ext})

setup_utils.py

@@ -15,14 +15,10 @@
 from collections.abc import Callable
 from pathlib import Path
 
-try:
-    from setuptools._distutils.ccompiler import CCompiler, new_compiler
-    from setuptools._distutils.errors import CCompilerError, DistutilsExecError
-    from setuptools._distutils.sysconfig import customize_compiler
-except ImportError:  # pragma: no cover - fallback for older Python environments
-    from distutils.ccompiler import CCompiler, new_compiler  # type: ignore
-    from distutils.errors import CCompilerError, DistutilsExecError  # type: ignore
-    from distutils.sysconfig import customize_compiler  # type: ignore
+
+from setuptools._distutils.ccompiler import CCompiler, new_compiler
+from setuptools._distutils.errors import CCompilerError, DistutilsExecError
+from setuptools._distutils.sysconfig import customize_compiler
 
 
 ROOT_DIR = Path(__file__).resolve().parent
@@ -51,7 +47,9 @@
 
 LIBRARY_BASENAME = "libpcre2-8"
 
-__all__ = ["MODULE_SOURCES", "collect_build_config"]
+RUNTIME_LIBRARY_FILES: list[str] = []
+
+__all__ = ["MODULE_SOURCES", "collect_build_config", "RUNTIME_LIBRARY_FILES"]
 
 
 def _run_pkg_config(*args: str) -> list[str]:
@@ -221,9 +219,10 @@ def _has_built_library() -> bool:
                     "-B",
                     str(build_dir),
                     "-DPCRE2_SUPPORT_JIT=ON",
-                    "-DPCRE2_BUILD_PCRE2_16=ON",
+                    "-DPCRE2_BUILD_PCRE2_8=ON",
                     "-DPCRE2_BUILD_TESTS=OFF",
-                    "-DBUILD_SHARED_LIBS=ON",
+                    "-DBUILD_SHARED_LIBS=OFF",   # don't build DLLs
+                    "-DPCRE2_STATIC=ON",         # ensure static linking symbols are used
                 ]
                 if not _is_windows_platform():
                     cmake_args.append("-DCMAKE_BUILD_TYPE=Release")
@@ -235,8 +234,9 @@ def _has_built_library() -> bool:
                     str(build_dir),
                 ]
                 if _is_windows_platform():
-                    build_command.extend(["--config", "Release"])
-                build_command.extend(["--", "-j4"])
+                    build_command.extend(["--config", "Release", "--parallel", "4"])
+                else:
+                    build_command.extend(["--", "-j4"])
                 subprocess.run(build_command, cwd=destination, env=env, check=True)
             except (FileNotFoundError, subprocess.CalledProcessError) as exc:
                 cmake_error = exc
@@ -255,6 +255,8 @@ def _has_built_library() -> bool:
                         "--enable-jit",
                         "--enable-pcre2-8",
                         "--disable-tests",
+                        "--enable-static",
+                        "--disable-shared",
                     ]
                     subprocess.run(configure_command, cwd=build_dir, env=env, check=True)
                     subprocess.run(["make", "-j4"], cwd=build_dir, env=env, check=True)
@@ -452,6 +454,9 @@ def _augment_compile_flags(flags: list[str]) -> None:
     if _is_truthy_env("PCRE2_DISABLE_OPT_FLAGS"):
         return
 
+    if _is_windows_platform():
+        return
+
     disable_native = _is_truthy_env("PCRE2_DISABLE_NATIVE_FLAGS")
     compiler = _get_test_compiler()
     if not disable_native and _should_disable_native_flags_for_macos(compiler):
@@ -789,7 +794,7 @@ def collect_build_config() -> dict[str, list[str] | list[tuple[str, str | None]]
     if env_ldflags:
         extra_link_args.extend(shlex.split(env_ldflags))
 
-    if not any(flag.startswith("-std=") for flag in extra_compile_args):
+    if not _is_windows_platform() and not any(flag.startswith("-std=") for flag in extra_compile_args):
         extra_compile_args.append("-std=c99")
 
     if not _has_header(include_dirs):
@@ -798,7 +803,15 @@ def collect_build_config() -> dict[str, list[str] | list[tuple[str, str | None]]
     if not _has_library(library_dirs):
         library_dirs.extend(_discover_library_dirs())
 
+    global RUNTIME_LIBRARY_FILES
+    runtime_libraries: list[str] = []
+
     if library_files:
+        for runtime_path in library_files:
+            lower_name = runtime_path.lower()
+            if lower_name.endswith(".dll") or lower_name.endswith(".dylib") or ".so" in Path(runtime_path).name:
+                _extend_unique(runtime_libraries, runtime_path)
+
         linkable_files: list[str] = []
         for path in library_files:
             suffix = Path(path).suffix.lower()
@@ -821,8 +834,18 @@ def collect_build_config() -> dict[str, list[str] | list[tuple[str, str | None]]
     if sys.platform.startswith("linux") and "dl" not in libraries:
         libraries.append("dl")
 
+    if _is_windows_platform():
+        has_runtime_dll = any(path.lower().endswith(".dll") for path in runtime_libraries)
+        force_static_env = _is_truthy_env("PCRE2_FORCE_STATIC")
+        if (force_static_env or (library_files and not has_runtime_dll)) and not any(
+            macro[0] == "PCRE2_STATIC" for macro in define_macros
+        ):
+            define_macros.append(("PCRE2_STATIC", "1"))
+
     _augment_compile_flags(extra_compile_args)
 
+    RUNTIME_LIBRARY_FILES = runtime_libraries
+
     return {
         "include_dirs": include_dirs,
         "library_dirs": library_dirs,

tests/test_api_parity.py

@@ -7,11 +7,12 @@
 from enum import IntFlag
 
 import pcre
+import pcre_ext_c
 import pytest
 from pcre import Flag
 
 
-BACKEND = getattr(pcre, "cpcre2", getattr(pcre, "_pcre2", None))
+BACKEND = pcre_ext_c
 
 
 def test_purge_aliases_clear_cache():