Skip to content

pass explicit path to Artifact file into the artifact string macro #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

pass explicit path to Artifact file into the artifact string macro #45

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
028146e
pass explicit path to Artifact file into the artifact string macro
Sep 14, 2022
542e690
update version check now that upstream PR is merged
Oct 10, 2022
119035d
Merge branch 'master' into kc/artifact_macro_explicit_path
giordano Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/wrapper_generators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,24 @@ macro generate_wrapper_header(src_name)
@static if isdir(joinpath(dirname($(pkg_dir)), "override"))
return joinpath(dirname($(pkg_dir)), "override")
elseif @isdefined(augment_platform!) && VERSION >= v"1.6"
$(Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name, :(host_platform)))
@static if VERSION >= v"1.9.0-DEV.1497"
$(Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name, :(host_platform), joinpath(pkg_dir, "..", "Artifacts.toml")))
else
$(Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name, :(host_platform)))
end
else
# We explicitly use `macrocall` here so that we can manually pass the `__source__`
# argument, to avoid `@artifact_str` trying to lookup `Artifacts.toml` here.
return $(Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name))
@static if VERSION >= v"1.9.0-DEV.1497"
return $(Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name, nothing, joinpath(pkg_dir, "..", "Artifacts.toml")))
else
return $(Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name))
end
end
end
end)
end


macro generate_init_header(dependencies...)
deps_path_add = Expr[]
if !isempty(dependencies)
Expand Down