Use Xpress_jll for binaries

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         version: ['1.6', '1']  # Test against LTS and current minor release
-        os: [windows-latest]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
         arch: [x64]
     steps:
       - uses: actions/checkout@v2
@@ -30,12 +30,14 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-      - uses: julia-actions/julia-buildpkg@v1
-        env:
-          SECRET_XPRS_WIN: ${{ secrets.XPRS_WIN_900 }}
-          SECRET_XPRL_WIN: ${{ secrets.XPRL_WIN_900 }}
-          SECRET_XPRA_WIN: ${{ secrets.XPAUTH_XPR }}
-      - uses: julia-actions/julia-runtest@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/odow/Xpress_jll.jl"
+          Pkg.test()
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:

Project.toml

@@ -8,7 +8,9 @@ version = "0.16.2"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 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]
 MathOptInterface = "1"

src/Xpress.jl

@@ -3,8 +3,6 @@
 # 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.
 
-__precompile__()
-
 module Xpress
 
     using Libdl
@@ -14,14 +12,12 @@ module Xpress
 
     if isfile(depsjl_path)
         include(depsjl_path)
-    elseif !haskey(ENV, "XPRESS_JL_NO_DEPS_ERROR")
-        error("XPRESS cannot be loaded. Please run Pkg.build(\"Xpress\").")
+        const libxprs = joinpath(xpressdlpath, string(Sys.iswindows() ? "" : "lib", "xprs", ".", Libdl.dlext))
     else
-        const xpressdlpath = ""
+        import Xpress_jll
+        const libxprs = Xpress_jll.libxprs
     end
 
-    const libxprs = joinpath(xpressdlpath, string(Sys.iswindows() ? "" : "lib", "xprs", ".", Libdl.dlext))
-
     ### imports
 
     import Base.show, Base.copy
@@ -52,14 +48,20 @@ module Xpress
 
     function initialize()
         Libdl.dlopen(libxprs)
-        userlic()
+        try
+            userlic()
+        catch err
+            license = joinpath(
+                dirname(dirname(libxprs)), "license", "community-xpauth.xpr")
+            try
+                @assert isfile(license)
+                userlic(; xpauth_path = license)
+            catch
+                rethrow(err)
+            end
+        end
         init() # Call XPRSinit for initialization
-        # free is not strictly necessary since destroyprob is called
-        # inthe finalizer.
-        # the user can call free if needed.
-        # leaving it uncommented results in many print errors becaus
-        # it is called prior to finalizers.
-        # atexit(free) # Call free when process terminates
+        return
     end
 
     include("MOI/MOI_wrapper.jl")

test/runtests.jl

@@ -14,8 +14,8 @@ println("Optimizer version: $(Xpress.get_version())")
     "xprs_callbacks",
     "Derivative",
 ]
-    @testset "$(file)" for file in readdir(folder)
-        include(joinpath(folder, file))
+    @testset "$(file)" for file in readdir(joinpath(@__DIR__, folder))
+        include(joinpath(@__DIR__, folder, file))
     end
 end