Skip to content

Commit

Permalink
Preparing release 0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
peremato committed Oct 31, 2024
1 parent c01b2eb commit f46c007
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "XRootD"
uuid = "164e3b87-dc46-4cbc-97a6-5b310108fce0"
authors = ["Pere Mato <[email protected]>"]
version = "0.1.0"
version = "0.2.0"

[deps]
CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4"
Expand All @@ -10,9 +10,9 @@ XRootD_cxxwrap_jll = "bb14ce0c-f071-543a-8ca1-cd3dc3e29ed0"
XRootD_jll = "b6113df7-b24e-50c0-846f-35a2e36cb9d5"

[compat]
CxxWrap = "0.14"
XRootD_cxxwrap_jll = "0.1"
XRootD_jll = "5.6, 5.7"
CxxWrap = "0.16"
XRootD_cxxwrap_jll = "0.2"
XRootD_jll = "5.7"
julia = "1.6"

[extras]
Expand Down
3 changes: 3 additions & 0 deletions docs/src/release_notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@

# Release Notes

## 0.2.0 (31-10-2024)
- Updated to XRootD 5.7.1, OpenSLL 3.0.15 and CxxWrap 0.16 (with libcxxwrap_julia_jll 0.13.2)

## 0.1.0 (31-05-2024)
- First release. It provides similar functionality as for the python bindings of the client library of XRootD
4 changes: 4 additions & 0 deletions gen/cpp/XRootDWrap.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ inline void Set(XrdCl::PropertyList& pl, const std::string& key, const std::stri
pl.Set(key, value);
}

// BinaryBuilder uses old SDK which doesn't have ranges
#ifdef __APPLE__
#undef JLCXX_HAS_RANGES
#endif
4 changes: 2 additions & 2 deletions src/File.jl
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ function Base.stat(f::File, force::Bool=true)
statinfo_p = Ref(CxxPtr{StatInfo}(C_NULL))
st = XRootD.Stat(f.file, force, statinfo_p)
if isOK(st)
statinfo = StatInfo(statinfo_p[][]) # copy constructor
XRootD.delete(statinfo_p[]) # delete the pointer
statinfo = StatInfo(statinfo_p[][]) # copy constructor
CxxWrap.CxxWrapCore.__delete(statinfo_p[]) # delete the pointer
return st, statinfo
else
return st, nothing
Expand Down
10 changes: 5 additions & 5 deletions src/FileSystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ function Base.stat(fs::FileSystem, path::String, timeout::UInt16=0x0000)
statinfo_p = Ref(CxxPtr{StatInfo}(C_NULL))
st = XRootD.Stat(fs, path, statinfo_p, timeout)
if isOK(st)
statinfo = StatInfo(statinfo_p[][]) # copy constructor
XRootD.delete(statinfo_p[]) # delete the pointer
statinfo = StatInfo(statinfo_p[][]) # copy constructor
CxxWrap.CxxWrapCore.__delete(statinfo_p[]) # delete the pointer
return st, statinfo
else
return st, nothing
Expand Down Expand Up @@ -114,7 +114,7 @@ function locate(fs::FileSystem, path::String, flags::XRootD.XrdCl!OpenFlags!Flag
loc = At(locations_p[], i)
push!(locations, Location(loc |> GetAddress, loc |> GetType, loc |> GetAccessType))
end
XRootD.delete(locations_p[]) # delete the pointer
CxxWrap.CxxWrapCore.__delete(locations_p[]) # delete the pointer
return st, locations
else
return st, nothing
Expand Down Expand Up @@ -208,7 +208,7 @@ function query(fs::FileSystem, code::XRootD.XrdCl!QueryCode!Code , arg::String,
st = XRootD.Query(fs, code, arg_b, buffer_p, timeout)
if isOK(st)
response = ToString(buffer_p[][])
XRootD.delete(buffer_p[]) # delete the pointer
CxxWrap.CxxWrapCore.__delete(buffer_p[]) # delete the pointer
return st, response
else
return st, nothing
Expand Down Expand Up @@ -307,7 +307,7 @@ function protocol(fs::FileSystem, timeout::UInt16=0x0000)
st = XRootD.Protocol(fs, protocol_p, timeout)
if isOK(st)
protocol = ProtocolInfo(GetVersion(protocol_p[][]), GetHostInfo(protocol_p[][])) # constructor
XRootD.delete(protocol_p[]) # delete the pointer
CxxWrap.CxxWrapCore.__delete(protocol_p[]) # delete the pointer
return st, protocol
else
return st, nothing
Expand Down
2 changes: 1 addition & 1 deletion src/XRootD.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module XRootD
# Check whether the wrappers have been build locally otherwise use the binary package XRootD_cxxwrap_jll
gendir = normpath(joinpath(@__DIR__, "../gen"))
if isdir(joinpath(gendir, "build/lib"))
include(joinpath(gendir, "jl/XRootD-export.jl"))
include(joinpath(gendir, "jl/src/XRootD-export.jl"))
@wrapmodule(()->joinpath(gendir, "build/lib", "libXRootDWrap.$(Libdl.dlext)"))
else
using XRootD_cxxwrap_jll
Expand Down

0 comments on commit f46c007

Please sign in to comment.