Skip to content

Commit

Permalink
Merge pull request #41 from rdeits/bindeps
Browse files Browse the repository at this point in the history
use BinDeps.jl, since we already indirectly depend on it
  • Loading branch information
rdeits authored Jun 8, 2018
2 parents d96a875 + 66399f2 commit 1f4431d
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 131 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Colors 0.7.1
# Misc
Parameters 0.7
DocStringExtensions 0.4
Compat 0.27 # Sys.iswindows
BinDeps 0.8.7

# Communication
MsgPack 0.1.1
Expand Down
6 changes: 3 additions & 3 deletions deps/build.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Base.Filesystem
using BinDeps: unpack_cmd, download_cmd

include("../src/download_helpers.jl")

const meshcat_sha = "18028760b377c178bc77ee61cf4b9de8d176d3c5"
const meshcat_url = "https://github.com/rdeits/meshcat/archive/$meshcat_sha.zip"
Expand Down Expand Up @@ -33,8 +33,8 @@ function update_meshcat()

mktempdir() do download_dir
download_path = joinpath(download_dir, "meshcat.zip")
run(DownloadHelpers.download_cmd(meshcat_url, download_path))
run(DownloadHelpers.unpack_cmd(download_path, download_dir, ".zip", nothing))
run(download_cmd(meshcat_url, download_path))
run(unpack_cmd(download_path, download_dir, ".zip", nothing))
mv(joinpath(download_dir, "meshcat-$meshcat_sha"), meshcat_dir; remove_destination=true)
end
open(stamp_file, "w") do file
Expand Down
3 changes: 1 addition & 2 deletions src/MeshCat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ using Mux: page
using WebIO
using JSExpr
using Base.Filesystem: rm
using BinDeps: download_cmd, unpack_cmd

import Compat
import Base: delete!, length
import MsgPack: pack, Ext
import GeometryTypes: origin, radius
Expand Down Expand Up @@ -65,7 +65,6 @@ include("trees.jl")
using .SceneTrees
include("geometry.jl")
include("objects.jl")
include("download_helpers.jl")
include("animations.jl")
include("commands.jl")
include("abstract_visualizer.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/animations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function convert_frames_to_video(tar_file_path::AbstractString, output_path::Abs
end

mktempdir() do tmpdir
run(DownloadHelpers.unpack_cmd(tar_file_path, tmpdir, ".tar", nothing))
run(unpack_cmd(tar_file_path, tmpdir, ".tar", nothing))
cmd = `ffmpeg -r $framerate -i %07d.png -vcodec libx264 -preset slow -crf 18`
if overwrite
cmd = `$cmd -y`
Expand Down
115 changes: 0 additions & 115 deletions src/download_helpers.jl

This file was deleted.

8 changes: 0 additions & 8 deletions test/downloads.jl

This file was deleted.

1 change: 0 additions & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ using Colors
using MeshIO, FileIO

@testset "MeshCat" begin
include("downloads.jl")
include("video_rendering.jl")
include("paths.jl")
include("visualizer.jl")
Expand Down

0 comments on commit 1f4431d

Please sign in to comment.