Merge pull request #37 from JuliaIO/vs/bump-zstd

Update Zstd to 1.5.5
JuliaIO · Aug 17, 2023 · e790898 · e790898
2 parents f7e431a + d8d1cbd
commit e790898
Show file tree

Hide file tree

Showing 11 changed files with 143 additions and 218 deletions.
diff --git a/Project.toml b/Project.toml
@@ -3,17 +3,15 @@ uuid = "6b39b394-51ab-5f42-8807-6242bab2b4c2"
 license = "MIT"
 authors = ["Kenta Sato <[email protected]>",
            "JuliaIO Github Organization"]
-version = "0.7.2"
+version = "0.8.0"
 
 [deps]
-CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
 TranscodingStreams = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
 Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
 
 [compat]
 TranscodingStreams = "0.9"
-Zstd_jll = "1.4"
-CEnum = "0.4"
+Zstd_jll = "1.5.5"
 julia = "1.3"
 
 [extras]

diff --git a/gen/.gitignore b/gen/.gitignore
@@ -0,0 +1 @@
+Manifest.toml
diff --git a/src/libzstd/Project.toml → gen/Project.toml b/src/libzstd/Project.toml → gen/Project.toml
@@ -3,4 +3,4 @@ Clang = "40e3b903-d033-50b4-a0cc-940c62c95e31"
 Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
 
 [compat]
-Clang = "0.14"
+Clang = "0.17"
diff --git a/src/libzstd/generator.jl → gen/generator.jl b/src/libzstd/generator.jl → gen/generator.jl
diff --git a/gen/generator.toml b/gen/generator.toml
@@ -0,0 +1,9 @@
+[general]
+library_name = "libzstd"
+output_file_path = "../src/LibZstd_clang.jl"
+module_name = "LibZstd"
+jll_pkg_name = "Zstd_jll"
+export_symbol_prefixes = ["ZSTD_", "ZDICT_"]
+prologue_file_path  = "./prologue.jl"
+use_julia_native_enum_type = true
+print_using_CEnum = false
diff --git a/gen/prologue.jl b/gen/prologue.jl
@@ -0,0 +1,4 @@
+const INT_MAX = typemax(Cint)
+const size_t = Int64
+
+ZSTD_EXPAND_AND_QUOTE(expr) = string(expr)
diff --git a/src/CodecZstd.jl b/src/CodecZstd.jl
@@ -18,7 +18,7 @@ import TranscodingStreams:
 using Zstd_jll
 
 # Module containing directly wrapped ccalls generated by CLang.jl
-include("libzstd/LibZstd.jl")
+include("LibZstd_clang.jl")
 # Library functions that have a Julian interface. This file originally preceded the above module
 include("libzstd.jl")
 include("compression.jl")