diff --git a/Project.toml b/Project.toml index b810799..3e31a4a 100644 --- a/Project.toml +++ b/Project.toml @@ -3,17 +3,15 @@ uuid = "6b39b394-51ab-5f42-8807-6242bab2b4c2" license = "MIT" authors = ["Kenta Sato ", "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 new file mode 100644 index 0000000..2251642 --- /dev/null +++ b/gen/.gitignore @@ -0,0 +1 @@ +Manifest.toml \ No newline at end of file diff --git a/src/libzstd/Project.toml b/gen/Project.toml similarity index 88% rename from src/libzstd/Project.toml rename to gen/Project.toml index 3320b7e..3bf2c4a 100644 --- a/src/libzstd/Project.toml +++ b/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 b/gen/generator.jl similarity index 100% rename from src/libzstd/generator.jl rename to gen/generator.jl diff --git a/gen/generator.toml b/gen/generator.toml new file mode 100644 index 0000000..6bdcf9d --- /dev/null +++ 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 new file mode 100644 index 0000000..39595fc --- /dev/null +++ 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 index 157af53..315f5f2 100644 --- 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") diff --git a/src/libzstd/LibZstd.jl b/src/LibZstd_clang.jl similarity index 91% rename from src/libzstd/LibZstd.jl rename to src/LibZstd_clang.jl index 1de57f6..7e995c4 100644 --- a/src/libzstd/LibZstd.jl +++ b/src/LibZstd_clang.jl @@ -3,12 +3,12 @@ module LibZstd using Zstd_jll export Zstd_jll -using CEnum - const INT_MAX = typemax(Cint) +const size_t = Int64 ZSTD_EXPAND_AND_QUOTE(expr) = string(expr) + function ZDICT_trainFromBuffer(dictBuffer, dictBufferCapacity, samplesBuffer, samplesSizes, nbSamples) ccall((:ZDICT_trainFromBuffer, libzstd), Csize_t, (Ptr{Cvoid}, Csize_t, Ptr{Cvoid}, Ptr{Csize_t}, Cuint), dictBuffer, dictBufferCapacity, samplesBuffer, samplesSizes, nbSamples) end @@ -123,7 +123,7 @@ function ZSTD_decompressDCtx(dctx, dst, dstCapacity, src, srcSize) ccall((:ZSTD_decompressDCtx, libzstd), Csize_t, (Ptr{ZSTD_DCtx}, Ptr{Cvoid}, Csize_t, Ptr{Cvoid}, Csize_t), dctx, dst, dstCapacity, src, srcSize) end -@cenum ZSTD_strategy::UInt32 begin +@enum ZSTD_strategy::UInt32 begin ZSTD_fast = 1 ZSTD_dfast = 2 ZSTD_greedy = 3 @@ -135,7 +135,7 @@ end ZSTD_btultra2 = 9 end -@cenum ZSTD_cParameter::UInt32 begin +@enum ZSTD_cParameter::UInt32 begin ZSTD_c_compressionLevel = 100 ZSTD_c_windowLog = 101 ZSTD_c_hashLog = 102 @@ -170,6 +170,10 @@ end ZSTD_c_experimentalParam13 = 1010 ZSTD_c_experimentalParam14 = 1011 ZSTD_c_experimentalParam15 = 1012 + ZSTD_c_experimentalParam16 = 1013 + ZSTD_c_experimentalParam17 = 1014 + ZSTD_c_experimentalParam18 = 1015 + ZSTD_c_experimentalParam19 = 1016 end struct ZSTD_bounds @@ -190,7 +194,7 @@ function ZSTD_CCtx_setPledgedSrcSize(cctx, pledgedSrcSize) ccall((:ZSTD_CCtx_setPledgedSrcSize, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, Culonglong), cctx, pledgedSrcSize) end -@cenum ZSTD_ResetDirective::UInt32 begin +@enum ZSTD_ResetDirective::UInt32 begin ZSTD_reset_session_only = 1 ZSTD_reset_parameters = 2 ZSTD_reset_session_and_parameters = 3 @@ -204,12 +208,13 @@ function ZSTD_compress2(cctx, dst, dstCapacity, src, srcSize) ccall((:ZSTD_compress2, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, Ptr{Cvoid}, Csize_t, Ptr{Cvoid}, Csize_t), cctx, dst, dstCapacity, src, srcSize) end -@cenum ZSTD_dParameter::UInt32 begin +@enum ZSTD_dParameter::UInt32 begin ZSTD_d_windowLogMax = 100 ZSTD_d_experimentalParam1 = 1000 ZSTD_d_experimentalParam2 = 1001 ZSTD_d_experimentalParam3 = 1002 ZSTD_d_experimentalParam4 = 1003 + ZSTD_d_experimentalParam5 = 1004 end function ZSTD_dParam_getBounds(dParam) @@ -250,7 +255,7 @@ function ZSTD_freeCStream(zcs) ccall((:ZSTD_freeCStream, libzstd), Csize_t, (Ptr{ZSTD_CStream},), zcs) end -@cenum ZSTD_EndDirective::UInt32 begin +@enum ZSTD_EndDirective::UInt32 begin ZSTD_e_continue = 0 ZSTD_e_flush = 1 ZSTD_e_end = 2 @@ -446,49 +451,49 @@ struct ZSTD_parameters fParams::ZSTD_frameParameters end -@cenum ZSTD_dictContentType_e::UInt32 begin +@enum ZSTD_dictContentType_e::UInt32 begin ZSTD_dct_auto = 0 ZSTD_dct_rawContent = 1 ZSTD_dct_fullDict = 2 end -@cenum ZSTD_dictLoadMethod_e::UInt32 begin +@enum ZSTD_dictLoadMethod_e::UInt32 begin ZSTD_dlm_byCopy = 0 ZSTD_dlm_byRef = 1 end -@cenum ZSTD_format_e::UInt32 begin +@enum ZSTD_format_e::UInt32 begin ZSTD_f_zstd1 = 0 ZSTD_f_zstd1_magicless = 1 end -@cenum ZSTD_forceIgnoreChecksum_e::UInt32 begin +@enum ZSTD_forceIgnoreChecksum_e::UInt32 begin ZSTD_d_validateChecksum = 0 ZSTD_d_ignoreChecksum = 1 end -@cenum ZSTD_refMultipleDDicts_e::UInt32 begin +@enum ZSTD_refMultipleDDicts_e::UInt32 begin ZSTD_rmd_refSingleDDict = 0 ZSTD_rmd_refMultipleDDicts = 1 end -@cenum ZSTD_dictAttachPref_e::UInt32 begin +@enum ZSTD_dictAttachPref_e::UInt32 begin ZSTD_dictDefaultAttach = 0 ZSTD_dictForceAttach = 1 ZSTD_dictForceCopy = 2 ZSTD_dictForceLoad = 3 end -@cenum ZSTD_literalCompressionMode_e::UInt32 begin +@enum ZSTD_literalCompressionMode_e::UInt32 begin ZSTD_lcm_auto = 0 ZSTD_lcm_huffman = 1 ZSTD_lcm_uncompressed = 2 end -@cenum ZSTD_useRowMatchFinderMode_e::UInt32 begin - ZSTD_urm_auto = 0 - ZSTD_urm_disableRowMatchFinder = 1 - ZSTD_urm_enableRowMatchFinder = 2 +@enum ZSTD_paramSwitch_e::UInt32 begin + ZSTD_ps_auto = 0 + ZSTD_ps_enable = 1 + ZSTD_ps_disable = 2 end function ZSTD_findDecompressedSize(src, srcSize) @@ -503,11 +508,44 @@ function ZSTD_frameHeaderSize(src, srcSize) ccall((:ZSTD_frameHeaderSize, libzstd), Csize_t, (Ptr{Cvoid}, Csize_t), src, srcSize) end -@cenum ZSTD_sequenceFormat_e::UInt32 begin +@enum ZSTD_frameType_e::UInt32 begin + ZSTD_frame = 0 + ZSTD_skippableFrame = 1 +end + +struct ZSTD_frameHeader + frameContentSize::Culonglong + windowSize::Culonglong + blockSizeMax::Cuint + frameType::ZSTD_frameType_e + headerSize::Cuint + dictID::Cuint + checksumFlag::Cuint + _reserved1::Cuint + _reserved2::Cuint +end + +function ZSTD_getFrameHeader(zfhPtr, src, srcSize) + ccall((:ZSTD_getFrameHeader, libzstd), Csize_t, (Ptr{ZSTD_frameHeader}, Ptr{Cvoid}, Csize_t), zfhPtr, src, srcSize) +end + +function ZSTD_getFrameHeader_advanced(zfhPtr, src, srcSize, format) + ccall((:ZSTD_getFrameHeader_advanced, libzstd), Csize_t, (Ptr{ZSTD_frameHeader}, Ptr{Cvoid}, Csize_t, ZSTD_format_e), zfhPtr, src, srcSize, format) +end + +function ZSTD_decompressionMargin(src, srcSize) + ccall((:ZSTD_decompressionMargin, libzstd), Csize_t, (Ptr{Cvoid}, Csize_t), src, srcSize) +end + +@enum ZSTD_sequenceFormat_e::UInt32 begin ZSTD_sf_noBlockDelimiters = 0 ZSTD_sf_explicitBlockDelimiters = 1 end +function ZSTD_sequenceBound(srcSize) + ccall((:ZSTD_sequenceBound, libzstd), Csize_t, (Csize_t,), srcSize) +end + function ZSTD_generateSequences(zc, outSeqs, outSeqsSize, src, srcSize) ccall((:ZSTD_generateSequences, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, Ptr{ZSTD_Sequence}, Csize_t, Ptr{Cvoid}, Csize_t), zc, outSeqs, outSeqsSize, src, srcSize) end @@ -524,6 +562,14 @@ function ZSTD_writeSkippableFrame(dst, dstCapacity, src, srcSize, magicVariant) ccall((:ZSTD_writeSkippableFrame, libzstd), Csize_t, (Ptr{Cvoid}, Csize_t, Ptr{Cvoid}, Csize_t, Cuint), dst, dstCapacity, src, srcSize, magicVariant) end +function ZSTD_readSkippableFrame(dst, dstCapacity, magicVariant, src, srcSize) + ccall((:ZSTD_readSkippableFrame, libzstd), Csize_t, (Ptr{Cvoid}, Csize_t, Ptr{Cuint}, Ptr{Cvoid}, Csize_t), dst, dstCapacity, magicVariant, src, srcSize) +end + +function ZSTD_isSkippableFrame(buffer, size) + ccall((:ZSTD_isSkippableFrame, libzstd), Cuint, (Ptr{Cvoid}, Csize_t), buffer, size) +end + function ZSTD_estimateCCtxSize(compressionLevel) ccall((:ZSTD_estimateCCtxSize, libzstd), Csize_t, (Cint,), compressionLevel) end @@ -672,6 +718,18 @@ function ZSTD_adjustCParams(cPar, srcSize, dictSize) ccall((:ZSTD_adjustCParams, libzstd), ZSTD_compressionParameters, (ZSTD_compressionParameters, Culonglong, Csize_t), cPar, srcSize, dictSize) end +function ZSTD_CCtx_setCParams(cctx, cparams) + ccall((:ZSTD_CCtx_setCParams, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, ZSTD_compressionParameters), cctx, cparams) +end + +function ZSTD_CCtx_setFParams(cctx, fparams) + ccall((:ZSTD_CCtx_setFParams, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, ZSTD_frameParameters), cctx, fparams) +end + +function ZSTD_CCtx_setParams(cctx, params) + ccall((:ZSTD_CCtx_setParams, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, ZSTD_parameters), cctx, params) +end + function ZSTD_compress_advanced(cctx, dst, dstCapacity, src, srcSize, dict, dictSize, params) ccall((:ZSTD_compress_advanced, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, Ptr{Cvoid}, Csize_t, Ptr{Cvoid}, Csize_t, Ptr{Cvoid}, Csize_t, ZSTD_parameters), cctx, dst, dstCapacity, src, srcSize, dict, dictSize, params) end @@ -821,6 +879,13 @@ function ZSTD_resetDStream(zds) ccall((:ZSTD_resetDStream, libzstd), Csize_t, (Ptr{ZSTD_DStream},), zds) end +# typedef size_t ZSTD_sequenceProducer_F ( void * sequenceProducerState , ZSTD_Sequence * outSeqs , size_t outSeqsCapacity , const void * src , size_t srcSize , const void * dict , size_t dictSize , int compressionLevel , size_t windowSize ) +const ZSTD_sequenceProducer_F = Cvoid + +function ZSTD_registerSequenceProducer(cctx, sequenceProducerState, sequenceProducer) + ccall((:ZSTD_registerSequenceProducer, libzstd), Cvoid, (Ptr{ZSTD_CCtx}, Ptr{Cvoid}, Ptr{ZSTD_sequenceProducer_F}), cctx, sequenceProducerState, sequenceProducer) +end + function ZSTD_compressBegin(cctx, compressionLevel) ccall((:ZSTD_compressBegin, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, Cint), cctx, compressionLevel) end @@ -853,29 +918,6 @@ function ZSTD_compressBegin_usingCDict_advanced(cctx, cdict, fParams, pledgedSrc ccall((:ZSTD_compressBegin_usingCDict_advanced, libzstd), Csize_t, (Ptr{ZSTD_CCtx}, Ptr{ZSTD_CDict}, ZSTD_frameParameters, Culonglong), cctx, cdict, fParams, pledgedSrcSize) end -@cenum ZSTD_frameType_e::UInt32 begin - ZSTD_frame = 0 - ZSTD_skippableFrame = 1 -end - -struct ZSTD_frameHeader - frameContentSize::Culonglong - windowSize::Culonglong - blockSizeMax::Cuint - frameType::ZSTD_frameType_e - headerSize::Cuint - dictID::Cuint - checksumFlag::Cuint -end - -function ZSTD_getFrameHeader(zfhPtr, src, srcSize) - ccall((:ZSTD_getFrameHeader, libzstd), Csize_t, (Ptr{ZSTD_frameHeader}, Ptr{Cvoid}, Csize_t), zfhPtr, src, srcSize) -end - -function ZSTD_getFrameHeader_advanced(zfhPtr, src, srcSize, format) - ccall((:ZSTD_getFrameHeader_advanced, libzstd), Csize_t, (Ptr{ZSTD_frameHeader}, Ptr{Cvoid}, Csize_t, ZSTD_format_e), zfhPtr, src, srcSize, format) -end - function ZSTD_decodingBufferSize_min(windowSize, frameContentSize) ccall((:ZSTD_decodingBufferSize_min, libzstd), Csize_t, (Culonglong, Culonglong), windowSize, frameContentSize) end @@ -904,7 +946,7 @@ function ZSTD_copyDCtx(dctx, preparedDCtx) ccall((:ZSTD_copyDCtx, libzstd), Cvoid, (Ptr{ZSTD_DCtx}, Ptr{ZSTD_DCtx}), dctx, preparedDCtx) end -@cenum ZSTD_nextInputType_e::UInt32 begin +@enum ZSTD_nextInputType_e::UInt32 begin ZSTDnit_frameHeader = 0 ZSTDnit_blockHeader = 1 ZSTDnit_block = 2 @@ -933,7 +975,7 @@ function ZSTD_insertBlock(dctx, blockStart, blockSize) ccall((:ZSTD_insertBlock, libzstd), Csize_t, (Ptr{ZSTD_DCtx}, Ptr{Cvoid}, Csize_t), dctx, blockStart, blockSize) end -@cenum ZSTD_ErrorCode::UInt32 begin +@enum ZSTD_ErrorCode::UInt32 begin ZSTD_error_no_error = 0 ZSTD_error_GENERIC = 1 ZSTD_error_prefix_unknown = 10 @@ -942,14 +984,17 @@ end ZSTD_error_frameParameter_windowTooLarge = 16 ZSTD_error_corruption_detected = 20 ZSTD_error_checksum_wrong = 22 + ZSTD_error_literals_headerWrong = 24 ZSTD_error_dictionary_corrupted = 30 ZSTD_error_dictionary_wrong = 32 ZSTD_error_dictionaryCreation_failed = 34 ZSTD_error_parameter_unsupported = 40 + ZSTD_error_parameter_combination_unsupported = 41 ZSTD_error_parameter_outOfBound = 42 ZSTD_error_tableLog_tooLarge = 44 ZSTD_error_maxSymbolValue_tooLarge = 46 ZSTD_error_maxSymbolValue_tooSmall = 48 + ZSTD_error_stabilityCondition_notRespected = 50 ZSTD_error_stage_wrong = 60 ZSTD_error_init_missing = 62 ZSTD_error_memory_allocation = 64 @@ -957,10 +1002,14 @@ end ZSTD_error_dstSize_tooSmall = 70 ZSTD_error_srcSize_wrong = 72 ZSTD_error_dstBuffer_null = 74 + ZSTD_error_noForwardProgress_destFull = 80 + ZSTD_error_noForwardProgress_inputEmpty = 82 ZSTD_error_frameIndex_tooLarge = 100 ZSTD_error_seekableIO = 102 ZSTD_error_dstBuffer_wrong = 104 ZSTD_error_srcBuffer_wrong = 105 + ZSTD_error_sequenceProducer_failed = 106 + ZSTD_error_externalSequences_invalid = 107 ZSTD_error_maxCode = 120 end @@ -972,19 +1021,23 @@ function ZSTD_getErrorString(code) ccall((:ZSTD_getErrorString, libzstd), Ptr{Cchar}, (ZSTD_ErrorCode,), code) end -const ZDICTLIB_VISIBILITY = nothing +const ZDICTLIB_VISIBLE = nothing + +const ZDICTLIB_HIDDEN = nothing + +const ZDICTLIB_API = ZDICTLIB_VISIBLE -const ZDICTLIB_API = ZDICTLIB_VISIBILITY +const ZSTDLIB_VISIBLE = nothing -const ZSTDLIB_VISIBILITY = nothing +const ZSTDLIB_HIDDEN = nothing -const ZSTDLIB_API = ZSTDLIB_VISIBILITY +const ZSTDLIB_API = ZSTDLIB_VISIBLE const ZSTD_VERSION_MAJOR = 1 const ZSTD_VERSION_MINOR = 5 -const ZSTD_VERSION_RELEASE = 0 +const ZSTD_VERSION_RELEASE = 5 const ZSTD_VERSION_NUMBER = ZSTD_VERSION_MAJOR * 100 * 100 + ZSTD_VERSION_MINOR * 100 + ZSTD_VERSION_RELEASE @@ -1010,6 +1063,10 @@ const ZSTD_CONTENTSIZE_UNKNOWN = Culonglong(0) - 1 const ZSTD_CONTENTSIZE_ERROR = Culonglong(0) - 2 +const ZSTD_MAX_INPUT_SIZE = nothing + +const ZSTDLIB_STATIC_API = ZSTDLIB_VISIBLE + const ZSTD_FRAMEHEADERSIZE_MAX = 18 const ZSTD_SKIPPABLEHEADERSIZE = 8 @@ -1062,6 +1119,8 @@ const ZSTD_STRATEGY_MIN = ZSTD_fast const ZSTD_STRATEGY_MAX = ZSTD_btultra2 +const ZSTD_BLOCKSIZE_MAX_MIN = 1 << 10 + const ZSTD_OVERLAPLOG_MIN = 0 const ZSTD_OVERLAPLOG_MAX = 9 @@ -1092,8 +1151,6 @@ const ZSTD_SRCSIZEHINT_MIN = 0 const ZSTD_SRCSIZEHINT_MAX = INT_MAX -const ZSTD_HASHLOG3_MAX = 17 - const ZSTD_c_rsyncable = ZSTD_c_experimentalParam1 const ZSTD_c_format = ZSTD_c_experimentalParam2 @@ -1118,12 +1175,20 @@ const ZSTD_c_blockDelimiters = ZSTD_c_experimentalParam11 const ZSTD_c_validateSequences = ZSTD_c_experimentalParam12 -const ZSTD_c_splitBlocks = ZSTD_c_experimentalParam13 +const ZSTD_c_useBlockSplitter = ZSTD_c_experimentalParam13 const ZSTD_c_useRowMatchFinder = ZSTD_c_experimentalParam14 const ZSTD_c_deterministicRefPrefix = ZSTD_c_experimentalParam15 +const ZSTD_c_prefetchCDictTables = ZSTD_c_experimentalParam16 + +const ZSTD_c_enableSeqProducerFallback = ZSTD_c_experimentalParam17 + +const ZSTD_c_maxBlockSize = ZSTD_c_experimentalParam18 + +const ZSTD_c_searchForExternalRepcodes = ZSTD_c_experimentalParam19 + const ZSTD_d_format = ZSTD_d_experimentalParam1 const ZSTD_d_stableOutBuffer = ZSTD_d_experimentalParam2 @@ -1132,9 +1197,15 @@ const ZSTD_d_forceIgnoreChecksum = ZSTD_d_experimentalParam3 const ZSTD_d_refMultipleDDicts = ZSTD_d_experimentalParam4 -const ZSTDERRORLIB_VISIBILITY = nothing +const ZSTD_d_disableHuffmanAssembly = ZSTD_d_experimentalParam5 + +const ZSTD_SEQUENCE_PRODUCER_ERROR = size_t(-1) + +const ZSTDERRORLIB_VISIBLE = nothing + +const ZSTDERRORLIB_HIDDEN = nothing -const ZSTDERRORLIB_API = ZSTDERRORLIB_VISIBILITY +const ZSTDERRORLIB_API = ZSTDERRORLIB_VISIBLE # exports const PREFIXES = ["ZSTD_", "ZDICT_"] diff --git a/src/libzstd/Manifest.toml b/src/libzstd/Manifest.toml deleted file mode 100644 index d542aef..0000000 --- a/src/libzstd/Manifest.toml +++ /dev/null @@ -1,148 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -[[ArgTools]] -uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" - -[[Artifacts]] -uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" - -[[Base64]] -uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" - -[[CEnum]] -git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9" -uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" -version = "0.4.1" - -[[Clang]] -deps = ["CEnum", "Clang_jll", "Downloads", "Pkg", "TOML"] -uuid = "40e3b903-d033-50b4-a0cc-940c62c95e31" -version = "0.14.0" - -[[Clang_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "libLLVM_jll"] -git-tree-sha1 = "a5923c06de3178dd755f4b9411ea8922a7ae6fb8" -uuid = "0ee61d77-7f21-5576-8119-9fcc46b10100" -version = "11.0.1+3" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" - -[[Downloads]] -deps = ["ArgTools", "LibCURL", "NetworkOptions"] -uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[JLLWrappers]] -deps = ["Preferences"] -git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" -uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.3.0" - -[[LibCURL]] -deps = ["LibCURL_jll", "MozillaCACerts_jll"] -uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" - -[[LibCURL_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] -uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" - -[[LibGit2]] -deps = ["Base64", "NetworkOptions", "Printf", "SHA"] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - -[[LibSSH2_jll]] -deps = ["Artifacts", "Libdl", "MbedTLS_jll"] -uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" - -[[Libdl]] -uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" - -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - -[[Markdown]] -deps = ["Base64"] -uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" - -[[MbedTLS_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" - -[[MozillaCACerts_jll]] -uuid = "14a3606d-f60d-562e-9121-12d972cd8159" - -[[NetworkOptions]] -uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" - -[[Pkg]] -deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - -[[Preferences]] -deps = ["TOML"] -git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" -uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.2" - -[[Printf]] -deps = ["Unicode"] -uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - -[[Random]] -deps = ["Serialization"] -uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" - -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - -[[Serialization]] -uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" - -[[Sockets]] -uuid = "6462fe0b-24de-5631-8697-dd941f90decc" - -[[TOML]] -deps = ["Dates"] -uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" - -[[Tar]] -deps = ["ArgTools", "SHA"] -uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - -[[Unicode]] -uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" - -[[Zlib_jll]] -deps = ["Libdl"] -uuid = "83775a58-1f1d-513f-b197-d71354ab007a" - -[[Zstd_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "cc4bf3fdde8b7e3e9fa0351bdeedba1cf3b7f6e6" -uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.5.0+0" - -[[libLLVM_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "8f36deef-c2a5-5394-99ed-8e07531fb29a" - -[[nghttp2_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" - -[[p7zip_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" diff --git a/src/libzstd/generator.toml b/src/libzstd/generator.toml deleted file mode 100644 index f0027b0..0000000 --- a/src/libzstd/generator.toml +++ /dev/null @@ -1,7 +0,0 @@ -[general] -library_name = "libzstd" -output_file_path = "./LibZstd.jl" -module_name = "LibZstd" -jll_pkg_name = "Zstd_jll" -export_symbol_prefixes = ["ZSTD_", "ZDICT_"] -prologue_file_path = "./prologue.jl" \ No newline at end of file diff --git a/src/libzstd/prologue.jl b/src/libzstd/prologue.jl deleted file mode 100644 index a18c8e5..0000000 --- a/src/libzstd/prologue.jl +++ /dev/null @@ -1,3 +0,0 @@ -const INT_MAX = typemax(Cint) - -ZSTD_EXPAND_AND_QUOTE(expr) = string(expr) \ No newline at end of file