diff --git a/deps/build.jl b/deps/build.jl index 3ef509f..2adb4e5 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -1,5 +1,5 @@ # Build the dependencies Mod = @eval module Anon end Mod.include("build_ZMQ.v4.3.1.jl") -Mod.include("build_libhelicsSharedLib.v2.2.1.jl") +Mod.include("build_libhelicsSharedLib.v2.2.2.jl") diff --git a/deps/build_libhelicsSharedLib.v2.2.1.jl b/deps/build_libhelicsSharedLib.v2.2.1.jl deleted file mode 100644 index 477ccb2..0000000 --- a/deps/build_libhelicsSharedLib.v2.2.1.jl +++ /dev/null @@ -1,57 +0,0 @@ -using BinaryProvider # requires BinaryProvider 0.3.0 or later - -# Parse some basic command-line arguments -const verbose = "--verbose" in ARGS -const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) -products = [ - LibraryProduct(prefix, ["libhelicsSharedLib"], :libhelicsSharedLib), -] - -# Download binaries from hosted location -bin_prefix = "https://github.com/GMLC-TDC/HELICSBuilder/releases/download/v2.2.1-3" - -# Listing of files generated by BinaryBuilder: -download_info = Dict( - Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.aarch64-linux-gnu-gcc7.tar.gz", "da461c401088a5cdad789c6bfe8793bc6f163b98c27a153652490657fea9612f"), - Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.aarch64-linux-gnu-gcc8.tar.gz", "78de9f8fdd68227f856ae703785c68b55f0b81267244fc3734ff5eeb3dbd7bc2"), - Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.aarch64-linux-musl-gcc7.tar.gz", "57e2996b7f325b62091945c0b5b64f74fb2a747ad81564851a2e5e73f3c54e52"), - Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.aarch64-linux-musl-gcc8.tar.gz", "a0a53c2d982b1fd473c62bd9ea50f755931cf5eaed66c5dcaa3239870898088d"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.arm-linux-gnueabihf-gcc7.tar.gz", "bd0dbcb7b112d47bde44512027fe656f61b7729d790bed183c0a1d562631c7ab"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.arm-linux-gnueabihf-gcc8.tar.gz", "0f8223f0015db04ae28d44d55bd4c34744d434b9af3977b3562d6113f4f70205"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.arm-linux-musleabihf-gcc7.tar.gz", "07acb08b68015e23e4ddac6337050cbca5e1c637aa76723f292b79c23989a2fd"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.arm-linux-musleabihf-gcc8.tar.gz", "44f31ab281258719c20832cee40800f916262b0b74af716a0a6c6f312a95d19a"), - Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.i686-linux-gnu-gcc7.tar.gz", "f19cde87b0117345df6d94164cc1663aac4c2af7e0430947a9dba1e2c5384cf1"), - Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.i686-linux-gnu-gcc8.tar.gz", "27361ba6fa45b17b63646e4aba98f4fc034fac77194b967aa631f533fa161db8"), - Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.i686-linux-musl-gcc7.tar.gz", "96e798a1e761e81298d176a13ab3e1662e3e95adc6d0555fa40c14e0f4d5315c"), - Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.i686-linux-musl-gcc8.tar.gz", "bfca14390fdff562c8b13ad0e33de3d811b31ff7d0b75280f15d1f097251037b"), - Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.powerpc64le-linux-gnu-gcc7.tar.gz", "d9655ffe814918548c136eca7737187fd7a3828e23799a8a4b09e3fe3bb62417"), - Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.powerpc64le-linux-gnu-gcc8.tar.gz", "e27d64fa20d6694a5d72101bd019f1ad05387b0fe789216223ad850b2a384686"), - MacOS(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.x86_64-apple-darwin14-gcc7.tar.gz", "3ff13a3e85fcb839ea47a55de02c04d10ead8921dd9c5b900849c1046ebe4406"), - MacOS(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.x86_64-apple-darwin14-gcc8.tar.gz", "3d831a8d71527f2b72406b5d70c675164c0362407f98e3eb11e64e6b1965a30a"), - Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.x86_64-linux-gnu-gcc7.tar.gz", "43b2e5e5acce6783a0133e5ee7c4589e32e6f837bd62ff03a5def0f91cdd19ae"), - Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.x86_64-linux-gnu-gcc8.tar.gz", "1f14cd06cee862bcb67214975a3772f87658729b905a4bb7720f190ef25b7639"), - Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.x86_64-linux-musl-gcc7.tar.gz", "6c006a63f9137e921534d9c6ce1f6283bf441642b1d05130783fc890efc39ecb"), - Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.x86_64-linux-musl-gcc8.tar.gz", "b95aaa4693baecfdf07b6eca8198f1a3ef205515e82c01008e083595f61edac4"), - Windows(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.x86_64-w64-mingw32-gcc7.tar.gz", "183ed9f838dd84d9a357525bdfe9db2699991bd0e438fc4d82f80d9627a9492b"), - Windows(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.1.x86_64-w64-mingw32-gcc8.tar.gz", "3db20d53e724afc9de1ae52557a9b659fadfd10d4f5abb64d2e0df5771c3f99e"), -) - -# Install unsatisfied or updated dependencies: -unsatisfied = any(!satisfied(p; verbose=verbose) for p in products) -dl_info = choose_download(download_info, platform_key_abi()) -if dl_info === nothing && unsatisfied - # If we don't have a compatible .tar.gz to download, complain. - # Alternatively, you could attempt to install from a separate provider, - # build from source or something even more ambitious here. - error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!") -end - -# If we have a download, and we are unsatisfied (or the version we're -# trying to install is not itself installed) then load it up! -if unsatisfied || !isinstalled(dl_info...; prefix=prefix) - # Download and install binaries - install(dl_info...; prefix=prefix, force=true, verbose=verbose) -end - -# Write out a deps.jl file that will contain mappings for our products -write_deps_file(joinpath(@__DIR__, "deps.jl"), products, verbose=verbose) diff --git a/deps/build_libhelicsSharedLib.v2.2.2.jl b/deps/build_libhelicsSharedLib.v2.2.2.jl new file mode 100644 index 0000000..1e5db8f --- /dev/null +++ b/deps/build_libhelicsSharedLib.v2.2.2.jl @@ -0,0 +1,57 @@ +using BinaryProvider # requires BinaryProvider 0.3.0 or later + +# Parse some basic command-line arguments +const verbose = "--verbose" in ARGS +const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) +products = [ + LibraryProduct(prefix, ["libhelicsSharedLib"], :libhelicsSharedLib), +] + +# Download binaries from hosted location +bin_prefix = "https://github.com/GMLC-TDC/HELICSBuilder/releases/download/v2.2.2" + +# Listing of files generated by BinaryBuilder: +download_info = Dict( + Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.aarch64-linux-gnu-gcc7.tar.gz", "15c47aceed714e7a8ab90a69d26722c45a4e6e65bcfc187efde7af76fc417197"), + Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.aarch64-linux-gnu-gcc8.tar.gz", "5c328bbe5d997269b2546c6315d2d6e962cf82243ec7b6a64838f6c25414efc7"), + Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.aarch64-linux-musl-gcc7.tar.gz", "ed705af0d2d1ce65a76d5c65ce957c865502dad2de6983d97eca78c363873cbc"), + Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.aarch64-linux-musl-gcc8.tar.gz", "356328877d0f4eb08197f371a15659ef1c580ddcda2a09af8a6bd79faffb6537"), + Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.arm-linux-gnueabihf-gcc7.tar.gz", "fb3da5f6f2ef6bc6b1a0e87cf6ebf44776ed82ea1bc1c2d745aaad24d6940640"), + Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.arm-linux-gnueabihf-gcc8.tar.gz", "c058c2c2f6df40aa092034b25ea250663f5c11d67c3e6e9b444f6ed128fae72d"), + Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.arm-linux-musleabihf-gcc7.tar.gz", "2cd0f1ef9c35c513372fb3faa949c25fe096ec1cf45e45d9f8aab373be05aa37"), + Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.arm-linux-musleabihf-gcc8.tar.gz", "855bb3cf1676ab95b0685a4d35354b0c48aa179b73730b1a1b609872f68f48bd"), + Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.i686-linux-gnu-gcc7.tar.gz", "e8e531782ef2bb86194acda277d3727bf3562652651ec3bfb865e53bf18539c5"), + Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.i686-linux-gnu-gcc8.tar.gz", "7e6599b7ee336c6bfcba2d516d3cb48af89ae82f14e69bc517dc82365a57cf46"), + Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.i686-linux-musl-gcc7.tar.gz", "9f65e52cff4ca87b303f6a21e793f996f9bfc0de982864f53d6b5c21778618ff"), + Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.i686-linux-musl-gcc8.tar.gz", "1eda15a82ff85ac52373a70fbf735456e96c5cde8adad1e67ba1caa358f3c64a"), + Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.powerpc64le-linux-gnu-gcc7.tar.gz", "aaef816c6c3192a87798da199c0fdf7fc10b6e2c654822b627114b3cc5986964"), + Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.powerpc64le-linux-gnu-gcc8.tar.gz", "55aebc727e759faf910c164eff43c1e19fd1d1ef57c65129067ee4c9ebd55994"), + MacOS(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.x86_64-apple-darwin14-gcc7.tar.gz", "ffed05dc9c1eb682af5e3ed6ab9071af24399c62ae361c154365ea53dffc6a2d"), + MacOS(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.x86_64-apple-darwin14-gcc8.tar.gz", "9207535989f384e288e2cea1e1c38a174a954d912e50a6cbd0f83ba862f84452"), + Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.x86_64-linux-gnu-gcc7.tar.gz", "d94350bda0811a3db440192797d43c43b22facf879bf7a33598fbf80bdaf34e7"), + Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.x86_64-linux-gnu-gcc8.tar.gz", "8664ee3e54b3d8bc6afcf21ecd0bd7eb7a0ff5533689a50d0ead3c5e532d0537"), + Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.x86_64-linux-musl-gcc7.tar.gz", "ca1bc4c30b14194209f11a7c95c2bc05a5bfe9dc9e98d0ed4741a50c8c09b7b1"), + Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.x86_64-linux-musl-gcc8.tar.gz", "ce80abf381ad515aa80e071c00547255336229c1c5ad12e2f27b1c3d75aa6d00"), + Windows(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.x86_64-w64-mingw32-gcc7.tar.gz", "2f601b6890f910697da85f6a895bb6c893691fc0a324932ac8a04dd7d2479cfa"), + Windows(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/libhelicsSharedLib.v2.2.2.x86_64-w64-mingw32-gcc8.tar.gz", "3d9e65c9b9af7c49f102bad0b29f597f21c55b3888dda5c0333674d3bc6d348d"), +) + +# Install unsatisfied or updated dependencies: +unsatisfied = any(!satisfied(p; verbose=verbose) for p in products) +dl_info = choose_download(download_info, platform_key_abi()) +if dl_info === nothing && unsatisfied + # If we don't have a compatible .tar.gz to download, complain. + # Alternatively, you could attempt to install from a separate provider, + # build from source or something even more ambitious here. + error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!") +end + +# If we have a download, and we are unsatisfied (or the version we're +# trying to install is not itself installed) then load it up! +if unsatisfied || !isinstalled(dl_info...; prefix=prefix) + # Download and install binaries + install(dl_info...; prefix=prefix, force=true, verbose=verbose) +end + +# Write out a deps.jl file that will contain mappings for our products +write_deps_file(joinpath(@__DIR__, "deps.jl"), products, verbose=verbose) diff --git a/src/manual.jl b/src/manual.jl index c1370b7..b55f449 100644 --- a/src/manual.jl +++ b/src/manual.jl @@ -3,11 +3,11 @@ const HELICS_HAVE_ZEROMQ = 1 const BOOST_VERSION_LEVEL = 67 const HELICS_VERSION_MAJOR = 2 const HELICS_VERSION_MINOR = 2 -const HELICS_VERSION_PATCH = 1 -const HELICS_VERSION = "2.2.1" +const HELICS_VERSION_PATCH = 2 +const HELICS_VERSION = "2.2.2" const HELICS_VERSION_BUILD = "" -const HELICS_VERSION_STRING = "2.2.1 (09-27-19)" -const HELICS_DATE = "09-27-19" +const HELICS_VERSION_STRING = "2.2.2 (10-27-19)" +const HELICS_DATE = "10-27-19" @cenum helics_data_type::UInt32 begin helics_data_type_string = 0 diff --git a/test/runtests.jl b/test/runtests.jl index 407e3a2..d8ee1ff 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -6,7 +6,7 @@ const h = HELICS @testset "Versions" begin @test h.helicsGetVersion() isa String -@test h.helicsGetVersion() == "2.2.1 (09-27-19)" +@test h.helicsGetVersion() == "2.2.2 (10-27-19)" end