Merge preference_name and path_name

I decided that having `_path` on the end of preferences is a smart idea,
so that we can do other things like `_dlflags` or something in the
future.

Author: staticfloat

src/products/executable_generators.jl

@@ -59,7 +59,7 @@ end
 
 macro init_executable_product(product_name, product_path)
     preference_name = string(product_name, "_path")
-    path_name = Symbol(string(product_name, "_path"))
+    path_name = Symbol(preference_name)
     return esc(quote
         # Locate the executable on-disk, store into $(path_name)
         global $(path_name) = $(emit_preference_path_load(preference_name, product_path))

src/products/file_generators.jl

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

src/products/library_generators.jl

@@ -40,8 +40,8 @@ end
 
 macro init_library_product(product_name, product_path, dlopen_flags)
     handle_name = Symbol(string(product_name, "_handle"))
-    path_name = Symbol(string(product_name, "_path"))
     preference_name = string(product_name, "_path")
+    path_name = Symbol(preference_name)
     return excat(quote
             global $(path_name) = $(emit_preference_path_load(preference_name, product_path))
             # Manually `dlopen()` this right now so that future invocations

src/wrapper_generators.jl

@@ -59,12 +59,13 @@ 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"
+    @static 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)))
+    else
+        return quote
+            @load_preference($(pref_name), joinpath(artifact_dir, $(product_path)))
+        end
     end
 end

test/runtests.jl

@@ -15,7 +15,7 @@ module TestJLL end
         # Prepare some overrides for various products
         @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"), "HelloWorldC_jll", "goodbye_world_path" => "goodbye")
             set_preferences!(joinpath(dir, "LocalPreferences.toml"), "OpenLibm_jll", "libnonexisting_path" => "libreallynonexisting")
         end