Merge branch 'staging' into release

Author: steven varga

.github/workflows/package.yml

@@ -63,7 +63,11 @@ jobs:
         shell: bash
         run: |
           ref="${GITHUB_REF_NAME}"
-          echo "H5CPP_VERSION=${ref#v}" >> "$GITHUB_ENV"
+          if [[ "$ref" == v* ]]; then
+            echo "H5CPP_VERSION=${ref#v}" >> "$GITHUB_ENV"
+          else
+            echo "H5CPP_VERSION=1.12.99-test" >> "$GITHUB_ENV"
+          fi
 
       - name: Install LLVM toolchain (Linux)
         if: runner.os == 'Linux'
@@ -213,6 +217,15 @@ jobs:
           cpack -G "${{ matrix.generators }}" \
             -D "CPACK_PACKAGE_FILE_NAME=h5cpp-compiler-${H5CPP_VERSION}-${{ matrix.asset_suffix }}" \
             --config CPackConfig.cmake
+          # macOS guard: productbuild must produce a real payload
+          if [[ "${{ matrix.generators }}" == "productbuild" ]]; then
+            pkg="h5cpp-compiler-${H5CPP_VERSION}-${{ matrix.asset_suffix }}.pkg"
+            size=$(stat -f%z "$pkg" 2>/dev/null || stat -c%s "$pkg" 2>/dev/null)
+            if (( size < 100000 )); then
+              echo "macOS package is suspiciously small (${size} bytes) — likely empty" >&2
+              exit 1
+            fi
+          fi
         env:
           CPACK_DEBIAN_PACKAGE_ARCHITECTURE: ${{ matrix.deb_arch }}
           CPACK_RPM_PACKAGE_ARCHITECTURE: ${{ matrix.rpm_arch }}
@@ -264,6 +277,70 @@ jobs:
           if-no-files-found: error
           path: dist/*.tar.gz
 
+  wine-smoke-test:
+    name: Wine smoke-test / Windows NSIS
+    needs: package
+    runs-on: ubuntu-24.04
+    if: startsWith(github.ref, 'refs/tags/')
+
+    steps:
+      - name: Install Wine
+        shell: bash
+        run: |
+          set -euxo pipefail
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends wine64 wine32 xvfb
+
+      - name: Download Windows artifact
+        uses: actions/download-artifact@v8
+        with:
+          name: h5cpp-compiler-windows-latest-NSIS
+          path: windows-artifact
+
+      - name: Smoke-test under Wine
+        shell: bash
+        run: |
+          set -euxo pipefail
+          export WINEPREFIX=/tmp/wine-smoke
+          export WINEARCH=win64
+
+          # Initialize Wine prefix silently
+          xvfb-run -a wine64 wineboot --init 2>/dev/null || true
+
+          # Locate the NSIS installer
+          installer=( windows-artifact/h5cpp-compiler-*.exe )
+          if [[ ! -f "${installer[0]}" ]]; then
+            echo "No Windows installer found in artifact" >&2
+            exit 1
+          fi
+
+          # Silent install
+          xvfb-run -a wine64 "${installer[0]}" /S
+
+          # Locate installed binary (glob handles versioned install dir)
+          h5cpp_exe=( /tmp/wine-smoke/drive_c/Program\ Files/h5cpp-compiler/*/bin/h5cpp.exe )
+          if [[ ! -f "${h5cpp_exe[0]}" ]]; then
+            echo "h5cpp.exe not found after NSIS install" >&2
+            exit 1
+          fi
+
+          # Run smoke test
+          output=$(xvfb-run -a wine64 "${h5cpp_exe[0]}" --version 2>&1)
+          echo "$output"
+
+          # Validate expected output
+          if ! grep -q "H5CPP:" <<< "$output"; then
+            echo "Smoke test failed: missing H5CPP banner" >&2
+            exit 1
+          fi
+          if ! grep -q "LLVM version" <<< "$output"; then
+            echo "Smoke test failed: missing LLVM version string" >&2
+            exit 1
+          fi
+
+          echo "Wine smoke-test passed"
+
   publish:
     name: Publish Release
     needs: [package, musl]

CMakeLists.txt

