Add XPRESS_JL_LIBRARY

.github/workflows/ci.yml

@@ -29,14 +29,8 @@ jobs:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
       - uses: julia-actions/cache@v1
-      # - uses: julia-actions/julia-buildpkg@v1
-      # - uses: julia-actions/julia-runtest@v1
-      - name: Test
-        shell: julia --color=yes --project=. {0}
-        run: |
-          import Pkg
-          Pkg.pkg"add https://github.com/jump-dev/Xpress_jll.jl"
-          Pkg.test()
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:

Project.toml

@@ -8,8 +8,8 @@ version = "0.16.2"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-Xpress_jll = "308bddfa-7f95-4fa6-a557-f2c7addc1869"
 
 [compat]
 Downloads = "<0.0.1, 1"

src/Lib/Lib.jl

@@ -6,7 +6,12 @@
 module Lib
 
 import ..Xpress
-const libxprs = Xpress.libxprs
+global libxprs = Xpress.libxprs
+
+function _set_libxprs(new_libxprs)
+    global libxprs = new_libxprs
+    return
+end
 
 include("common.jl")
 include("xprs.jl")

src/Xpress.jl

@@ -12,16 +12,7 @@ import SparseArrays
 # Load in `deps.jl`, complaining if it does not exist
 const depsjl_path = joinpath(@__DIR__, "..", "deps", "deps.jl")
 
-if isfile(depsjl_path)
-    include(depsjl_path)
-    const libxprs = joinpath(
-        xpressdlpath,
-        string(Sys.iswindows() ? "" : "lib", "xprs", ".", Libdl.dlext),
-    )
-else
-    import Xpress_jll
-    const libxprs = Xpress_jll.libxprs
-end
+libxprs = ""
 
 include("Lib/Lib.jl")
 
@@ -45,7 +36,6 @@ const XPRS_ATTRIBUTES = Dict{String,Any}(
 )
 
 function initialize()
-    Libdl.dlopen(libxprs)
     userlic()
     init() # Call XPRSinit for initialization
     return
@@ -55,6 +45,18 @@ include("MOI/MOI_wrapper.jl")
 include("MOI/MOI_callbacks.jl")
 
 function __init__()
+    if isfile(depsjl_path)
+        include(depsjl_path)
+        global libxprs = joinpath(
+            xpressdlpath,
+            string(Sys.iswindows() ? "" : "lib", "xprs", ".", Libdl.dlext),
+        )
+    elseif haskey(ENV, "XPRESS_JL_LIBRARY")
+        global libxprs = ENV["XPRESS_JL_LIBRARY"]
+    elseif !haskey(ENV, "XPRESS_JL_NO_DEPS_ERROR")
+        error("XPRESS cannot be loaded. Please run Pkg.build(\"Xpress\").")
+    end
+    Lib._set_libxprs(libxprs)
     if !haskey(ENV, "XPRESS_JL_NO_AUTO_INIT") &&
        get(ENV, "JULIA_REGISTRYCI_AUTOMERGE", "false") != "true"
         initialize()

src/license.jl

@@ -42,7 +42,8 @@ function get_xpauthpath(xpauth_path = "", verbose::Bool = true)
 
     # user´s lib dir
     push!(candidates, joinpath(dirname(dirname(libxprs)), "bin", XPAUTH))
-    # Add the license location of Xpress_jll
+    # Add the license location of Xpress_jll. Make sure this is last, so that we
+    # find the user's license if one exists.
     push!(
         candidates,
         joinpath(dirname(dirname(libxprs)), "license", "community-xpauth.xpr"),

test/runtests.jl

@@ -3,6 +3,14 @@
 # Use of this source code is governed by an MIT-style license that can be found
 # in the LICENSE.md file or at https://opensource.org/licenses/MIT.
 
+import Pkg
+
+if get(ENV, "CI", "false") == "true"
+    Pkg.pkg"add https://github.com/jump-dev/Xpress_jll.jl"
+    import Xpress_jll
+    ENV["XPRESS_JL_LIBRARY"] = Xpress_jll.libxprs
+end
+
 using Test
 using Xpress