Skip to content

Commit

Permalink
Update to Julia 1.3, add Project.toml, use JLL package
Browse files Browse the repository at this point in the history
  • Loading branch information
staticfloat authored and stevengj committed Jan 8, 2020
1 parent 129ad5a commit f3ac372
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 110 deletions.
74 changes: 74 additions & 0 deletions Manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# This file is machine-generated - editing it directly is not advised

[[Base64]]
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

[[Dates]]
deps = ["Printf"]
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"

[[Distributed]]
deps = ["Random", "Serialization", "Sockets"]
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"

[[FileWatching]]
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"

[[InteractiveUtils]]
deps = ["Markdown"]
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

[[LibGit2]]
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"

[[Libdl]]
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

[[Logging]]
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"

[[Markdown]]
deps = ["Base64"]
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"

[[Pkg]]
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

[[Printf]]
deps = ["Unicode"]
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[[REPL]]
deps = ["InteractiveUtils", "Markdown", "Sockets"]
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

[[Random]]
deps = ["Serialization"]
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[[SHA]]
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"

[[Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[[Sockets]]
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"

[[Test]]
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[[UUIDs]]
deps = ["Random", "SHA"]
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[[Unicode]]
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

[[ZeroMQ_jll]]
deps = ["Libdl", "Pkg"]
git-tree-sha1 = "a22171d073707dbcc99a1dfefc2c6e823beb9664"
uuid = "8f1865be-045e-5c20-9c9f-bfbfb0764568"
version = "4.3.1+0"
6 changes: 2 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ uuid = "c2297ded-f4af-51ae-bb23-16f91089e4e1"
version = "1.1.0"

[deps]
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
ZeroMQ_jll = "8f1865be-045e-5c20-9c9f-bfbfb0764568"

[compat]
BinaryProvider = "≥ 0.3.0"
julia = "1"
julia = "1.3"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
6 changes: 0 additions & 6 deletions deps/.gitignore

This file was deleted.

64 changes: 0 additions & 64 deletions deps/build.jl

This file was deleted.

28 changes: 0 additions & 28 deletions deps/compile.jl

This file was deleted.

9 changes: 1 addition & 8 deletions src/ZMQ.jl
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
# Support for ZeroMQ, a network and interprocess communication library

module ZMQ
using ZeroMQ_jll

import Libdl
using Base.Libc: EAGAIN
using FileWatching: UV_READABLE, uv_pollcb, _FDWatcher
import Sockets
using Sockets: connect, bind, send, recv
import Base.GC: @preserve

const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
if !isfile(depsjl_path)
error("Blosc not installed properly, run Pkg.build(\"ZMQ\"), restart Julia and try again")
end
include(depsjl_path)

export
#Types
StateError,Context,Socket,Message,
Expand All @@ -36,7 +30,6 @@ include("message.jl")
include("comm.jl")

function __init__()
check_deps()
major = Ref{Cint}()
minor = Ref{Cint}()
patch = Ref{Cint}()
Expand Down

0 comments on commit f3ac372

Please sign in to comment.