-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move BinaryProvider out of src/: only used in test/
BinaryProvider is not meant to be loaded at runtime. It does lots of things that aren't acceptable at runtime, which is why it goes through the care of generating a `deps.jl` file that doesn't import it. This commit takes BinaryProvider out of `src/CxxWrap.jl` so that code using CxxWrap doesn't wind up with BinaryProvider in its runtime dependencies. Since it's only used in that one test/build.jl file anyway, this is fine.
- Loading branch information
Showing
2 changed files
with
4 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,16 @@ | ||
using BinaryProvider | ||
using CxxWrap | ||
|
||
prefix() = BinaryProvider.Prefix(dirname(dirname(jlcxx_path))) | ||
|
||
products = Product[] | ||
for basename in ["jlcxx_containers", "except", "extended", "functions", "hello", "inheritance", "parametric", "pointer_modification", "types"] | ||
fullname = "lib"*basename | ||
push!(products, LibraryProduct(CxxWrap.prefix(), fullname, Symbol(fullname))) | ||
push!(products, LibraryProduct(prefix(), fullname, Symbol(fullname))) | ||
end | ||
|
||
if any(!satisfied(p; verbose=true) for p in products) | ||
error("libcxxwrap-julia was not built with the example libraries required for testing") | ||
end | ||
|
||
write_deps_file(joinpath(@__DIR__, "deps.jl"), products) | ||
write_deps_file(joinpath(@__DIR__, "deps.jl"), products) |