commit 980d4518cd98dfea085e090275dd96cb3e54dad8
parent daaeb360962b25bc3312ae43f07fb6d445f94b1d
Author: Anders Damsgaard <andersd@riseup.net>
Date: Fri, 17 Nov 2017 17:11:20 -0500
remove build.jl and instead install at the beginning of Granular.jl
Diffstat:
2 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/deps/build.jl b/deps/build.jl
@@ -1,41 +0,0 @@
-
-#!/usr/bin/env julia
-using BinDeps
-@BinDeps.setup
-
-import Compat
-import Compat.Sys
-
-gnuplot = library_dependency("gnuplot")
-imagemagick = library_dependency("imagemagick", aliases = ["ImageMagick"])
-
-# Debian derivatives: https://www.debian.org/distrib/packages#search_packages
-provides(AptGet, "gnuplot", gnuplot, os = :Linux)
-provides(AptGet, "imagemagick", imagemagick, os = :Linux)
-
-# RHEL derivatives: http://rpm.pbone.net/index.php3/stat/2/simple/2
-provides(Yum, "gnuplot", gnuplot, os = :Linux)
-provides(Yum, Dict("ImageMagick" => imagemagick), os = :Linux)
-
-# Arch: https://www.archlinux.org/packages/
-provides(Pacman, "gnuplot", gnuplot, os = :Linux)
-provides(Pacman, "imagemagick", imagemagick, os = :Linux)
-
-# Mac: http://formulae.brew.sh/
-if Compat.Sys.isapple()
- using Homebrew
- provides(Homebrew.HB, "gnuplot", gnuplot, os = :Darwin)
- provides(Homebrew.HB, "imagemagick", imagemagick, os = :Darwin)
-end
-
-# Windows: http://software.opensuse.org/search
-if Compat.Sys.iswindows()
- using WinRPM
- provides(WinRPM.RPM, "gnuplot", gnuplot, os = :Windows)
- provides(WinRPM.RPM, "imagemagick", imagemagick, os = :Windows)
-end
-
-@BinDeps.install Dict([
- (:gnuplot => :gnuplot),
- (:imagemagick => :imagemagick),
- ])
diff --git a/src/Granular.jl b/src/Granular.jl
@@ -1,5 +1,17 @@
#!/usr/bin/env julia
+if is_apple()
+ using Homebrew
+ Homebrew.add("gnuplot")
+ Homebrew.add("imagemagick")
+end
+
+if is_windows()
+ using WinRPM
+ WinRPM.install("gnuplot")
+ WinRPM.install("imagemagick")
+end
+
"""
# Granular.jl
Offline granular dynamics simulator module.