@@ -43,6 +43,10 @@ function Base.show(io::IO, t::BuildTimer)
43
43
end
44
44
end
45
45
46
+ const devdir = Ref (Pkg. devdir ())
47
+
48
+ codedir (name) = joinpath (devdir[], " $(name) _jll" )
49
+
46
50
exclude_logs (_, f) = f != " logs"
47
51
only_logs (_, f) = f == " logs"
48
52
@@ -266,7 +270,7 @@ function build_tarballs(ARGS, src_name, src_version, sources, script,
266
270
skip_build = check_flag! (ARGS , " --skip-build" )
267
271
268
272
if deploy_bin || deploy_jll
269
- code_dir = joinpath (Pkg . devdir (), " $( src_name) _jll " )
273
+ code_dir = codedir ( src_name)
270
274
271
275
# Shove them into `kwargs` so that we are conditionally passing them along
272
276
kwargs = (; kwargs... , code_dir = code_dir)
@@ -584,7 +588,7 @@ yggdrasil_head() = get(ENV, "BUILDKITE_COMMIT", "")
584
588
585
589
function register_jll (name, build_version, dependencies, julia_compat;
586
590
deploy_repo= " JuliaBinaryWrappers/$(name) _jll.jl" ,
587
- code_dir= joinpath (Pkg . devdir (), " $( name) _jll " ),
591
+ code_dir= _code_dir ( name),
588
592
gh_auth= Wizard. github_auth (;allow_anonymous= false ),
589
593
gh_username= gh_get_json (DEFAULT_API, " /user" ; auth= gh_auth)[" login" ],
590
594
augment_platform_block:: String = " " ,
@@ -1195,7 +1199,7 @@ end
1195
1199
function rebuild_jll_package (name:: String , build_version:: VersionNumber , sources:: Vector ,
1196
1200
platforms:: Vector , products:: Vector , dependencies:: Vector ,
1197
1201
download_dir:: String , upload_prefix:: String ;
1198
- code_dir:: String = joinpath (Pkg . devdir (), " $( name) _jll " ),
1202
+ code_dir:: String = codedir ( name),
1199
1203
verbose:: Bool = false , from_scratch:: Bool = true ,
1200
1204
kwargs... )
1201
1205
# We're going to recreate "build_output_meta"
@@ -1299,6 +1303,7 @@ function build_jll_package(src_name::String,
1299
1303
)
1300
1304
# Make way, for prince artifacti
1301
1305
mkpath (joinpath (code_dir, " src" , " wrappers" ))
1306
+ @show code_dir
1302
1307
1303
1308
# Drop build dependencies
1304
1309
dependencies = [d for d in dependencies if is_runtime_dependency (d)]
@@ -1733,7 +1738,7 @@ function build_jll_package(src_name::String,
1733
1738
end
1734
1739
1735
1740
function push_jll_package (name, build_version;
1736
- code_dir = joinpath (Pkg . devdir (), " $( name) _jll " ),
1741
+ code_dir = codedir ( name),
1737
1742
deploy_repo = " JuliaBinaryWrappers/$(name) _jll.jl" ,
1738
1743
gh_auth = Wizard. github_auth (;allow_anonymous= false ))
1739
1744
# Next, push up the wrapper code repository
0 commit comments