Merge branch 'staging' into release

Author: steven varga

.github/workflows/package.yml

@@ -228,9 +228,45 @@ jobs:
             build/h5cpp-compiler-*.exe
             build/h5cpp-compiler-*.pkg
 
+  musl:
+    name: musl-static / x86_64
+    runs-on: ubuntu-24.04
+    if: startsWith(github.ref, 'refs/tags/')
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Resolve version from tag
+        shell: bash
+        run: |
+          ref="${GITHUB_REF_NAME}"
+          echo "H5CPP_VERSION=${ref#v}" >> "$GITHUB_ENV"
+
+      - name: Build musl static binary
+        shell: bash
+        run: |
+          set -euxo pipefail
+          docker build -f Dockerfile.musl -t h5cpp-musl .
+          mkdir -p dist
+          docker create --name extract h5cpp-musl
+          docker cp extract:/src/build/h5cpp "dist/h5cpp"
+          docker rm extract
+          chmod +x "dist/h5cpp"
+          tar czf "dist/h5cpp-compiler-${H5CPP_VERSION}-Linux-musl-x86_64.tar.gz" -C dist h5cpp
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: h5cpp-compiler-musl
+          if-no-files-found: error
+          path: dist/*.tar.gz
+
   publish:
     name: Publish Release
-    needs: package
+    needs: [package, musl]
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
 
@@ -261,7 +297,7 @@ jobs:
           # Collect installer artifacts only. Defensive against stray
           # CMake-generated files (e.g. h5cpp-compiler-dev.sln on Windows).
           shopt -s globstar nullglob
-          files=( artifacts/**/*.deb artifacts/**/*.rpm artifacts/**/*.exe artifacts/**/*.pkg )
+          files=( artifacts/**/*.deb artifacts/**/*.rpm artifacts/**/*.exe artifacts/**/*.pkg artifacts/**/*.tar.gz )
           if (( ${#files[@]} == 0 )); then
             echo "no installer artifacts found under artifacts/" >&2
             exit 1

Dockerfile.musl

@@ -0,0 +1,48 @@
+# Alpine edge with musl — fully static h5cpp-compiler build
+FROM docker.io/library/alpine:edge
+
+RUN apk update && apk add --no-cache \
+    build-base \
+    cmake \
+    ninja \
+    llvm20-dev \
+    llvm20-static \
+    clang20-dev \
+    clang20-static \
+    zlib-dev \
+    zlib-static \
+    zstd-dev \
+    zstd-static \
+    libxml2-dev \
+    libxml2-static \
+    libffi-dev \
+    linux-headers
+
+# Alpine's llvm20-dev / clang20-dev CMake exports reference every target LLVM
+# can build, but the -static subpackage only ships the libraries needed for
+# normal linking.  We create empty archives for the missing testing libs and
+# downgrade the existence-check FATAL_ERROR to WARNING so configure succeeds.
+RUN for lib in LLVMTestingAnnotations LLVMTestingSupport llvm_gtest llvm_gtest_main LTO LLVMgold LLVM Remarks; do \
+        ar rcs /usr/lib/llvm20/lib/lib${lib}.a; \
+    done && \
+    for f in /usr/lib/llvm20/lib/cmake/llvm/LLVMExports.cmake \
+             /usr/lib/llvm20/lib/cmake/llvm/LLVMExports-release.cmake \
+             /usr/lib/llvm20/lib/cmake/clang/ClangTargets.cmake \
+             /usr/lib/llvm20/lib/cmake/clang/ClangTargets-release.cmake; do \
+        [ -f "$f" ] && sed -i 's/message(FATAL_ERROR/message(WARNING/g' "$f"; \
+    done
+
+WORKDIR /src
+COPY . .
+
+RUN cmake -S . -B build -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DH5CPP_STATIC_LINK_LLVM=ON \
+    -DCMAKE_EXE_LINKER_FLAGS="-static" \
+    -DLLVM_DIR=/usr/lib/llvm20/lib/cmake/llvm \
+    -DClang_DIR=/usr/lib/llvm20/lib/cmake/clang
+
+RUN cmake --build build --parallel
+
+# Verify it is static
+RUN file build/h5cpp && (ldd build/h5cpp 2>/dev/null || echo "Not a dynamic executable (good)")

src/consumer.hpp

@@ -20,13 +20,13 @@
 template <typename Producer> class H5TemplateCallback : public clang::ast_matchers::MatchFinder::MatchCallback {
 public :
 
-	H5TemplateCallback(const std::string& path){
-		io.open( path );
+	H5TemplateCallback(const std::string& path) : path_(path) {
 		producer.file_begin();
 	}
 
 	~H5TemplateCallback(){
 		producer.file_end();
+		io.open(path_);
 		io << producer;
 		io.close();
 	}
@@ -56,6 +56,18 @@ public :
 		if( tier == utils::tier::pod ){
 			// --- tier 1: standard register_struct emission ---
 			topological_order( node );
+				// collect header files for all records before emitting preamble
+				if( Result.Context ) {
+					for( const auto& item : store ) {
+						if( item.first == utils::type::record ) {
+							auto rec = utils::as<const clang::CXXRecordDecl*>( item.second );
+							std::string hdr = get_header_name(rec, Result.Context->getSourceManager());
+							if( !hdr.empty() )
+								producer.add_include(hdr);
+						}
+					}
+				}
+
 			producer.template_decl( rn, doc, alias, version );
 
 			std::string var, type;
@@ -74,6 +86,11 @@ public :
 					break;
 					case utils::type::record:
 						re = utils::as<const clang::CXXRecordDecl*>( node.second );
+						if( Result.Context ) {
+							std::string hdr = get_header_name(re, Result.Context->getSourceManager());
+							if( !hdr.empty() )
+								producer.add_include(hdr);
+						}
 						var = producer.record_decl( utils::type_name( re ) );
 						for(clang::FieldDecl* fld: re->fields() ){
 							// Issue #32: skip fields annotated with [[h5::ignore]]
@@ -98,7 +115,7 @@ public :
 					default:
 						break;
 				}
-				store.pop();
+				store.pop_front();
 			}
 			producer.type_release();
 			producer.return_type( var );
@@ -150,6 +167,11 @@ public :
 				compress_algo = compress_strs.empty() ? "gzip" : compress_strs[0];
 			}
 
+			if (Result.Context) {
+				std::string hdr = get_header_name(node, Result.Context->getSourceManager());
+				if (!hdr.empty())
+					producer.add_include(hdr);
+			}
 			producer.scatter_type(rn, fields, chunk_size, compress_algo, compress_level, doc, alias, version, on_missing);
 		}
 	}
@@ -160,7 +182,7 @@ public :
 			topological_order( utils::as<const clang::QualType>( fld ) );
 		auto it = unique.insert( node );
 		if( it.second )
-			store.push( {utils::type::record, node} );
+			store.push_back( {utils::type::record, node} );
 	}
 
 	void topological_order(const clang::QualType& qt){
@@ -173,7 +195,7 @@ public :
 				topological_order( ar->getElementType() );
 				it = unique.insert( ar );
 				if( it.second )
-			   		store.push({utils::type::array, ar});
+			   		store.push_back({utils::type::array, ar});
 				break;
 
 			case utils::type::record:
@@ -184,8 +206,23 @@ public :
 		}
 	}
 
