Merge pull request #1133 from JuliaPackaging/vc/uuid

Allow for non jll dependencies

Author: vchuravy

src/AutoBuild.jl

@@ -1425,6 +1425,29 @@ const uuid_package = UUID("cfb74b52-ec16-5bb7-a574-95d9e393895e")
 # For even more interesting historical reasons, we append an extra
 # "_jll" to the name of the new package before computing its UUID.
 jll_uuid(name) = bb_specific_uuid5(uuid_package, "$(name)_jll")
+
+function find_uuid(ctx, pkg)
+    if Pkg.Types.has_uuid(pkg)
+        return pkg.uuid
+    end
+    depname = getname(pkg)
+    @static if VERSION >= v"1.7"
+        uuids = Pkg.Types.registered_uuids(ctx.registries, depname)
+    else
+        uuids = Pkg.Types.registered_uuids(ctx, depname)
+    end
+    if isempty(uuids)
+        return nothing
+    end
+    if length(uuids) == 1
+        return first(uuids)
+    end
+    error("""
+    Multiple UUIDs found for package `$(depname)`.
+    Use `PackageSpec(name = \"$(depname)\", uuid = ..." to specify the UUID explicitly.
+    """)
+end
+
 function build_project_dict(name, version, dependencies::Array{Dependency}, julia_compat::String=DEFAULT_JULIA_VERSION_SPEC; lazy_artifacts::Bool=false, kwargs...)
     Pkg.Types.semver_spec(julia_compat) # verify julia_compat is valid
     project = Dict(
@@ -1437,9 +1460,16 @@ function build_project_dict(name, version, dependencies::Array{Dependency}, juli
         "compat" => Dict{String,Any}("JLLWrappers" => "1.2.0",
                                      "julia" => "$(julia_compat)")
     )
+
+    ctx = Pkg.Types.Context()
     for dep in dependencies
+        pkgspec = getpkg(dep)
         depname = getname(dep)
-        project["deps"][depname] = string(jll_uuid(depname))
+        uuid = find_uuid(ctx, pkgspec)
+        if uuid === nothing
+            uuid = jll_uuid(depname)
+        end
+        project["deps"][depname] = string(uuid)
         if dep isa Dependency && length(dep.compat) > 0
             Pkg.Types.semver_spec(dep.compat) # verify dep.compat is valid
             project["compat"][depname] = dep.compat

test/jll.jl

@@ -9,13 +9,19 @@ module TestJLL end
     @test jll_uuid("Zlib_jll") == UUID("83775a58-1f1d-513f-b197-d71354ab007a")
     @test jll_uuid("FFMPEG_jll") == UUID("b22a6f82-2f65-5046-a5b2-351ab43fb4e5")
 
-    project = build_project_dict("LibFoo", v"1.3.5", [Dependency("Zlib_jll"), Dependency(PackageSpec(name = "XZ_jll"), compat = "=2.4.6")])
+    project = build_project_dict("LibFoo", v"1.3.5",
+        [Dependency("Zlib_jll"),
+         Dependency(PackageSpec(name = "XZ_jll"), compat = "=2.4.6"),
+         Dependency(PackageSpec(name = "Preferences", uuid = parse(UUID, "21216c6a-2e73-6563-6e65-726566657250"))),
+         Dependency("Scratch"),])
     @test project["deps"] == Dict("JLLWrappers" => "692b3bcd-3c85-4b1f-b108-f13ce0eb3210",
                                   "Artifacts"   => "56f22d72-fd6d-98f1-02f0-08ddc0907c33",
                                   "Pkg"         => "44cfe95a-1eb2-52ea-b672-e2afdf69b78f",
                                   "Zlib_jll"    => "83775a58-1f1d-513f-b197-d71354ab007a",
                                   "Libdl"       => "8f399da3-3557-5675-b5ff-fb832c97cbdb",
-                                  "XZ_jll"      => "ffd25f8a-64ca-5728-b0f7-c24cf3aae800")
+                                  "XZ_jll"      => "ffd25f8a-64ca-5728-b0f7-c24cf3aae800",
+                                  "Preferences" => "21216c6a-2e73-6563-6e65-726566657250",
+                                  "Scratch"     => "6c6a2e73-6563-6170-7368-637461726353")
     @test project["name"] == "LibFoo_jll"
     @test project["uuid"] == "b250f842-3251-58d3-8ee4-9a24ab2bab3f"
     @test project["compat"] == Dict("julia" => "1.0", "XZ_jll" => "=2.4.6", "JLLWrappers" => "1.2.0")