cppcheck-py 2.21.1__tar.gz → 2.22.0__tar.gz

{cppcheck_py-2.21.1 → cppcheck_py-2.22.0}/.gitignore

@@ -180,3 +180,5 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
+
+third_party/

cppcheck_py-2.22.0/CMakeLists.txt

@@ -0,0 +1,103 @@
+cmake_minimum_required(VERSION 3.28...4.0)
+project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION})
+
+message(STATUS "cppcheck-wheel version: ${SKBUILD_PROJECT_VERSION}")
+string(
+    REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+)"
+    CPPCHECK_VERSION
+    "${SKBUILD_PROJECT_VERSION}"
+)
+message(STATUS "cppcheck version: ${CPPCHECK_VERSION}")
+
+# Check if the current compiler/linker toolchain supports IPO
+include(CheckIPOSupported)
+check_ipo_supported(RESULT ipo_supported OUTPUT ipo_error)
+
+if(ipo_supported)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+    message(STATUS "IPO/LTO enabled")
+else()
+    message(WARNING "IPO/LTO not supported: ${ipo_error}")
+endif()
+
+# Check for the execinfo header, needed for backtraces support.
+include(CheckIncludeFileCXX)
+check_include_file_cxx("execinfo.h" HAVE_EXECINFO_H)
+
+# Values cppcheck's own CMakeLists.txt will pick up as already-set variables
+# (equivalent to the old -DFOO=... CMAKE_ARGS passed to the nested build).
+if(NOT HAVE_EXECINFO_H)
+    message(STATUS "execinfo.h not found, disabling backtrace support")
+    set(NO_UNIX_BACKTRACE_SUPPORT ON)
+endif()
+
+set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+set(DISABLE_DMAKE ON)
+set(FILESDIR "" CACHE STRING "" FORCE)
+
+set(CPPCHECK_ARCHIVE
+    "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cppcheck-${CPPCHECK_VERSION}.tar.gz"
+)
+if(NOT EXISTS "${CPPCHECK_ARCHIVE}")
+    message(
+        FATAL_ERROR
+        "${CPPCHECK_ARCHIVE} not found; run scripts/vendor_cppcheck.py "
+        "(the PEP 517 backend wrapper normally does this for you)"
+    )
+endif()
+
+include(FetchContent)
+FetchContent_Declare(cppcheck URL "${CPPCHECK_ARCHIVE}" EXCLUDE_FROM_ALL)
+FetchContent_MakeAvailable(cppcheck)
+
+# Force the cppcheck target to build even though its subdirectory is
+# EXCLUDE_FROM_ALL (mirrors the old build-cppcheck ExternalProject step).
+add_custom_target(build-cppcheck ALL DEPENDS cppcheck)
+
+# Reduce the size of the executable by executing strip if it is present on the system
+find_program(STRIP_EXECUTABLE strip)
+if(STRIP_EXECUTABLE)
+    add_custom_target(
+        strip-cppcheck
+        ALL
+        COMMAND ${STRIP_EXECUTABLE} $<TARGET_FILE:cppcheck>
+        COMMENT "Stripping cppcheck executable for size reduction"
+    )
+    add_dependencies(strip-cppcheck build-cppcheck)
+endif()
+
+# Define an installation rule that copies the executable to our Python package
+install(
+    PROGRAMS
+        $<TARGET_FILE:cppcheck>
+        ${cppcheck_SOURCE_DIR}/htmlreport/cppcheck-htmlreport
+    DESTINATION cppcheck/data
+)
+
+install(
+    DIRECTORY ${cppcheck_SOURCE_DIR}/addons
+    DESTINATION cppcheck/data
+    FILES_MATCHING
+    PATTERN "*.py"
+    PATTERN "test" EXCLUDE
+)
+
+install(
+    DIRECTORY ${cppcheck_SOURCE_DIR}/cfg
+    DESTINATION cppcheck/data
+    FILES_MATCHING
+    PATTERN "*.cfg"
+)
+
+install(
+    DIRECTORY ${cppcheck_SOURCE_DIR}/platforms
+    DESTINATION cppcheck/data
+    FILES_MATCHING
+    PATTERN "*.xml"
+)
+
+install(
+    FILES ${cppcheck_SOURCE_DIR}/COPYING
+    DESTINATION cppcheck
+    RENAME COPYING-cppcheck
+)

