Updated package for Julia 0.7 and 1.0 (#153)

Dropped support for Julia 0.6.

The package does not build on Julia 1.0 right now due to issues with upstream packages:
- JuliaPackaging/BinDeps.jl#376
- JuliaPackaging/Homebrew.jl#243

Once those upstream fixes have been released, things will hopefully start to work transparently, though we may want to add version constraints in the `REQUIRE`.

Author: jayschwa

.travis.yml

@@ -1,10 +1,11 @@
 language: julia
 julia:
-  - 0.6
   - 0.7
+  - 1.0
   - nightly
 matrix:
   allow_failures:
+  - julia: 1.0
   - julia: nightly
 notifications:
   email: false

REQUIRE

@@ -1,3 +1,4 @@
-julia 0.6
+julia 0.7
 BinDeps
+@!windows CMakeWrapper
 @osx Homebrew

appveyor.yml

@@ -1,14 +1,16 @@
 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://julialang-s3.julialang.org/bin/winnt/x86/1.0/julia-1.0-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-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"
 
 matrix:
   allow_failures:
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/1.0/julia-1.0-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-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,59 +1,46 @@
-include("../src/compat.jl")
-
 # version of library to download
 const version = v"3.2.1"
 
-using BinDeps
+using BinDeps, Libdl
 @BinDeps.setup
 
-if !isdefined(Base, :Libdl)
-	# TODO for Julia upgrade: remove check
-	using Libdl
-end
-
 function compatible_version(lib, handle)
 	major, minor, rev = Ref{Cint}(), Ref{Cint}(), Ref{Cint}()
 	ccall(Libdl.dlsym(handle, :glfwGetVersion), Cvoid, (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, rev)
 	libversion = VersionNumber(major[], minor[], rev[])
 	return libversion >= version
 end
 
-glfw = library_dependency("libglfw", aliases=["glfw", "glfw3", "libglfw3"], validate=compatible_version)
+glfw = library_dependency("glfw", aliases=["glfw", "glfw3", "libglfw", "libglfw3"], validate=compatible_version)
 
 # library source code
 provides(Sources, URI("https://github.com/glfw/glfw/archive/$version.tar.gz"), glfw, unpacked_dir="glfw-$version")
-srcdir = joinpath(BinDeps.srcdir(glfw), "glfw-$version")
-
-# how to build library from source
-cmake_options = map(x -> "-D$(x[1])=$(x[2])", [
-	("BUILD_SHARED_LIBS",    "ON"),
-	("CMAKE_INSTALL_PREFIX", BinDeps.usrdir(glfw)),
-	("GLFW_BUILD_DOCS",      "OFF"),
-	("GLFW_BUILD_EXAMPLES",  "OFF"),
-	("GLFW_BUILD_TESTS",     "OFF")
-])
-cmake_build_steps = @build_steps begin
-	GetSources(glfw)
-	@build_steps begin
-		ChangeDirectory(srcdir)
-		`cmake $cmake_options .`
-		MakeTargets("install")
-	end
+
+# build library from source
+@static if !Sys.iswindows()
+	using CMakeWrapper
+	build_options = [
+		("BUILD_SHARED_LIBS",   "ON"),
+		("GLFW_BUILD_DOCS",     "OFF"),
+		("GLFW_BUILD_EXAMPLES", "OFF"),
+		("GLFW_BUILD_TESTS",    "OFF"),
+	]
+	build_defines = ["-D$k=$v" for (k, v) in build_options]
+	provides(BuildProcess, CMakeProcess(cmake_args=build_defines), glfw)
 end
-provides(SimpleBuild, cmake_build_steps, glfw)
 
-# get library through Homebrew, if available
-if isapple()
+# get library through Homebrew package manager
+@static if Sys.isapple()
 	using Homebrew
 	provides(Homebrew.HB, "glfw", glfw, os=:Darwin)
 end
 
 # download a pre-compiled binary (built by GLFW)
-if iswindows()
+@static if Sys.iswindows()
 	archive = "glfw-$version.bin.WIN$(Sys.WORD_SIZE)"
 	libpath = joinpath(archive, "lib-mingw-w64")
 	uri = URI("https://github.com/glfw/glfw/releases/download/$version/$archive.zip")
 	provides(Binaries, uri, glfw, unpacked_dir=archive, installed_libpath=libpath, os=:Windows)
 end
 
-@BinDeps.install Dict("libglfw"=>"lib")
+@BinDeps.install Dict(:glfw => :lib)

examples/callbacks.jl

@@ -1,7 +1,5 @@
 using GLFW
 
-include("../src/compat.jl")
-
 window = GLFW.CreateWindow(640, 480, "GLFW Callback Test")
 GLFW.MakeContextCurrent(window)
 
@@ -32,7 +30,7 @@ GLFW.SetDropCallback(window, (_, paths) -> println(paths))
 
 glClear() = ccall(@eval(GLFW.GetProcAddress("glClear")), Cvoid, (Cuint,), 0x00004000)
 
-gc() # Force garbage collection so that improper reference management is more apparent via crashes
+GC.gc() # Force garbage collection so that improper reference management is more apparent via crashes
 
 try
 	while !GLFW.WindowShouldClose(window)

examples/multiwindow.jl

@@ -3,8 +3,6 @@ using GLFW
 # Note: This was written as a quick test for multiwindow support.
 # It is not a clean example (yet) of the proper way to do it.
 
-include("../src/compat.jl")
-
 windows = []
 glClear = Dict{GLFW.Window, Function}()
 for i in 1:3
@@ -21,7 +19,7 @@ for i in 1:3
 	push!(windows, window)
 end
 
-gc() # Force garbage collection so that improper reference management is more apparent via crashes
+GC.gc() # Force garbage collection so that improper reference management is more apparent via crashes
 
 while !any(GLFW.WindowShouldClose, windows)
 	for window in windows

src/GLFW.jl

@@ -1,8 +1,5 @@
-__precompile__()
-
 module GLFW
 
-include("compat.jl")
 include("../deps/deps.jl")
 
 function GetVersion()
@@ -14,24 +11,19 @@ end
 include("callback.jl")
 include("glfw3.jl")
 include("vulkan.jl")
-
-if isdefined(Base, :getproperty) && isdefined(Base, :setproperty!)
-	# Julia 0.7 supports property overloading
-	# TODO for Julia upgrade: remove feature guard
-	include("monitor_properties.jl")
-end
+include("monitor_properties.jl")
 
 const GLFW_INITIALIZED = Ref(false)
 
 is_initialized() = GLFW_INITIALIZED[]
 
-
 function __init__()
 	libversion = GetVersion()
 
 	if libversion.major != 3
 		error("GLFW version $libversion not supported")
 	end
+
 	# Save errors that occur during initialization
 	errors = Vector{Exception}()
 	SetErrorCallback(err -> push!(errors, err))
@@ -47,7 +39,7 @@ function __init__()
 	if is_initialized()
 		atexit(Terminate)
 		for err in errors
-			warn(err)  # Warn about any non-fatal errors that may have occurred during initialization
+			@warn err  # Warn about any non-fatal errors that may have occurred during initialization
 		end
 	else
 		throw(errors)  # Throw fatal errors

src/callback.jl

@@ -34,16 +34,19 @@ function callbackcode(
 	wrapper = Symbol('_', name, "CallbackWrapper")    # _FooCallbackWrapper
 
 	# Separate names and types of parameters
-	callback_param_types = Expr(:curly, :Tuple, map(paramtype, callback_params)...)
+	callback_param_types = Expr(:tuple, map(paramtype, callback_params)...)
 	setter_param_names = map(paramname, setter_params)
 	setter_param_types = map(paramtype, setter_params)
 
 	quote
+		# Callback wrapper that can be passed to `cfunction`
+		$wrapper($(callback_params...)) = ($callback_ref($(callback_args...)); return nothing)
+		
 		# Set the callback function
 		function $setter($(setter_param_names...), callback::Function)
 			old_callback = $callback_ref
 			$callback_ref = callback  # Prevent callback function from being garbage-collected
-			cfunptr = cfunction($wrapper, Cvoid, $callback_param_types)
+			cfunptr = @cfunction($wrapper, Cvoid, $callback_param_types)
 			ccall( ($libsetter, lib), Ptr{Cvoid}, ($(setter_param_types...), Ptr{Cvoid}), $(setter_param_names...), cfunptr)
 			return old_callback
 		end
@@ -55,9 +58,6 @@ function callbackcode(
 			$callback_ref = nothing  # Allow former callback function to be garbage-collected
 			return old_callback
 		end
-
-		# Callback wrapper that can be passed to `cfunction`
-		$wrapper($(callback_params...)) = ($callback_ref($(callback_args...)); return nothing)
 	end
 end
 

src/compat.jl

@@ -303,7 +303,7 @@ function Window(
 		WindowHint(wh[1], wh[2])
 	end
 
-	@static if isapple()
+	@static if Sys.isapple()
 		if debugging
 			warn("OpenGL debug message callback not available on osx")
 			debugging = false
@@ -672,5 +672,5 @@ GLFW.PollEvents() # seems to need a poll events to become active
 ```
 """
 function SetWindowIcon(window::Window, image::Matrix{NTuple{4, UInt8}})
-	ccall((:glfwSetWindowIcon, lib), Void, (Window, Cint, GLFWImage), window, 1, image)
+	ccall((:glfwSetWindowIcon, lib), Cvoid, (Window, Cint, GLFWImage), window, 1, image)
 end