diff --git a/deps/build.jl b/deps/build.jl index 1f4f457..dd116bd 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -6,8 +6,6 @@ abstract type Windows <: AbstractOS end abstract type MacOS <: BSD end abstract type Linux <: BSD end -const HELICS_VERSION = "2.0.0rc1" - if Sys.iswindows() const LIBRARY_EXT = "dll" const DEPS = "windows" @@ -65,7 +63,7 @@ function Base.download(::Type{MacOS}) mkpath(joinpath(@__DIR__, DEPS)) - url = "https://anaconda.org/gmlc-tdc/helics/2.0.0rc1/download/osx-64/helics-2.0.0rc1-py37h0a44026_0.tar.bz2" + url = "https://anaconda.org/gmlc-tdc/helics/2.0.0/download/osx-64/helics-2.0.0-py37h0a44026_0.tar.bz2" get_libraries(url, map( x -> joinpath("lib", x), ["libhelicsSharedLib.dylib"] @@ -101,7 +99,7 @@ function Base.download(::Type{Linux}) mkpath(joinpath(@__DIR__, DEPS)) - url = "https://anaconda.org/gmlc-tdc/helics/2.0.0rc1/download/linux-64/helics-2.0.0rc1-py37hf484d3e_0.tar.bz2" + url = "https://anaconda.org/gmlc-tdc/helics/2.0.0/download/linux-64/helics-2.0.0-py37hf484d3e_0.tar.bz2" get_libraries(url, map( x -> joinpath("lib", x), ["libhelicsSharedLib.so"] @@ -143,7 +141,7 @@ function Base.download(::Type{Windows}) BIT = "32" end - url = "https://anaconda.org/gmlc-tdc/helics/2.0.0rc1/download/win-$BIT/helics-2.0.0rc1-py37h6538335_0.tar.bz2" + url = "https://anaconda.org/gmlc-tdc/helics/2.0.0/download/win-$BIT/helics-2.0.0-py37h6538335_0.tar.bz2" get_libraries(url, ["Library/lib/helicsSharedLib.lib", "Library/bin/helicsSharedLib.dll"]) url = "https://anaconda.org/anaconda/libboost/1.67.0/download/win-$BIT/libboost-1.67.0-hd9e427e_4.tar.bz2" diff --git a/scripts/generate.jl b/scripts/generate.jl index ef65130..9116dd5 100644 --- a/scripts/generate.jl +++ b/scripts/generate.jl @@ -1,7 +1,7 @@ using Clang # LIBCLANG_HEADERS are those headers to be wrapped. -const LIBCLANG_INCLUDE = "/Users/$USER/local/helics-v2.0.0-beta.3/include/helics/shared_api_library" |> normpath +const LIBCLANG_INCLUDE = "/Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library" |> normpath const LIBCLANG_HEADERS = [joinpath(LIBCLANG_INCLUDE, header) for header in readdir(LIBCLANG_INCLUDE) if endswith(header, ".h")] wc = init(; headers = LIBCLANG_HEADERS, diff --git a/src/common.jl b/src/common.jl index 0e85071..562868c 100644 --- a/src/common.jl +++ b/src/common.jl @@ -61,14 +61,14 @@ end const HELICS_HAVE_MPI = 0 const HELICS_HAVE_ZEROMQ = 1 -const BOOST_VERSION_LEVEL = 68 +const BOOST_VERSION_LEVEL = 67 const HELICS_VERSION_MAJOR = 2 const HELICS_VERSION_MINOR = 0 const HELICS_VERSION_PATCH = 0 -const HELICS_VERSION = ".0.0-rc1" -const HELICS_VERSION_BUILD = "rc1" -const HELICS_VERSION_STRING = "2.0.0-rc1 (01-18-19)" -const HELICS_DATE = "01-18-19" +const HELICS_VERSION = "2.0.0" +const HELICS_VERSION_BUILD = "" +const HELICS_VERSION_STRING = "2.0.0 (03-10-19)" +const HELICS_DATE = "03-10-19" @cenum(helics_data_type, helics_data_type_string = 0, diff --git a/src/lib.jl b/src/lib.jl index f57fee7..eb978db 100644 --- a/src/lib.jl +++ b/src/lib.jl @@ -25,7 +25,7 @@ module Lib include("common.jl") - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/MessageFederate.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/MessageFederate.h # Automatically generated using Clang.jl wrap_c @@ -120,7 +120,7 @@ module Lib function helicsEndpointGetOption(_end, option) ccall((:helicsEndpointGetOption, HELICS_LIBRARY), helics_bool, (helics_endpoint, Cint), _end, option) end - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/MessageFilters.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/MessageFilters.h # Automatically generated using Clang.jl wrap_c @@ -207,7 +207,7 @@ module Lib function helicsFilterGetOption(filt, option) ccall((:helicsFilterGetOption, HELICS_LIBRARY), helics_bool, (helics_filter, Cint), filt, option) end - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/ValueFederate.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/ValueFederate.h # Automatically generated using Clang.jl wrap_c @@ -490,13 +490,13 @@ module Lib function helicsFederateGetInputCount(fed) ccall((:helicsFederateGetInputCount, HELICS_LIBRARY), Cint, (helics_federate,), fed) end - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/api-data.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/api-data.h # Automatically generated using Clang.jl wrap_c - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/helics-config.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/helics-config.h # Automatically generated using Clang.jl wrap_c - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/helics.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/helics.h # Automatically generated using Clang.jl wrap_c @@ -915,7 +915,7 @@ module Lib function helicsCleanupLibrary() ccall((:helicsCleanupLibrary, HELICS_LIBRARY), Cvoid, ()) end - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/helicsCallbacks.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/helicsCallbacks.h # Automatically generated using Clang.jl wrap_c @@ -930,10 +930,10 @@ module Lib function helicsFederateAddLoggingCallback(fed, logger, err) ccall((:helicsFederateAddLoggingCallback, HELICS_LIBRARY), Cvoid, (helics_federate, Ptr{Cvoid}, Ptr{helics_error}), fed, logger, err) end - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/helics_enums.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/helics_enums.h # Automatically generated using Clang.jl wrap_c - # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0-rc1/include/helics/shared_api_library/helics_export.h + # Julia wrapper for header: /Users/$USER/local/helics-v2.0.0/include/helics/shared_api_library/helics_export.h # Automatically generated using Clang.jl wrap_c end diff --git a/test/runtests.jl b/test/runtests.jl index ceb4340..408b91f 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -4,7 +4,7 @@ using Test const h = HELICS @test h.helicsGetVersion() isa String -@test h.helicsGetVersion() == "2.0.0-rc1 (01-18-19)" +@test h.helicsGetVersion() == "2.0.0 (03-10-19)" include("valuefederate.jl") include("messagefederate.jl")