diff --git a/J/JSBSim/build_tarballs.jl b/J/JSBSim/build_tarballs.jl index eb277ff641c..2765954a9ea 100644 --- a/J/JSBSim/build_tarballs.jl +++ b/J/JSBSim/build_tarballs.jl @@ -1,19 +1,25 @@ -using BinaryBuilder +using BinaryBuilder, Pkg name = "JSBSim" -version = v"1.1.5" -julia_version = v"1.5.3" +version = v"1.1.12" + +julia_versions = [v"1.6", v"1.7", v"1.8", v"1.9"] +julia_compat = join("~" .* string.(getfield.(julia_versions, :major)) .* "." .* string.(getfield.(julia_versions, :minor)), ", ") # Collection of sources required to build JSBSim sources = [ GitSource("https://github.com/JSBSim-Team/jsbsim.git", - "9bc866713431d3296441697a91517b32c9c017d3"), + "133fcff53ae15abcbbbd4d06390e1b59ab76e5c6"), ] +# See https://github.com/JuliaLang/Pkg.jl/issues/2942 +# Once this Pkg issue is resolved, this must be removed +uuid = Base.UUID("a83860b7-747b-57cf-bf1f-3e79990d037f") +delete!(Pkg.Types.get_last_stdlibs(v"1.6.3"), uuid) + # Bash recipe for building across all platforms script = raw""" cd $WORKSPACE/srcdir/jsbsim -sed -ri 's/PROJECT_VERSION_PATCH\s\"6\"/PROJECT_VERSION_PATCH \"5\"/g' CMakeLists.txt mkdir build && cd build FLAGS=() if [[ "${target}" == *-mingw* ]]; then @@ -37,7 +43,7 @@ cp julia/*JSBSimJL*.$dlext $libdir/. # These are the platforms we will build for by default, unless further # platforms are passed in on the command line include("../../L/libjulia/common.jl") -platforms = libjulia_platforms(julia_version) +platforms = vcat(libjulia_platforms.(julia_versions)...) platforms = expand_cxxstring_abis(platforms) filter!(p -> libc(p) != "musl" && !Sys.isfreebsd(p), platforms) # muslc is not supported @@ -49,10 +55,10 @@ products = [ # Dependencies that must be installed before this package can be built dependencies = [ - BuildDependency(PackageSpec(name="libjulia_jll", version=julia_version)), + BuildDependency("libjulia_jll"), Dependency("libcxxwrap_julia_jll"), ] build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version=v"8", - julia_compat = "$(julia_version.major).$(julia_version.minor)") + julia_compat = julia_compat)