Skip to content

Commit

Permalink
Merge pull request #23 from GMLC-TDC/feature/helics3Update
Browse files Browse the repository at this point in the history 
Feature/helics3 update
  • Loading branch information
@afisher1
afisher1 authored Jan 16, 2023
2 parents 4dbeb51 + 227d88d commit 1ef9711
Show file tree
Hide file tree
Showing 22 changed files with 3,971 additions and 1,394 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,3 @@ jobs:
- uses: julia-actions/julia-uploadcodecov@master
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- uses: julia-actions/julia-uploadcoveralls@master
env:
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
3 changes: 2 additions & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "HELICS"
uuid = "81524022-8764-5038-b61c-08cb1f58760f"
authors = ["Dheepak Krishnamurthy <me@kdheepak.com>"]
version = "0.7.1"
version = "3.3.2"

[deps]
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
Expand All @@ -13,6 +13,7 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
CEnum = "^0.2"
DocStringExtensions = "^0.8"
julia = "^1.3"
HELICS_jll = "^3.3.2"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
31 changes: 16 additions & 15 deletions scripts/generate.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ using HELICS
const HELICS_jll = HELICS.Lib.HELICS_jll

# LIBCLANG_HEADERS are those headers to be wrapped.
const LIBHELICS_INCLUDE = [
normpath(joinpath(HELICS_jll.artifact_dir, "include", "helics", "shared_api_library")),
normpath(joinpath(HELICS_jll.artifact_dir, "include", "helics")),
]

const LIBHELICS_HEADERS = String[]

for folder in LIBHELICS_INCLUDE
for header in readdir(folder)
if endswith(header, ".h")
push!(LIBHELICS_HEADERS, joinpath(folder, header))
end
end
end
#const LIBHELICS_INCLUDE = [
# normpath(joinpath(HELICS_jll.artifact_dir, "include", "helics", "shared_api_library")),
# normpath(joinpath(HELICS_jll.artifact_dir, "include", "helics")),
# ]
const LIBHELICS_INCLUDE = [normpath(joinpath(HELICS_jll.artifact_dir, "include", "helics"))]

const LIBHELICS_HEADERS = String[joinpath(HELICS_jll.artifact_dir,"include","helics","helics.h")]

#for folder in LIBHELICS_INCLUDE
# for header in readdir(folder)
# if endswith(header, ".h")
# push!(LIBHELICS_HEADERS, joinpath(folder, header))
# end
# end
#end

LIBHELICS_ARGS = String[]
for path in LIBHELICS_INCLUDE
Expand All @@ -32,7 +33,7 @@ wc = init(; headers = LIBHELICS_HEADERS,
clang_includes = vcat(LIBHELICS_INCLUDE..., CLANG_INCLUDE),
clang_args = LIBHELICS_ARGS,
header_wrapped = (root, current)->root == current,
header_library = x->"libhelicsSharedLib",
header_library = x->"libhelics",
clang_diagnostics = true,
)

Expand Down
Loading

2 comments on commit 1ef9711

@nightlark
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/77380

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v3.3.2 -m "<description of version>" 1ef971181244f82db24eb802a77a666d58a972d9
git push origin v3.3.2

Also, note the warning: Version 3.3.2 skips over 1.0.0
This can be safely ignored. However, if you want to fix this you can do so. Call register() again after making the fix. This will update the Pull request.

Please sign in to comment.