Merge pull request #8 from rdeits/drop-0.5

Drop Julia v0.5 and fix deprecations on v0.7

Author: rdeits

.travis.yml

@@ -2,25 +2,23 @@
 language: julia
 matrix:
   include:
-    - os: linux
-      julia: 0.5
     - os: linux
       julia: 0.6
     - os: linux
       julia: nightly
     - os: linux
-      julia: 0.5
+      julia: 0.6
       env: "CMAKEWRAPPER_JL_BUILD_FROM_SOURCE=1"
     - os: linux
       julia: nightly
       env: "CMAKEWRAPPER_JL_BUILD_FROM_SOURCE=1"
-    - os: osx
-      julia: 0.5
     - os: osx
       julia: 0.6
     - os: osx
-      julia: 0.5
+      julia: 0.6
       env: "CMAKEWRAPPER_JL_BUILD_FROM_SOURCE=1"
+  allow_failures:
+    - julia: nightly
 notifications:
   email: false
 branches:

REQUIRE

@@ -1,3 +1,4 @@
-julia 0.5
+julia 0.6
 BinDeps 0.4
 Parameters 0.5
+Compat 0.33

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 

deps/build.jl

@@ -1,12 +1,13 @@
 using BinDeps
 using BinDeps: MakeTargets
+using Compat
 
 basedir = dirname(@__FILE__)
 prefix = joinpath(basedir, "usr")
 
 cmake_version = v"3.7.2"
 base_url = "https://cmake.org/files/v$(cmake_version.major).$(cmake_version.minor)"
-@static if is_windows()
+@static if Compat.Sys.iswindows()
     binary_name = "cmake.exe"
 else
     binary_name = "cmake"
@@ -17,7 +18,7 @@ function install_binaries(file_base, file_ext, binary_dir)
     url = "$(base_url)/$(filename)"
     binary_path = joinpath(basedir, "downloads", file_base, binary_dir)
 
-    @static if is_windows()
+    @static if Compat.Sys.iswindows()
         install_step = () -> begin
             for dir in readdir(dirname(binary_path))
                 cp(joinpath(dirname(binary_path), dir), 
@@ -85,7 +86,7 @@ end
 
 force_source_build = lowercase(get(ENV, "CMAKEWRAPPER_JL_BUILD_FROM_SOURCE", "")) in ["1", "true"]
 
-process = @static if is_linux()
+process = @static if Compat.Sys.islinux()
     if Sys.ARCH == :x86_64 && !force_source_build
         install_binaries(
             "cmake-$(cmake_version)-Linux-x86_64",
@@ -94,7 +95,7 @@ process = @static if is_linux()
     else
         install_from_source("cmake-$(cmake_version)", "tar.gz")
     end
-elseif is_apple()
+elseif Compat.Sys.isapple()
     if !force_source_build
         install_binaries(
             "cmake-$(cmake_version)-Darwin-x86_64",
@@ -103,7 +104,7 @@ elseif is_apple()
     else
         install_from_source("cmake-$(cmake_version)", "tar.gz")
     end
-elseif is_windows()
+elseif Compat.Sys.iswindows()
     if sizeof(Int) == 8
         install_binaries(
             "cmake-$(cmake_version)-win64-x64",

src/CMakeWrapper.jl

@@ -12,6 +12,7 @@ using BinDeps: BuildProcess,
                builddir,
                stringarray,
                adjust_env
+using Compat
 import BinDeps: lower,
                 provider,
                 generate_steps
@@ -26,7 +27,7 @@ end
 
 const dlext = Libdl.dlext
 
-@with_kw type CMakeBuild <: BuildStep
+@with_kw struct CMakeBuild <: BuildStep
     srcdir::AbstractString = ""
     builddir::AbstractString = ""
     prefix::AbstractString = ""
@@ -59,7 +60,7 @@ function lower(s::CMakeBuild, collection)
     end
 end
 
-type CMakeProcess <: BuildProcess
+mutable struct CMakeProcess <: BuildProcess
     source
     opts
 end
@@ -97,9 +98,9 @@ function generate_steps(dep::LibraryDependency, h::CMakeProcess, provider_opts)
         opts[:libtarget] = String[x*"."*dlext for x in stringarray(dep.properties[:aliases])]
     end
     env = Dict{String,String}()
-    if is_unix()
+    if Compat.Sys.isunix()
         env["PATH"] = bindir(dep)*":"*ENV["PATH"]
-    elseif is_windows()
+    elseif Compat.Sys.iswindows()
         env["PATH"] = bindir(dep)*";"*ENV["PATH"]
     end
     haskey(opts,:env) && merge!(env,opts[:env])

test/runtests.jl

@@ -1,6 +1,7 @@
 using CMakeWrapper
 using BinDeps
-using Base.Test
+using Compat
+using Compat.Test
 
 
 @test isfile(cmake_executable)