Merge pull request #37592 from JuliaLang/sf/artifacts_with_pkg

Author: staticfloat

contrib/generate_precompile.jl

@@ -81,12 +81,13 @@ Artifacts = get(Base.loaded_modules,
           nothing)
 if Artifacts !== nothing
     precompile_script *= """
-    using Artifacts, Base.BinaryPlatforms
-    artifacts_toml = abspath($(repr(joinpath(Sys.STDLIB, "Artifacts", "test", "Artifacts.toml"))))
+    using Artifacts, Base.BinaryPlatforms, Libdl
+    artifacts_toml = abspath(joinpath(Sys.STDLIB, "Artifacts", "test", "Artifacts.toml"))
     cd(() -> @artifact_str("c_simple"), dirname(artifacts_toml))
     artifacts = Artifacts.load_artifacts_toml(artifacts_toml)
     platforms = [Artifacts.unpack_platform(e, "c_simple", artifacts_toml) for e in artifacts["c_simple"]]
     best_platform = select_platform(Dict(p => triplet(p) for p in platforms))
+    dlopen("libjulia", RTLD_LAZY | RTLD_DEEPBIND)
     """
 end
 

doc/make.jl

@@ -181,7 +181,6 @@ DocMeta.setdocmeta!(SparseArrays, :DocTestSetup, :(using SparseArrays, LinearAlg
 DocMeta.setdocmeta!(SuiteSparse, :DocTestSetup, :(using SparseArrays, LinearAlgebra, SuiteSparse), recursive=true, warn=false)
 DocMeta.setdocmeta!(UUIDs, :DocTestSetup, :(using UUIDs, Random), recursive=true, warn=false)
 DocMeta.setdocmeta!(Pkg, :DocTestSetup, :(using Pkg, Pkg.Artifacts), recursive=true, warn=false)
-DocMeta.setdocmeta!(Pkg.BinaryPlatforms, :DocTestSetup, :(using Pkg, Pkg.BinaryPlatforms), recursive=true, warn=false)
 DocMeta.setdocmeta!(Base.BinaryPlatforms, :DocTestSetup, :(using Base.BinaryPlatforms), recursive=true, warn=false)
 
 let r = r"buildroot=(.+)", i = findfirst(x -> occursin(r, x), ARGS)

stdlib/Artifacts/src/Artifacts.jl

@@ -478,7 +478,7 @@ function jointail(dir, tail)
     end
 end
 
-function _artifact_str(__module__, artifacts_toml, name, path_tail, artifact_dict, hash)
+function _artifact_str(__module__, artifacts_toml, name, path_tail, artifact_dict, hash, platform)
     if haskey(Base.module_keys, __module__)
         # Process overrides for this UUID, if we know what it is
         process_overrides(artifact_dict, Base.module_keys[__module__].uuid)
@@ -495,7 +495,7 @@ function _artifact_str(__module__, artifacts_toml, name, path_tail, artifact_dic
     # If not, we need to download it.  We look up the Pkg module through `Base.loaded_modules()`
     # then invoke `ensure_artifact_installed()`:
     Pkg = first(filter(p-> p[1].name == "Pkg", Base.loaded_modules))[2]
-    return jointail(Pkg.Artifacts.ensure_artifact_installed(string(name), artifacts_toml), path_tail)
+    return jointail(Pkg.Artifacts.ensure_artifact_installed(string(name), artifacts_toml; platform), path_tail)
 end
 
 """
@@ -539,16 +539,19 @@ function split_artifact_slash(name::String)
 end
 
 """
-    artifact_slash_lookup(name::String, artifacts_toml::String)
+    artifact_slash_lookup(name::String, atifact_dict::Dict,
+                          artifacts_toml::String, platform::Platform)
 
 Returns `artifact_name`, `artifact_path_tail`, and `hash` by looking the results up in
 the given `artifacts_toml`, first extracting the name and path tail from the given `name`
 to support slash-indexing within the given artifact.
 """
-function artifact_slash_lookup(name::String, artifact_dict::Dict, artifacts_toml::String)
+function artifact_slash_lookup(name::String, artifact_dict::Dict,
+                               artifacts_toml::String, platform::Platform)
     artifact_name, artifact_path_tail = split_artifact_slash(name)
 
-    meta = artifact_meta(artifact_name, artifact_dict, artifacts_toml)
+    @show platform
+    meta = artifact_meta(artifact_name, artifact_dict, artifacts_toml; platform)
     if meta === nothing
         error("Cannot locate artifact '$(name)' in '$(artifacts_toml)'")
     end
@@ -577,7 +580,7 @@ access a single file/directory within an artifact.  Example:
 !!! compat "Julia 1.6"
     Slash-indexing requires at least Julia 1.6.
 """
-macro artifact_str(name)
+macro artifact_str(name, platform=nothing)
     # Find Artifacts.toml file we're going to load from
     srcfile = string(__source__.file)
     if ((isinteractive() && startswith(srcfile, "REPL[")) || (!isinteractive() && srcfile == "none")) && !isfile(srcfile)
@@ -601,18 +604,23 @@ macro artifact_str(name)
     # Invalidate calling .ji file if Artifacts.toml file changes
     Base.include_dependency(artifacts_toml)
 
-    # If `name` is a constant, we can actually load and parse the `Artifacts.toml` file now,
-    # saving the work from runtime.
-    if isa(name, AbstractString)
+    # If `name` is a constant, (and we're using the default `Platform`) we can actually load
+    # and parse the `Artifacts.toml` file now, saving the work from runtime.
+    if isa(name, AbstractString) && platform === nothing
         # To support slash-indexing, we need to split the artifact name from the path tail:
-        local artifact_name, artifact_path_tail, hash = artifact_slash_lookup(name, artifact_dict, artifacts_toml)
+        platform = HostPlatform()
+        local artifact_name, artifact_path_tail, hash = artifact_slash_lookup(name, artifact_dict, artifacts_toml, platform)
         return quote
-            Base.invokelatest(_artifact_str, $(__module__), $(artifacts_toml), $(artifact_name), $(artifact_path_tail), $(artifact_dict), $(hash))
+            Base.invokelatest(_artifact_str, $(__module__), $(artifacts_toml), $(artifact_name), $(artifact_path_tail), $(artifact_dict), $(hash), $(platform))
         end
     else
+        if platform === nothing
+            platform = :($(HostPlatform)())
+        end
         return quote
-            local artifact_name, artifact_path_tail, hash = artifact_slash_lookup($(esc(name)), $(artifact_dict), $(artifacts_toml))
-            Base.invokelatest(_artifact_str, $(__module__), $(artifacts_toml), artifact_name, artifact_path_tail, $(artifact_dict), hash)
+            local platform = $(esc(platform))
+            local artifact_name, artifact_path_tail, hash = artifact_slash_lookup($(esc(name)), $(artifact_dict), $(artifacts_toml), platform)
+            Base.invokelatest(_artifact_str, $(__module__), $(artifacts_toml), artifact_name, artifact_path_tail, $(artifact_dict), hash, platform)
         end
     end
 end

stdlib/Artifacts/test/runtests.jl

@@ -106,3 +106,14 @@ end
         end
     end
 end
+
+@testset "@artifact_str Platform passing" begin
+    mktempdir() do tempdir
+        with_artifacts_directory(tempdir) do
+            win64 = Platform("x86_64", "windows")
+            mac64 = Platform("x86_64", "macos")
+            @test basename(@artifact_str("c_simple", win64)) == "444cecb70ff39e8961dd33e230e151775d959f37"
+            @test basename(@artifact_str("c_simple", mac64)) == "7ba74e239348ea6c060f994c083260be3abe3095"
+        end
+    end
+end

stdlib/Pkg.version

@@ -1,2 +1,2 @@
 PKG_BRANCH = master
-PKG_SHA1 = 6a235eb813be335b54c97c5c7d631bdbd1059115
+PKG_SHA1 = c2c99807b157d6b9e23d09fa597800ec0e715cee