Fix Dylib building for macOS

And, disable the email notifications.

Author: KDr2

.gitignore

@@ -57,3 +57,4 @@ Project.toml
 deps/build.log
 deps/deps.jl
 deps/usr/
+deps/tmp-build.jl

.travis.yml

@@ -15,9 +15,19 @@ matrix:
   - julia: 0.7
   fast_finish: true
 
-  notifications:
+notifications:
   email: false
 
+cache:
+  timeout: 1000
+  directories:
+  - downloads
+
+env:
+  global:
+  - BINARYBUILDER_DOWNLOADS_CACHE=downloads
+  - BINARYBUILDER_AUTOMATIC_APPLE=true
+
 stages:
 - name: dylib
 - name: test
@@ -42,5 +52,5 @@ jobs:
   - stage: test
     script:
     - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-    - julia -e ' using Pkg; Pkg.clone(pwd(), "Libtask"); Pkg.build("Libtask"); Pkg.test("Libtask"; coverage=true)'
-    - julia -e ' using Pkg; cd(Pkg.dir("Libtask")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'
+    - julia -e 'using Pkg; Pkg.clone(pwd(), "Libtask"); Pkg.build("Libtask"); Pkg.test("Libtask"; coverage=true)'
+    - julia -e 'using Pkg; cd(Pkg.dir("Libtask")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'

deps/build.jl

@@ -18,25 +18,5 @@ function include_build_script(version_str, try_prev=false)
     include(build_script)
 end
 
-@static if Sys.isapple()
-    println("BinaryBuilder has a problem of its macOS support, so we build the dylib by ourselves.")
-    using Libdl
-    julia_root = Libdl.dlpath("libjulia") |> dirname |> dirname |> abspath
-    LIBS = "$(julia_root)/lib"
-    LIBSJL = "$(julia_root)/lib/julia"
-    INCLUDES = "$(julia_root)/include/julia"
-    THIS_DIR = dirname(@__FILE__)
-    OUTPUT_DIR = joinpath(THIS_DIR, "usr/lib")
-    run(`mkdir -p $OUTPUT_DIR`)
-    OUTPUT = joinpath(OUTPUT_DIR, "libtask.dylib")
-    run(`gcc -O2 -shared -std=gnu99 -I$INCLUDES -DJULIA_ENABLE_THREADING=1 -fPIC -L$LIBSJL -L$LIBS -ljulia $THIS_DIR/task.c -o $OUTPUT`)
-
-    depsjl = joinpath(THIS_DIR, "deps.jl")
-    open(depsjl, "w") do io
-        write(io, "const libtask = \"$OUTPUT\";\n")
-        write(io, "function check_deps() end\n")
-    end;
-else
-    version_str = read(joinpath(@__DIR__, "../VERSION"), String) |> strip |> (x) -> lstrip(x, ['v'])
-    include_build_script(version_str, true)
-end
+version_str = read(joinpath(@__DIR__, "../VERSION"), String) |> strip |> (x) -> lstrip(x, ['v'])
+include_build_script(version_str, true)

deps/build_dylib.sh

@@ -88,7 +88,7 @@ if [ $target = "x86_64-apple-darwin14" ]; then
     LIBSJL="`pwd`/julia/Contents/Resources/julia/lib/julia"
     INCLUDES="`pwd`/julia/Contents/Resources/julia/include/julia"
     cd Libtask.jl/deps
-    gcc -O2 -shared -std=gnu99 -I$INCLUDES -DJULIA_ENABLE_THREADING=1 -fPIC -L$LIBSJL -L$LIBS -ljulia task.c -o libtask.dylib
+    $CC -O2 -shared -std=gnu99 -I$INCLUDES -DJULIA_ENABLE_THREADING=1 -fPIC -L$LIBSJL -L$LIBS -ljulia task.c -o libtask.dylib
     mkdir $prefix/lib
     mv libtask.dylib $prefix/lib
     exit

deps/build_tarballs.jl

@@ -20,7 +20,7 @@ platforms = [
     Linux(:i686, :glibc),
     Linux(:x86_64, :glibc),
     Linux(:armv7l, :glibc, :eabihf),
-    # MacOS(:x86_64), # The macOS support of BinaryBuilder.jl is broken now.
+    MacOS(:x86_64),
     Windows(:i686),
     Windows(:x86_64)
 ]