Merge pull request #11 from rdeits/v0.7

switch to Julia v0.7

Author: rdeits

.travis.yml

@@ -3,22 +3,22 @@ language: julia
 matrix:
   include:
     - os: linux
-      julia: 0.6
+      julia: 0.7
     - os: linux
       julia: nightly
     - os: linux
-      julia: 0.6
+      julia: 0.7
       env: "CMAKEWRAPPER_JL_BUILD_FROM_SOURCE=1"
     - os: linux
       julia: nightly
       env: "CMAKEWRAPPER_JL_BUILD_FROM_SOURCE=1"
     - os: osx
-      julia: 0.6
+      julia: 0.7
     - os: osx
-      julia: 0.6
+      julia: 0.7
       env: "CMAKEWRAPPER_JL_BUILD_FROM_SOURCE=1"
-  allow_failures:
-    - julia: nightly
+  # allow_failures:
+  #   - julia: nightly
 notifications:
   email: false
 branches:

REQUIRE

@@ -1,4 +1,3 @@
-julia 0.6
+julia 0.7-alpha
 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.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://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-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,13 +1,12 @@
 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 Compat.Sys.iswindows()
+@static if Sys.iswindows()
     binary_name = "cmake.exe"
 else
     binary_name = "cmake"
@@ -18,18 +17,18 @@ function install_binaries(file_base, file_ext, binary_dir)
     url = "$(base_url)/$(filename)"
     binary_path = joinpath(basedir, "downloads", file_base, binary_dir)
 
-    @static if Compat.Sys.iswindows()
+    @static if Sys.iswindows()
         install_step = () -> begin
             for dir in readdir(dirname(binary_path))
-                cp(joinpath(dirname(binary_path), dir), 
+                cp(joinpath(dirname(binary_path), dir),
                    joinpath(prefix, dir);
                    remove_destination=true)
             end
         end
     else
         install_step = () -> begin
             for file in readdir(binary_path)
-                symlink(joinpath(binary_path, file), 
+                symlink(joinpath(binary_path, file),
                         joinpath(prefix, "bin", file))
             end
         end
@@ -49,11 +48,11 @@ To build from source instead, run:
         end
     end
     (@build_steps begin
-        FileRule(joinpath(prefix, "bin", binary_name), 
+        FileRule(joinpath(prefix, "bin", binary_name),
             (@build_steps begin
                 FileDownloader(url, joinpath(basedir, "downloads", filename))
                 FileUnpacker(joinpath(basedir, "downloads", filename),
-                             joinpath(basedir, "downloads"), 
+                             joinpath(basedir, "downloads"),
                              "")
                 CreateDirectory(joinpath(prefix, "bin"))
                 install_step
@@ -67,12 +66,12 @@ function install_from_source(file_base, file_ext)
     url = "$(base_url)/$(filename)"
 
     (@build_steps begin
-        FileRule(joinpath(prefix, "bin", binary_name), 
+        FileRule(joinpath(prefix, "bin", binary_name),
             (@build_steps begin
                 FileDownloader(url, joinpath(basedir, "downloads", filename))
                 CreateDirectory(joinpath(basedir, "src"))
                 FileUnpacker(joinpath(basedir, "downloads", filename),
-                             joinpath(basedir, "src"), 
+                             joinpath(basedir, "src"),
                              "")
                 begin
                     ChangeDirectory(joinpath(basedir, "src", file_base))
@@ -86,7 +85,7 @@ end
 
 force_source_build = lowercase(get(ENV, "CMAKEWRAPPER_JL_BUILD_FROM_SOURCE", "")) in ["1", "true"]
 
-process = @static if Compat.Sys.islinux()
+process = @static if Sys.islinux()
     if Sys.ARCH == :x86_64 && !force_source_build
         install_binaries(
             "cmake-$(cmake_version)-Linux-x86_64",
@@ -95,7 +94,7 @@ process = @static if Compat.Sys.islinux()
     else
         install_from_source("cmake-$(cmake_version)", "tar.gz")
     end
-elseif Compat.Sys.isapple()
+elseif Sys.isapple()
     if !force_source_build
         install_binaries(
             "cmake-$(cmake_version)-Darwin-x86_64",
@@ -104,7 +103,7 @@ elseif Compat.Sys.isapple()
     else
         install_from_source("cmake-$(cmake_version)", "tar.gz")
     end
-elseif Compat.Sys.iswindows()
+elseif Sys.iswindows()
     if sizeof(Int) == 8
         install_binaries(
             "cmake-$(cmake_version)-win64-x64",

src/CMakeWrapper.jl

@@ -12,7 +12,7 @@ using BinDeps: BuildProcess,
                builddir,
                stringarray,
                adjust_env
-using Compat
+using Libdl
 import BinDeps: lower,
                 provider,
                 generate_steps
@@ -72,7 +72,7 @@ provider(::Type{CMakeProcess}, cm::CMakeProcess; opts...) = cm
 function generate_steps(dep::LibraryDependency, h::CMakeProcess, provider_opts)
     # Shamelessly copied from BinDeps.jl, which is  distributed under
     # the MIT License, and Copyright (c) 2012: Keno Fischer and other
-    # contributors. See LICENSE.md for license terms. 
+    # contributors. See LICENSE.md for license terms.
     if h.source === nothing
         h.source = gethelper(dep,Sources)
     end
@@ -98,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 Compat.Sys.isunix()
+    if Sys.isunix()
         env["PATH"] = bindir(dep)*":"*ENV["PATH"]
-    elseif Compat.Sys.iswindows()
+    elseif Sys.iswindows()
         env["PATH"] = bindir(dep)*";"*ENV["PATH"]
     end
     haskey(opts,:env) && merge!(env,opts[:env])

test/runtests.jl

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