+	static std::string get_header_name(const clang::CXXRecordDecl* decl, const clang::SourceManager& sm){
+		if( !decl ) return "";
+		clang::SourceLocation loc = decl->getLocation();
+		if( !loc.isValid() ) return "";
+		llvm::StringRef path = sm.getFilename(loc);
+		if( path.size() < 3 ) return "";
+		if( !(path.ends_with(".h") || path.ends_with(".hpp") || path.ends_with(".hxx") || path.ends_with(".hh")) )
+			return "";
+		size_t pos = path.rfind('/');
+		if( pos == llvm::StringRef::npos )
+			return path.str();
+		return path.substr(pos + 1).str();
+	}
+
 	std::ofstream io;
+	std::string path_;
 	Producer producer;
 	std::set<const void*> unique, nodes;
-	std::queue<std::pair<utils::type, const void*>> store;
+	std::deque<std::pair<utils::type, const void*>> store;
 };

src/h5cpp.cpp

@@ -36,7 +36,8 @@ clang::ast_matchers::StatementMatcher h5templateMatcher = clang::ast_matchers::c
 		clang::ast_matchers::functionDecl( clang::ast_matchers::allOf(
 			clang::ast_matchers::eachOf(
 				clang::ast_matchers::hasName("h5::write"),  clang::ast_matchers::hasName("h5::create"),  clang::ast_matchers::hasName("h5::read"), clang::ast_matchers::hasName("h5::append"),
-				clang::ast_matchers::hasName("h5::awrite"), clang::ast_matchers::hasName("h5::acreate"), clang::ast_matchers::hasName("h5::aread")
+				clang::ast_matchers::hasName("h5::awrite"), clang::ast_matchers::hasName("h5::acreate"), clang::ast_matchers::hasName("h5::aread"),
+				clang::ast_matchers::hasName("h5::scatter"), clang::ast_matchers::hasName("h5::gather")
 			),
 			clang::ast_matchers::hasTemplateArgument(0,  clang::ast_matchers::refersToType( clang::ast_matchers::qualType( clang::ast_matchers::eachOf(
 				clang::ast_matchers::hasDeclaration( clang::ast_matchers::cxxRecordDecl(clang::ast_matchers::isStruct()).bind("cxxRecordDecl")),
@@ -128,6 +129,17 @@ int main(int argc, const char **argv) {
 	clang::tooling::ClangTool Tool(OptionsParser.getCompilations(),
 				 OptionsParser.getSourcePathList());
 
+	// During the AST-scan pass that produces generated.h, the user's
+	// H5CPP_REGISTER_STRUCT macros haven't fired yet (generated.h is the
+	// empty virtual stub mapped below). The h5cpp headers gate their
+	// "storage_representation_v<T> == unsupported" static_asserts on
+	// H5CPP_BUILDING_TYPE_INFO so they don't fire in this bootstrap context;
+	// they remain active for regular user compilation where generated.h exists.
+	Tool.appendArgumentsAdjuster(
+		clang::tooling::getInsertArgumentAdjuster(
+			"-DH5CPP_BUILDING_TYPE_INFO",
+			clang::tooling::ArgumentInsertPosition::BEGIN));
+
 	// Issue #32: rewrite [[h5::xxx(...)]] → [[clang::annotate("h5::xxx", ...)]]
 	// for each source path before Clang sees it.
 	std::vector<std::string> _h5_attr_storage;
@@ -140,6 +152,18 @@ int main(int argc, const char **argv) {
 	pb_attr_translator::install_virtual_files(
 		Tool, OptionsParser.getSourcePathList(), _pb_attr_storage);
 
+	// Issue #34 follow-up: break the chicken-and-egg between the source's
+	// `#include "generated.h"` and the consumer (which writes the file at
+	// destructor time, per 76c38d8). Without this, clang's preprocessor errors
+	// out before the AST matchers ever fire and no output is produced.
+	// Install an empty virtual header at OutputFile; the real content overwrites
+	// the on-disk file when the consumer destructs.
+	std::string _empty_generated_storage;
+	if (!OutputFile.empty()) {
+		_empty_generated_storage = "#pragma once\n";
+		Tool.mapVirtualFile(OutputFile, _empty_generated_storage);
+	}
+
 	std::string work_path = OutputFile;
 	if (CheckMode) {
 		work_path = OutputFile + ".h5cpp-check";

src/producer.hpp

@@ -72,6 +72,10 @@ struct Producer {
 		static_cast<Derived*>(this)->type_release_impl();
 	}
 
+	void add_include(const std::string& path){
+		static_cast<Derived*>(this)->add_include_impl(path);
+	}
+
 	// Issue #32: scatter/gather emission for tier-2 types.
 	struct scatter_field_t {
 		std::string cpp_name;    // C++ field name