Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Commit 4a2ae56

Browse files
staticfloatstaticfloat
committed
Use @__MODULE__ in __init__() for greater relocatability
1 parent 2dbdb4c commit 4a2ae56

File tree

2 files changed

+1
-60
lines changed

2 files changed

+1
-60
lines changed

‎src/BinaryProvider.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function __init__()
2222
global global_prefix
2323

2424
# Initialize our global_prefix
25-
global_prefix = Prefix(joinpath(dirname(@__FILE__), "../", "global_prefix"))
25+
global_prefix = Prefix(joinpath(dirname(pathof(@__MODULE__)), "..", "global_prefix"))
2626

2727
# Find the right download/compression engines for this platform
2828
probe_platform_engines!()

‎src/precompile.jl

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,32 @@
11
function _precompile_()
22
ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
3-
precompile(Tuple{getfield(BinaryProvider, Symbol("##locate#149")), Bool, BinaryProvider.Windows, Bool, typeof(identity), BinaryProvider.LibraryProduct})
4-
precompile(Tuple{getfield(BinaryProvider, Symbol("##uninstall#132")), Bool, typeof(identity), String})
5-
precompile(Tuple{getfield(BinaryProvider, Symbol("##locate#149")), Bool, BinaryProvider.Linux, Bool, typeof(identity), BinaryProvider.LibraryProduct})
6-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##satisfied")), NamedTuple{(:verbose,), Tuple{Bool}}, typeof(BinaryProvider.satisfied), BinaryProvider.ExecutableProduct})
7-
precompile(Tuple{getfield(BinaryProvider, Symbol("##locate#151")), BinaryProvider.MacOS, Bool, Bool, typeof(identity), BinaryProvider.FileProduct})
8-
precompile(Tuple{getfield(BinaryProvider, Symbol("##locate#150")), BinaryProvider.Windows, Bool, Bool, typeof(identity), BinaryProvider.ExecutableProduct})
9-
precompile(Tuple{getfield(BinaryProvider, Symbol("##download_verify#90")), Bool, Bool, Bool, typeof(identity), String, String, String})
10-
precompile(Tuple{getfield(BinaryProvider, Symbol("##locate#150")), BinaryProvider.MacOS, Bool, Bool, typeof(identity), BinaryProvider.ExecutableProduct})
113
precompile(Tuple{typeof(BinaryProvider.safe_isfile), String})
12-
precompile(Tuple{getfield(BinaryProvider, Symbol("#get_field#109")), Base.RegexMatch, Base.Dict{Symbol, String}})
13-
precompile(Tuple{getfield(BinaryProvider, Symbol("##download_verify_unpack#96")), Nothing, Bool, Bool, Bool, typeof(identity), String, String, String})
144
precompile(Tuple{typeof(BinaryProvider.info_onchange), String, String, Int64})
15-
precompile(Tuple{getfield(BinaryProvider, Symbol("##OutputCollector#5")), Bool, Bool, Base.TTY, Type{Int}, Base.OrCmds})
16-
precompile(Tuple{getfield(BinaryProvider, Symbol("#get_field#109")), Nothing, Base.Dict{Symbol, String}})
175
precompile(Tuple{typeof(BinaryProvider.detect_libgfortran_abi), String, BinaryProvider.Windows})
186
precompile(Tuple{typeof(BinaryProvider.detect_libgfortran_abi), String, BinaryProvider.MacOS})
19-
precompile(Tuple{getfield(BinaryProvider, Symbol("##locate#150")), BinaryProvider.Linux, Bool, Bool, typeof(identity), BinaryProvider.ExecutableProduct})
20-
precompile(Tuple{getfield(BinaryProvider, Symbol("##install#129")), BinaryProvider.Prefix, String, Bool, Bool, Bool, typeof(identity), String, String})
21-
precompile(Tuple{getfield(BinaryProvider, Symbol("##tee#13")), Bool, Base.TTY, typeof(identity), BinaryProvider.OutputCollector})
22-
precompile(Tuple{getfield(BinaryProvider, Symbol("##unpack#94")), Bool, typeof(identity), String, String})
23-
precompile(Tuple{getfield(BinaryProvider, Symbol("##probe_cmd#29")), Bool, typeof(identity), Base.Cmd})
24-
precompile(Tuple{getfield(BinaryProvider, Symbol("##probe_platform_engines!#30")), Bool, typeof(identity)})
25-
precompile(Tuple{getfield(BinaryProvider, Symbol("##locate#149")), Bool, BinaryProvider.MacOS, Bool, typeof(identity), BinaryProvider.LibraryProduct})
26-
precompile(Tuple{getfield(BinaryProvider, Symbol("##49#70")), Base.Cmd})
277
precompile(Tuple{getfield(BinaryProvider, Symbol("#url_ext#97")), String})
28-
precompile(Tuple{getfield(BinaryProvider, Symbol("##download#89")), Bool, typeof(identity), String, String})
29-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##satisfied")), NamedTuple{(:verbose, :isolate), Tuple{Bool, Bool}}, typeof(BinaryProvider.satisfied), BinaryProvider.FileProduct})
30-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##package")), NamedTuple{(:verbose,), Tuple{Bool}}, typeof(BinaryProvider.package), BinaryProvider.Prefix, String, Base.VersionNumber})
31-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##isinstalled")), NamedTuple{(:prefix,), Tuple{BinaryProvider.Prefix}}, typeof(BinaryProvider.isinstalled), String, String})
328
precompile(Tuple{typeof(BinaryProvider.parse_7z_list), String})
339
precompile(Tuple{typeof(BinaryProvider.platform_key_abi), Base.SubString{String}})
34-
precompile(Tuple{getfield(BinaryProvider, Symbol("##Linux#98#99")), Symbol, Symbol, BinaryProvider.CompilerABI, Type{Int}, Symbol})
35-
precompile(Tuple{getfield(BinaryProvider, Symbol("##package#145")), BinaryProvider.MacOS, Bool, Bool, typeof(identity), BinaryProvider.Prefix, String, Base.VersionNumber})
3610
precompile(Tuple{typeof(BinaryProvider.libdir), BinaryProvider.Prefix})
37-
precompile(Tuple{getfield(BinaryProvider, Symbol("##tee#13")), Bool, Base.GenericIOBuffer{Array{UInt8, 1}}, typeof(identity), BinaryProvider.OutputCollector})
38-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##tee")), NamedTuple{(:stream,), Tuple{Base.GenericIOBuffer{Array{UInt8, 1}}}}, typeof(BinaryProvider.tee), BinaryProvider.OutputCollector})
3911
precompile(Tuple{typeof(BinaryProvider.detect_libgfortran_abi), String, BinaryProvider.Linux})
40-
precompile(Tuple{getfield(BinaryProvider, Symbol("##merge#6")), Bool, typeof(identity), BinaryProvider.OutputCollector})
4112
precompile(Tuple{typeof(BinaryProvider.readuntil_many), Base.Pipe, Array{Char, 1}})
42-
precompile(Tuple{getfield(BinaryProvider, Symbol("##FreeBSD#104#105")), Symbol, Symbol, BinaryProvider.CompilerABI, Type{Int}, Symbol})
43-
precompile(Tuple{getfield(BinaryProvider, Symbol("##tail#12")), Int64, Bool, typeof(identity), BinaryProvider.OutputCollector})
44-
precompile(Tuple{getfield(BinaryProvider, Symbol("##isinstalled#126")), BinaryProvider.Prefix, typeof(identity), String, String})
4513
precompile(Tuple{typeof(BinaryProvider.parse_dl_name_version), String, BinaryProvider.MacOS})
46-
precompile(Tuple{getfield(BinaryProvider, Symbol("##77#83")), Int64})
47-
precompile(Tuple{getfield(BinaryProvider, Symbol("##OutputCollector#5")), Bool, Bool, Base.GenericIOBuffer{Array{UInt8, 1}}, Type{Int}, Base.Cmd})
4814
precompile(Tuple{typeof(BinaryProvider.parse_dl_name_version), String, BinaryProvider.Windows})
49-
precompile(Tuple{getfield(BinaryProvider, Symbol("##Windows#102#103")), Symbol, Symbol, BinaryProvider.CompilerABI, Type{Int}, Symbol})
5015
precompile(Tuple{typeof(BinaryProvider.probe_symlink_creation), String})
51-
precompile(Tuple{getfield(BinaryProvider, Symbol("##OutputCollector#5")), Bool, Bool, Base.TTY, Type{Int}, Base.Cmd})
5216
precompile(Tuple{typeof(BinaryProvider.locate), BinaryProvider.ExecutableProduct})
53-
precompile(Tuple{getfield(BinaryProvider, Symbol("#joinenv#125")), String, Array{String, 1}, String, Array{String, 1}})
5417
precompile(Tuple{typeof(BinaryProvider.extract_platform_key), String})
55-
precompile(Tuple{getfield(BinaryProvider, Symbol("##list_tarball_files#139")), Bool, typeof(identity), String})
56-
precompile(Tuple{getfield(BinaryProvider, Symbol("#joinenv#125")), String, Array{String, 1}, String, Array{Any, 1}})
57-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##satisfied")), NamedTuple{(:verbose, :platform), Tuple{Bool, BinaryProvider.Linux}}, typeof(BinaryProvider.satisfied), BinaryProvider.LibraryProduct})
5818
precompile(Tuple{typeof(BinaryProvider.triplet), BinaryProvider.Windows})
5919
precompile(Tuple{typeof(BinaryProvider.triplet), BinaryProvider.MacOS})
60-
precompile(Tuple{getfield(BinaryProvider, Symbol("##manifest_for_file#134")), BinaryProvider.Prefix, typeof(identity), String})
6120
precompile(Tuple{typeof(BinaryProvider.triplet), BinaryProvider.Linux})
6221
precompile(Tuple{typeof(BinaryProvider.triplet), BinaryProvider.FreeBSD})
63-
precompile(Tuple{getfield(BinaryProvider, Symbol("##withenv#124")), Bool, typeof(identity), typeof(identity), Array{BinaryProvider.Prefix, 1}})
6422
precompile(Tuple{typeof(BinaryProvider.platforms_match), BinaryProvider.MacOS, BinaryProvider.MacOS})
6523
precompile(Tuple{typeof(BinaryProvider.platform_key_abi), String})
6624
precompile(Tuple{typeof(BinaryProvider.platforms_match), BinaryProvider.Linux, BinaryProvider.Linux})
67-
precompile(Tuple{getfield(BinaryProvider, Symbol("##satisfied#148")), BinaryProvider.MacOS, Bool, Bool, typeof(identity), BinaryProvider.FileProduct})
68-
precompile(Tuple{getfield(BinaryProvider, Symbol("##satisfied#148")), BinaryProvider.MacOS, Bool, Bool, typeof(identity), BinaryProvider.ExecutableProduct})
6925
precompile(Tuple{typeof(BinaryProvider.package), BinaryProvider.Prefix, String, Base.VersionNumber})
70-
precompile(Tuple{getfield(BinaryProvider, Symbol("##satisfied#148")), BinaryProvider.MacOS, Bool, Bool, typeof(identity), BinaryProvider.LibraryProduct})
71-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##tail")), NamedTuple{(:colored,), Tuple{Bool}}, typeof(BinaryProvider.tail), BinaryProvider.OutputCollector})
72-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##satisfied")), NamedTuple{(:verbose,), Tuple{Bool}}, typeof(BinaryProvider.satisfied), BinaryProvider.FileProduct})
73-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##install")), NamedTuple{(:prefix, :verbose), Tuple{BinaryProvider.Prefix, Bool}}, typeof(BinaryProvider.install), String, String})
74-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##install")), NamedTuple{(:prefix, :ignore_platform), Tuple{BinaryProvider.Prefix, Bool}}, typeof(BinaryProvider.install), String, String})
75-
precompile(Tuple{getfield(BinaryProvider, Symbol("##manifest_from_url#133")), BinaryProvider.Prefix, typeof(identity), String})
76-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##install")), NamedTuple{(:prefix,), Tuple{BinaryProvider.Prefix}}, typeof(BinaryProvider.install), String, String})
77-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##install")), NamedTuple{(:prefix, :verbose, :ignore_platform), Tuple{BinaryProvider.Prefix, Bool, Bool}}, typeof(BinaryProvider.install), String, String})
7826
precompile(Tuple{typeof(BinaryProvider.parse_tar_list), String})
79-
precompile(Tuple{getfield(BinaryProvider, Symbol("##satisfied#148")), BinaryProvider.Linux, Bool, Bool, typeof(identity), BinaryProvider.ExecutableProduct})
80-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##satisfied")), NamedTuple{(:verbose, :isolate), Tuple{Bool, Bool}}, typeof(BinaryProvider.satisfied), BinaryProvider.LibraryProduct})
81-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##satisfied")), NamedTuple{(:verbose,), Tuple{Bool}}, typeof(BinaryProvider.satisfied), BinaryProvider.LibraryProduct})
82-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##tee")), NamedTuple{(:stream,), Tuple{Base.TTY}}, typeof(BinaryProvider.tee), BinaryProvider.OutputCollector})
8327
precompile(Tuple{typeof(BinaryProvider.choose_download), Base.Dict{BinaryProvider.Platform, String}, BinaryProvider.Windows})
84-
precompile(Tuple{getfield(BinaryProvider, Symbol("##verify#140")), Bool, Bool, String, typeof(identity), String, String})
8528
precompile(Tuple{typeof(BinaryProvider.choose_download), Base.Dict{BinaryProvider.Platform, Tuple{String, String}}, BinaryProvider.MacOS})
8629
precompile(Tuple{typeof(BinaryProvider.choose_download), Base.Dict{BinaryProvider.Platform, String}, BinaryProvider.MacOS})
87-
precompile(Tuple{getfield(BinaryProvider, Symbol("#kw##probe_platform_engines!")), NamedTuple{(:verbose,), Tuple{Bool}}, typeof(BinaryProvider.probe_platform_engines!)})
8830
precompile(Tuple{typeof(BinaryProvider.__init__)})
8931
precompile(Tuple{typeof(BinaryProvider.choose_download), Base.Dict{BinaryProvider.Platform, String}, BinaryProvider.Linux})
9032
precompile(Tuple{typeof(BinaryProvider.platforms_match), BinaryProvider.Linux, BinaryProvider.UnknownPlatform})
@@ -100,7 +42,6 @@ function _precompile_()
10042
precompile(Tuple{typeof(BinaryProvider.libdir), BinaryProvider.Prefix, BinaryProvider.MacOS})
10143
precompile(Tuple{typeof(BinaryProvider.platforms_match), BinaryProvider.Linux, BinaryProvider.Windows})
10244
precompile(Tuple{typeof(BinaryProvider.list_tarball_files), String})
103-
precompile(Tuple{getfield(BinaryProvider, Symbol("##130#131")), Base.IOStream})
10445
precompile(Tuple{typeof(BinaryProvider.arch), BinaryProvider.Linux})
10546
precompile(Tuple{typeof(BinaryProvider.platforms_match), BinaryProvider.Linux, BinaryProvider.MacOS})
10647
precompile(Tuple{typeof(BinaryProvider.arch), BinaryProvider.Windows})

0 commit comments

Comments
 (0)