Add Preferences.jl compat shims for Julia v1.3-1.5

Author: staticfloat

src/products/executable_generators.jl

@@ -62,7 +62,7 @@ macro init_executable_product(product_name, product_path)
     path_name = Symbol(string(product_name, "_path"))
     return esc(quote
         # Locate the executable on-disk, store into $(path_name)
-        global $(path_name) = @load_preference($(preference_name), joinpath(artifact_dir, $(product_path)))
+        global $(path_name) = $(emit_preference_path_load(preference_name, product_path))
 
         # Add this executable's directory onto the list of PATH's that we'll need to expose to dependents
         push!(PATH_list, joinpath(artifact_dir, $(dirname(product_path))))

src/products/file_generators.jl

@@ -16,7 +16,7 @@ macro init_file_product(product_name, product_path)
     path_name = Symbol(string(product_name, "_path"))
     return esc(quote
         # FileProducts are very simple, and we maintain the `_path` suffix version for consistency
-        global $(path_name) = @load_preference($(preference_name), joinpath(artifact_dir, $(product_path)))
+        global $(path_name) = $(emit_preference_path_load(preference_name, product_path))
         global $(product_name) = $(path_name)
     end)
 end

src/products/library_generators.jl

@@ -43,7 +43,7 @@ macro init_library_product(product_name, product_path, dlopen_flags)
     path_name = Symbol(string(product_name, "_path"))
     preference_name = string(product_name, "_path")
     return excat(quote
-            global $(path_name) = @load_preference($(preference_name), joinpath(artifact_dir, $(product_path)))
+            global $(path_name) = $(emit_preference_path_load(preference_name, product_path))
             # Manually `dlopen()` this right now so that future invocations
             # of `ccall` with its path/SONAME will find this path immediately.
             # dlopen_flags === nothing means to not dlopen the library.

src/wrapper_generators.jl

@@ -49,3 +49,22 @@ macro generate_init_footer()
         LIBPATH[] = join(vcat(LIBPATH_list, Base.invokelatest(JLLWrappers.get_julia_libpaths))::Vector{String}, $(pathsep))
     end)
 end
+
+
+"""
+emit_preference_path_load(pref_name, default_value)
+
+On Julia 1.6+, emits a `load_preference()` call for the given preference name,
+with the given default value.  On Julia 1.5-, simply emits the default value.
+"""
+function emit_preference_path_load(pref_name, product_path)
+    # Can't use `Preferences.jl` on older Julias, just always use the default value in that case
+    if VERSION < v"1.6.0-DEV"
+        return quote
+            joinpath(artifact_dir, $(product_path))
+        end
+    end
+    return quote    
+        @load_preference($(pref_name), joinpath(artifact_dir, $(product_path)))
+    end
+end

test/runtests.jl

@@ -1,17 +1,23 @@
 using JLLWrappers
-using Pkg, Preferences
+using Pkg
 using Test
 
+@static if VERSION >= v"1.6.0-DEV"
+    using Preferences
+end
+
 module TestJLL end
 
 @testset "JLLWrappers.jl" begin
     mktempdir() do dir
         Pkg.activate(dir)
 
         # Prepare some overrides for various products
-        set_preferences!(joinpath(dir, "LocalPreferences.toml"), "Vulkan_Headers_jll", "vulkan_hpp_path" => "foo")
-        set_preferences!(joinpath(dir, "LocalPreferences.toml"), "HelloWorldC_jll", "goodbye_world" => "goodbye")
-        set_preferences!(joinpath(dir, "LocalPreferences.toml"), "OpenLibm_jll", "libnonexisting_path" => "libreallynonexisting")
+        @static if VERSION >= v"1.6.0-DEV"
+            set_preferences!(joinpath(dir, "LocalPreferences.toml"), "Vulkan_Headers_jll", "vulkan_hpp_path" => "foo")
+            set_preferences!(joinpath(dir, "LocalPreferences.toml"), "HelloWorldC_jll", "goodbye_world" => "goodbye")
+            set_preferences!(joinpath(dir, "LocalPreferences.toml"), "OpenLibm_jll", "libnonexisting_path" => "libreallynonexisting")
+        end
 
         # Package with a FileProduct
         Pkg.develop(PackageSpec(path=joinpath(@__DIR__, "Vulkan_Headers_jll")))
@@ -20,9 +26,15 @@ module TestJLL end
         @test isfile(@eval TestJLL vk_xml)
         @test isfile(@eval TestJLL Vulkan_Headers_jll.vk_xml_path)
         @test isfile(@eval TestJLL Vulkan_Headers_jll.get_vk_xml_path())
-        @test !isfile(@eval TestJLL vulkan_hpp)
-        @test !isfile(@eval TestJLL Vulkan_Headers_jll.vulkan_hpp_path)
-        @test !isfile(@eval TestJLL Vulkan_Headers_jll.get_vulkan_hpp_path())
+        @static if VERSION >= v"1.6.0-DEV"
+            @test !isfile(@eval TestJLL vulkan_hpp)
+            @test !isfile(@eval TestJLL Vulkan_Headers_jll.vulkan_hpp_path)
+            @test !isfile(@eval TestJLL Vulkan_Headers_jll.get_vulkan_hpp_path())
+        else
+            @test isfile(@eval TestJLL vulkan_hpp)
+            @test isfile(@eval TestJLL Vulkan_Headers_jll.vulkan_hpp_path)
+            @test isfile(@eval TestJLL Vulkan_Headers_jll.get_vulkan_hpp_path())
+        end
         @test isdir(@eval TestJLL Vulkan_Headers_jll.artifact_dir)
         @test isempty(@eval TestJLL Vulkan_Headers_jll.PATH[])
         @test occursin(Sys.BINDIR, @eval TestJLL Vulkan_Headers_jll.LIBPATH[])
@@ -42,6 +54,11 @@ module TestJLL end
             @test occursin(Sys.BINDIR, @eval TestJLL HelloWorldC_jll.LIBPATH[])
             @test !isfile(@eval TestJLL HelloWorldC_jll.goodbye_world_path)
             @test !isfile(@eval TestJLL HelloWorldC_jll.get_goodbye_world_path())
+            @static if VERSION >= v"1.6.0-DEV"
+                @test basename(@eval TestJLL HelloWorldC_jll.get_goodbye_world_path()) == "goodbye"
+            else
+                @test basename(@eval TestJLL HelloWorldC_jll.get_goodbye_world_path()) == "goodbye_world"
+            end
         end
 
         # Package with a LibraryProduct
@@ -55,7 +72,12 @@ module TestJLL end
         @test isempty(@eval TestJLL OpenLibm_jll.PATH[])
         @test occursin(Sys.BINDIR, @eval TestJLL OpenLibm_jll.LIBPATH[])
         @test C_NULL == @eval TestJLL OpenLibm_jll.libnonexisting_handle
-        @test @eval TestJLL OpenLibm_jll.libnonexisting_path == "libreallynonexisting"
+
+        @static if VERSION >= v"1.6.0-DEV"
+            @test @eval TestJLL OpenLibm_jll.libnonexisting_path == "libreallynonexisting"
+        else
+            @test startswith(basename(@eval TestJLL OpenLibm_jll.libnonexisting_path), "libnonexisting")
+        end
 
         # Issue #20
         if Sys.iswindows()