Update src/LibSCIP using the latest SCIP_jll

Author: odow

gen/Project.toml

@@ -1,2 +1,3 @@
 [deps]
 Clang = "40e3b903-d033-50b4-a0cc-940c62c95e31"
+SCIP_jll = "e5ac4fe4-a920-5659-9bf8-f9f73e9e79ce"

gen/generate_wrapper.jl

@@ -6,51 +6,24 @@
 using Clang.Generators
 using SCIP_jll
 
-cd(@__DIR__)
+const HEADER_BASE = joinpath(SCIP_jll.artifact_dir, "include")
 
-const (HEADER_BASE, is_default) = if haskey(ENV, "SCIPDIR")
-    (joinpath(ENV["SCIPDIR"], "src"), false)
-else
-    (joinpath(SCIP_jll.artifact_dir, "include"), true)
-end
-
-const SCIP_TYPES_H =
-    filter(readdir(joinpath(HEADER_BASE, "scip"); join=true)) do f
-        occursin("type", f) && endswith(f, ".h")
-    end
-push!(SCIP_TYPES_H, joinpath(HEADER_BASE, "scip/def.h"))
-push!(SCIP_TYPES_H, joinpath(HEADER_BASE, "scip/nlpi.h"))
-push!(SCIP_TYPES_H, joinpath(HEADER_BASE, "scip/scipdefplugins.h"))
-
-# add the generated config.h file, either from JLL or build dir
-if is_default
-    push!(SCIP_TYPES_H, joinpath(HEADER_BASE, "scip/config.h"))
-end
-
-const SCIP_PUB_H =
+headers = vcat(
     filter(readdir(joinpath(HEADER_BASE, "scip"); join=true)) do f
-        occursin("pub", f) && endswith(f, ".h")
-    end
-
-const SCIP_MEM_H =
-    filter(readdir(joinpath(HEADER_BASE, "blockmemshell"); join=true)) do f
-        endswith(f, ".h")
-    end
-
-const SCIP_LPI_H = filter(readdir(joinpath(HEADER_BASE, "lpi"); join=true)) do f
-    endswith(f, ".h")
-end
-
-headers = append!(SCIP_TYPES_H, SCIP_PUB_H, SCIP_MEM_H, SCIP_LPI_H)
-
-options = load_options(joinpath(@__DIR__, "generator.toml"))
-
-args = get_default_args()
-push!(args, "-I$HEADER_BASE")
-if !is_default
-    push!(args, "-I$SCIP_BUILD_DIR/scip")
-end
-
-ctx = create_context(headers, args, options)
-
-build!(ctx)
+        return occursin("type", f) || occursin("pub", f)
+    end,
+    joinpath(HEADER_BASE, "scip/def.h"),
+    joinpath(HEADER_BASE, "scip/nlpi.h"),
+    joinpath(HEADER_BASE, "scip/scipdefplugins.h"),
+    joinpath(HEADER_BASE, "scip/config.h"),
+    readdir(joinpath(HEADER_BASE, "blockmemshell"); join=true),
+    readdir(joinpath(HEADER_BASE, "lpi"); join=true),
+)
+
+build!(
+    create_context(
+        filter!(f -> endswith(f, ".h"), headers),
+        vcat(get_default_args(), "-I$HEADER_BASE"),
+        load_options(joinpath(@__DIR__, "generator.toml")),
+    ),
+)

gen/generator.toml

@@ -1,9 +1,9 @@
 [general]
 library_name = "libscip"
-output_file_path = "../src/LibSCIP.jl"
+output_file_path = "src/LibSCIP.jl"
 module_name = "LibSCIP"
-prologue_file_path = "./prologue.jl"
-export_symbol_prefixes = ["SCIP_", "SCIP", "BMS_"]
+prologue_file_path = "gen/prologue.jl"
+export_symbol_prefixes = ["SCIP", "BMS_"]
 
 use_julia_native_enum_type = true
 use_deterministic_symbol = true

gen/prologue.jl

@@ -1,3 +1,8 @@
+# Copyright (c) 2018 Felipe Serrano, Miles Lubin, Robert Schwarz, and contributors
+#
+# 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.
+
 using ..SCIP: libscip
 
 const uint8_t = UInt8