@@ -181,13 +181,14 @@ endif()
 
 # Install directives
 include(GNUInstallDirs)
-install(TARGETS h5cpp DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES h5cpp.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+install(TARGETS h5cpp DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime)
+install(FILES h5cpp.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT runtime)
 
 # CMake helper modules for consumers
 install(
     DIRECTORY cmake/
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/h5cpp-compiler
+    COMPONENT runtime
     FILES_MATCHING PATTERN "*.cmake"
 )
 
@@ -215,7 +216,11 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Source code transformation tool for HDF5
 set(CPACK_PACKAGE_CONTACT "steven@vargalabs.com")
 set(CPACK_PACKAGE_LICENSE "MIT")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT.txt")
-set(CPACK_MONOLITHIC_INSTALL 1)
+# MONOLITHIC is safe for DEB/RPM, but breaks productbuild on macOS
+# (CMake #18201: empty distribution XML when monolithic + productbuild)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set(CPACK_MONOLITHIC_INSTALL 1)
+endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
@@ -235,6 +240,12 @@ endif()
 
 include(CPack)
 
+cpack_add_component(runtime
+  DISPLAY_NAME "h5cpp-compiler"
+  DESCRIPTION "Source code transformation tool for HDF5 H5CPP library"
+  REQUIRED
+)
+
 option(H5CPP_BUILD_TESTS "Build h5cpp-compiler fixture tests" ON)
 if(H5CPP_BUILD_TESTS)
   enable_testing()

README.md

@@ -160,6 +160,37 @@ sudo cmake --install build
 
 See `examples/cmake-integration/` for a complete working project.
 
+## vcpkg
+
+### Manifest mode
+
+If you use vcpkg in [manifest mode](https://learn.microsoft.com/en-us/vcpkg/concepts/manifest-mode), run the following from the project root after cloning:
+
+```bash
+vcpkg install
+```
+
+This reads the `vcpkg.json` manifest and resolves the `llvm` dependency (with `clang` and `tools` features).
+
+> **Note:** h5cpp-compiler is compatible with LLVM 18, 19, and 20. vcpkg currently provides `llvm` at 18.1.6.
+
+### Registry port
+
+To consume `h5cpp-compiler` through a custom vcpkg registry, copy the `vcpkg/` directory into your registry under `ports/h5cpp-compiler/`:
+
+```
+ports/
+  h5cpp-compiler/
+    portfile.cmake
+    vcpkg.json
+```
+
+Add the port to your registry `versions/baseline.json`, then install it with:
+
+```bash
+vcpkg install h5cpp-compiler
+```
+
 ## Compatibility
 
 | h5cpp-compiler | h5cpp library |

conan/README.md

@@ -0,0 +1,41 @@
+# h5cpp-compiler Conan 2.x Recipe
+
+This directory contains the Conan 2.x recipe for `h5cpp-compiler`.
+
+## Creating the Package
+
+From the repository root:
+
+```bash
+conan create .
+```
+
+## Consuming as a Tool Dependency
+
+Add `h5cpp-compiler` to your consumer's `tool_requires`:
+
+```python
+from conan import ConanFile
+
+class MyProject(ConanFile):
+    name = "my-project"
+    version = "1.0.0"
+    settings = "os", "compiler", "build_type", "arch"
+    tool_requires = "h5cpp-compiler/1.12.6"
+```
+
+In your `CMakeLists.txt`:
+
+```cmake
+find_package(H5CPPCompiler REQUIRED)
+h5cpp_compiler_generate(
+    INPUT  ${CMAKE_CURRENT_SOURCE_DIR}/particle.cpp
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/particle_h5.hpp
+)
+target_sources(my_app PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/particle_h5.hpp)
+```
+
+## Notes
+
+- The recipe currently depends on `llvm-core/19.1.7` from ConanCenter.
+- LLVM 20 support is planned; update the requirement in `conanfile.py` once `llvm-core/20.x` is published.

conandata.yml

@@ -0,0 +1,4 @@
+sources:
+  "1.12.6":
+    url: "https://github.com/vargalabs/h5cpp-compiler/archive/refs/tags/v1.12.6.tar.gz"
+    sha256: "c5f5829cec4908ad93647c17f27d0a82b75a5413fcad8c99232ba2034d0149a2"

conanfile.py

@@ -0,0 +1,53 @@
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
+from conan.tools.files import copy
+
+
+class H5CppCompilerConan(ConanFile):
+    name = "h5cpp-compiler"
+    version = "1.12.6"
+    package_type = "application"
+    settings = "os", "compiler", "build_type", "arch"
+    exports_sources = (
+        "CMakeLists.txt",
+        "src/*",
+        "cmake/*",
+        "h5cpp.1",
+        "COPYRIGHT*",
+        "COPYRIGHT.txt",
+    )
+
+    def layout(self):
+        cmake_layout(self)
+
+    def requirements(self):
+        # h5cpp-compiler is compatible with LLVM 18+, 19+, and 20.
+        # ConanCenter currently provides llvm-core at 19.1.7.
+        self.requires("llvm-core/19.1.7")
+
+    def generate(self):
+        deps = CMakeDeps(self)
+        deps.generate()
+        tc = CMakeToolchain(self)
+        tc.generate()
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        cmake = CMake(self)
+        cmake.install()
+
+    def package_info(self):
+        self.cpp_info.bindirs = ["bin"]
+        self.cpp_info.libdirs = []
+        self.cpp_info.includedirs = []
+
+    def package_id(self):
+        # For a build-time tool, compiler and build_type do not affect the
+        # package ID in a meaningful way for consumers that use it as a
+        # tool_requires.  Clearing them keeps the package ID stable.
+        del self.info.settings.compiler
+        del self.info.settings.build_type

spack/README.md

@@ -0,0 +1,21 @@
+# Spack Package for h5cpp-compiler
+
+This directory contains a custom Spack repository with the `h5cpp-compiler` package recipe.
+
+## Adding the repository
+
+```bash
+spack repo add /path/to/h5cpp-compiler/spack
+```
+
+## Installing the package
+
+```bash
+spack install h5cpp-compiler
+```
+
+## Notes
+
+- The recipe depends on `llvm +clang` because h5cpp-compiler uses Clang LibTooling.
+- CMake 3.14+ and Ninja are required at build time.
+- Tests are disabled during the Spack build (`H5CPP_BUILD_TESTS=OFF`).

spack/packages/h5cpp-compiler/package.py

@@ -0,0 +1,38 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class H5cppCompiler(CMakePackage):
+    """h5cpp-compiler is a CLI build-time tool that uses LLVM/Clang LibTooling
+    to generate HDF5 C++ bindings from annotated source code.
+    """
+
+    homepage = "https://github.com/vargalabs/h5cpp-compiler"
+    git = "https://github.com/vargalabs/h5cpp-compiler.git"
+    url = "https://github.com/vargalabs/h5cpp-compiler/archive/refs/tags/v1.12.6.tar.gz"
+
+    maintainers("steven-varga")
+
+    license("MIT", checked_by="steven-varga")
+
+    version("1.12.6", sha256="c5f5829cec4908ad93647c17f27d0a82b75a5413fcad8c99232ba2034d0149a2")
+    version("1.12.5", sha256="f8990bcbfe90a037b66535c36d6e06e7451491c4cdc9c6fae4dfc15d1b3812be")
+    version("1.12.4", sha256="77461c9a482c5460a246724a479c803b011a6f95b94801493816d2c3ca70c732")
+    version("1.12.3", sha256="d7eefa490746b361e83df166f50ea9133919224e5e81f893ad4e41176d310371")
+
+    depends_on("cmake@3.14:", type="build")
+    depends_on("ninja", type="build")
+
+    # The project targets LLVM 20 and requires the Clang component (LibTooling).
+    # Spack's llvm package provides clang via the +clang variant.
+    depends_on("llvm +clang")
+
+    def cmake_args(self):
+        args = [
+            self.define("H5CPP_BUILD_TESTS", "OFF"),
+        ]
+        return args

spack/repo.yaml

@@ -0,0 +1,2 @@
+repo:
+  namespace: vargalabs

test_package/CMakeLists.txt

@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.14)
+project(test_package LANGUAGES CXX)
+
+find_package(H5CPPCompiler REQUIRED)
+
+add_executable(example src/example.cpp)