{cppcheck_py-2.21.1 → cppcheck_py-2.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cppcheck-py
-Version: 2.21.1
+Version: 2.22.0
 Summary: Static analysis of C/C++ code
 License: Apache 2.0
 Classifier: Programming Language :: C
@@ -29,11 +29,13 @@ python -m pip install cppcheck-py
 
 The tools provided are:
 
-cppcheck: performs static analysis of C/C++ source code
-cppcheck-htmlreport: generates an html report of a XML file produced by cppcheck
+* `cppcheck`: performs static analysis of C/C++ source code
+* `cppcheck-htmlreport`: generates an html report of a XML file produced by `cppcheck`
 
 This projects intends to release a new PyPI package for each major and minor release of `cppcheck`.
 
+Note that these tools are GPL-3.0 licensed; source is provided in the accompanying sdist.
+
 ## Use with pipx
 
 You can use `pipx` to run cppcheck, as well. For example, `pipx run cppcheck <args>` will run cppcheck without any previous install required on any machine with pipx (including all default GitHub Actions / Azure runners, avoiding requiring a pre-install step or even `actions/setup-python`).

{cppcheck_py-2.21.1 → cppcheck_py-2.22.0}/README.md

@@ -10,11 +10,13 @@ python -m pip install cppcheck-py
 
 The tools provided are:
 
-cppcheck: performs static analysis of C/C++ source code
-cppcheck-htmlreport: generates an html report of a XML file produced by cppcheck
+* `cppcheck`: performs static analysis of C/C++ source code
+* `cppcheck-htmlreport`: generates an html report of a XML file produced by `cppcheck`
 
 This projects intends to release a new PyPI package for each major and minor release of `cppcheck`.
 
+Note that these tools are GPL-3.0 licensed; source is provided in the accompanying sdist.
+
 ## Use with pipx
 
 You can use `pipx` to run cppcheck, as well. For example, `pipx run cppcheck <args>` will run cppcheck without any previous install required on any machine with pipx (including all default GitHub Actions / Azure runners, avoiding requiring a pre-install step or even `actions/setup-python`).

cppcheck_py-2.22.0/backend_wrapper.py

@@ -0,0 +1,49 @@
+"""Thin PEP 517 backend wrapper around scikit-build-core.
+
+Ensures cppcheck's source is vendored into third_party/ before the
+sdist is actually assembled, so `python -m build --sdist` (and anything
+that calls this hook -- pip, cibuildwheel, twine, CI) always produces a
+self-contained sdist without a manual pre-step.
+"""
+
+import subprocess
+import sys
+from pathlib import Path
+
+from scikit_build_core.build import build_editable as _build_editable
+from scikit_build_core.build import build_sdist as _build_sdist
+from scikit_build_core.build import build_wheel as _build_wheel
+
+# Re-export everything scikit-build-core provides; we only override
+# build_sdist. Anything not overridden here still needs to exist as an
+# attribute for setuptools/pip's PEP 517 hook lookup to find it.
+from scikit_build_core.build import (  # noqa: F401
+    get_requires_for_build_editable,
+    get_requires_for_build_sdist,
+    get_requires_for_build_wheel,
+    prepare_metadata_for_build_editable,
+    prepare_metadata_for_build_wheel,
+)
+
+_ROOT = Path(__file__).resolve().parent
+
+
+def _vendor_cppcheck():
+    vendor_script = _ROOT / "scripts" / "vendor_cppcheck.py"
+    print(f"[backend_wrapper] running {vendor_script}", file=sys.stderr)
+    subprocess.check_call([sys.executable, str(vendor_script)])
+
+
+def build_editable(editable_directory, config_settings=None, metadata_directory=None):
+    _vendor_cppcheck()
+    return _build_editable(editable_directory, config_settings, metadata_directory)
+
+
+def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
+    _vendor_cppcheck()
+    return _build_wheel(wheel_directory, config_settings, metadata_directory)
+
+
+def build_sdist(sdist_directory, config_settings=None):
+    _vendor_cppcheck()
+    return _build_sdist(sdist_directory, config_settings)

cppcheck_py-2.22.0/cppcheck_version.txt

@@ -0,0 +1 @@
+2.22.0.0

{cppcheck_py-2.21.1 → cppcheck_py-2.22.0}/pyproject.toml

@@ -1,6 +1,9 @@
 [build-system]
-requires = ["scikit-build-core"]
-build-backend = "scikit_build_core.build"
+requires = [
+    "scikit-build-core",
+    "tomli>=2.0; python_version < '3.11'",]
+build-backend = "backend_wrapper"
+backend-path = ["."]
 
 [project]
 name = "cppcheck-py"
@@ -38,10 +41,11 @@ Source = "https://github.com/cconverse711/cppcheck-wheel"
 [tool.scikit-build]
 wheel.packages = ["cppcheck"]
 wheel.py-api = "py3"
-cmake.version = ">=3.16.0"
+cmake.version = ">=3.28.0"
 ninja.version = ">=1.10.0"
 build.verbose = true
 logging.level = "DEBUG"
+sdist.include =  ["third_party/cppcheck-*.tar.gz"]
 
 [dependency-groups]
 dev = ["pytest"]

cppcheck_py-2.22.0/scripts/vendor_cppcheck.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+"""Run before building an sdist or wheel: vendors cppcheck's source so the sdist
+is self-contained and doesn't require network access to build."""
+
+import pathlib
+import re
+import urllib.request
+
+from scikit_build_core.metadata.regex import dynamic_metadata
+
+try:
+    import tomllib
+except ModuleNotFoundError:
+    import tomli as tomllib
+
+ROOT = pathlib.Path(__file__).resolve().parent.parent
+
+with open(ROOT / "pyproject.toml", "rb") as f:
+    pyproject = tomllib.load(f)
+
+    version_entry = next(
+        e for e in pyproject["tool"]["dynamic-metadata"] if e["field"] == "version"
+    )
+    settings = {
+        k: v for k, v in version_entry.items() if k not in ("provider", "field")
+    }
+    project_version = dynamic_metadata("version", settings)
+
+cppcheck_version = re.match(r"^(\d+\.\d+\.\d+)", project_version).group(1)
+url = f"https://github.com/cppcheck-opensource/cppcheck/archive/refs/tags/{cppcheck_version}.tar.gz"
+archive_path = ROOT / "third_party" / f"cppcheck-{cppcheck_version}.tar.gz"
+if archive_path.exists():
+    print(f"{archive_path} already exists, skipping download.")
+else:
+    archive_path.parent.mkdir(parents=True, exist_ok=True)
+    print(f"Downloading {url}")
+    urllib.request.urlretrieve(url, archive_path)

cppcheck_py-2.21.1/CMakeLists.txt

@@ -1,101 +0,0 @@
-cmake_minimum_required(VERSION 3.16...4.0)
-project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION})
-
-message(STATUS "cppcheck-wheel version: ${SKBUILD_PROJECT_VERSION}")
-string(
-    REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+)"
-    CPPCHECK_VERSION
-    "${SKBUILD_PROJECT_VERSION}"
-)
-message(STATUS "cppcheck version: ${CPPCHECK_VERSION}")
-
-include(CheckIncludeFileCXX)
-# Check for the execinfo header, needed for backtraces support.
-check_include_file_cxx("execinfo.h" HAVE_EXECINFO_H)
-
-set(CMAKE_ARGS
-    -DCMAKE_BUILD_TYPE=Release
-    -U
-    FILESDIR
-    -DCMAKE_POLICY_VERSION_MINIMUM=3.5
-)
-if(NOT HAVE_EXECINFO_H)
-    message(STATUS "execinfo.h not found, disabling backtrace support")
-    list(APPEND CMAKE_ARGS -DNO_UNIX_BACKTRACE_SUPPORT=ON)
-endif()
-
-# Define a build rule for cppcheck
-set(CPPCHECK_DOWNLOAD_URL
-    "https://github.com/cppcheck-opensource/cppcheck/archive/refs/tags/${CPPCHECK_VERSION}.tar.gz"
-)
-include(ExternalProject)
-ExternalProject_Add(
-    build-cppcheck
-    URL "${CPPCHECK_DOWNLOAD_URL}"
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/cppcheck
-    BINARY_DIR ${CMAKE_BINARY_DIR}/cppcheck-build
-    DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/cppcheck-download
-    UPDATE_COMMAND ""
-    INSTALL_COMMAND ""
-    USES_TERMINAL_DOWNLOAD 1
-    USES_TERMINAL_CONFIGURE 1
-    USES_TERMINAL_BUILD 1
-    CMAKE_ARGS ${CMAKE_ARGS}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --target cppcheck --config Release
-)
-set(config-subfolder "")
-if(CMAKE_GENERATOR MATCHES "Visual Studio")
-    set(config-subfolder "Release")
-endif()
-set(cppcheck-executable
-    ${CMAKE_BINARY_DIR}/cppcheck-build/${config-subfolder}/bin/cppcheck${CMAKE_EXECUTABLE_SUFFIX}
-)
-
-# Reduce the size of the executable by executing strip if it is present on the system
-find_program(STRIP_EXECUTABLE strip)
-if(STRIP_EXECUTABLE)
-    add_custom_target(
-        strip-cppcheck
-        ALL
-        COMMAND ${STRIP_EXECUTABLE} ${cppcheck-executable}
-        COMMENT "Stripping cppcheck executable for size reduction"
-    )
-    add_dependencies(strip-cppcheck build-cppcheck)
-endif()
-
-# Define an installation rule that copies the executable to our Python package
-install(
-    PROGRAMS
-        ${cppcheck-executable}
-        ${CMAKE_BINARY_DIR}/cppcheck/htmlreport/cppcheck-htmlreport
-    DESTINATION cppcheck/data
-)
-
-install(
-    DIRECTORY ${CMAKE_BINARY_DIR}/cppcheck/addons
-    DESTINATION cppcheck/data
-    FILES_MATCHING
-    PATTERN "*.py"
-    PATTERN "test" EXCLUDE
-)
-
-install(
-    DIRECTORY ${CMAKE_BINARY_DIR}/cppcheck/cfg
-    DESTINATION cppcheck/data
-    FILES_MATCHING
-    PATTERN "*.cfg"
-)
-
-install(
-    DIRECTORY ${CMAKE_BINARY_DIR}/cppcheck/platforms
-    DESTINATION cppcheck/data
-    FILES_MATCHING
-    PATTERN "*.xml"
-)
-
-# Install the downloaded source archive for GPLv3 compliance.
-install(
-    FILES ${CMAKE_BINARY_DIR}/cppcheck-download/${CPPCHECK_VERSION}.tar.gz
-    DESTINATION cppcheck
-    RENAME cppcheck-${CPPCHECK_VERSION}.tar.gz
-)

cppcheck_py-2.21.1/cppcheck_version.txt

@@ -1 +0,0 @@
-2.21.1.0