Merge branch 'master' into nz-pledgeinsize

.github/workflows/Downstream.yml

@@ -0,0 +1,39 @@
+name: Downstream
+on:
+ push:
+ branches: [master]
+ tags: [v*]
+ pull_request:
+
+jobs:
+ test:
+ name: ${{ matrix.package }}
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ package:
+ - "Arrow"
+ - "JLD2"
+ - "HDF5"
+ - "Parquet2"
+ steps:
+ - uses: actions/checkout@v4
+ - uses: julia-actions/setup-julia@v2
+ with:
+ version: 1
+ arch: x64
+ - uses: julia-actions/julia-buildpkg@latest
+ - name: Load this and run the downstream tests
+ shell: julia --color=yes {0}
+ run: |
+ using Pkg
+ Pkg.Registry.update()
+ Pkg.activate(;temp=true)
+ # force it to use this PR's version of the package
+ Pkg.develop([
+ PackageSpec(path="."),
+ PackageSpec(name="${{ matrix.package }}"),
+ ])
+ Pkg.update()
+ Pkg.test("${{ matrix.package }}")

gen/generator.jl

@@ -28,14 +28,25 @@ using Clang.Generators
 using Zstd_jll
 
 
+if !@isdefined(ZSTD_STATIC_LINKING_ONLY)
+ const ZSTD_STATIC_LINKING_ONLY = false
+end
+
 cd(@__DIR__)
 
 include_dir = joinpath(Zstd_jll.artifact_dir, "include") |> normpath
 options = load_options(joinpath(@__DIR__, "generator.toml"))
+if ZSTD_STATIC_LINKING_ONLY
+ @warn "Static linking only functions will be included"
+ options["general"]["output_file_path"] = "../test/LibZstd_clang_static.jl"
+ options["general"]["module_name"] = "LibZstdStatic"
+end
 
 args = get_default_args()
 push!(args, "-I$include_dir")
-push!(args, "-DZSTD_STATIC_LINKING_ONLY")
+if ZSTD_STATIC_LINKING_ONLY
+ push!(args, "-DZSTD_STATIC_LINKING_ONLY")
+end
 
 headers = [joinpath(include_dir, header) for header in readdir(include_dir) if endswith(header, ".h")]
 
@@ -78,4 +89,4 @@ end
 rewrite!(ctx.dag)
 
 # print
-build!(ctx, BUILDSTAGE_PRINTING_ONLY)
+build!(ctx, BUILDSTAGE_PRINTING_ONLY)

gen/static_generator.jl

@@ -0,0 +1,2 @@
+const ZSTD_STATIC_LINKING_ONLY=true
+include("generator.jl")