WIP (no not merge), BinaryBuilder from giordano/Yggdrasil

.gitignore

@@ -7,3 +7,4 @@ test/test_results
 .DS_Store
 *~
 deps/build.log
+deps/build_*.jl

Project.toml

@@ -3,17 +3,13 @@ uuid = "159f3aea-2a34-519c-b102-8c37f9878175"
 version = "0.6.0"
 
 [deps]
-BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
+BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 Graphics = "a2bd30eb-e257-5431-a919-1863eab51364"
-Homebrew = "d9be37ee-ecc9-5288-90f1-b9ca67657a75"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-WinRPM = "c17dfb99-b4f7-5aad-8812-456da1ad7187"
 
 [compat]
-BinDeps = "≥ 0.3.21"
 Compat = "≥ 0.52.0"
 Graphics = "≥ 0.1.0"
 julia = "≥ 0.7.0"

deps/build.jl

@@ -1,185 +1,35 @@
-using BinDeps
-
-using Compat
-import Compat.Libdl
-import Compat.Sys
-
-if Sys.isapple()
-    deps_file_str = open(joinpath(dirname(pathof(BinDeps)), "dependencies.jl")) do file
-        read(file, String)
-    end
-    if occursin("ZEval",pathof(BinDeps))
-        patched_dlclose = replace(deps_file_str, "Libdl.dlclose(h)" => "println(\"ignored: dlclose()\")")
-        include_string(BinDeps,patched_dlclose)
-    end
-end
-
-
-@BinDeps.setup
-
-# check for cairo version
-function validate_cairo_version(name,handle)
-    f = Libdl.dlsym_e(handle, "cairo_version")
-    f == C_NULL && return false
-    v = ccall(f, Int32,())
-    return v > 10800
+using BinaryProvider # requires BinaryProvider 0.3.0 or later
+
+# Parse some basic command-line arguments
+const verbose = "--verbose" in ARGS
+const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr")))
+
+# These are the two binary objects we care about
+products = Product[
+    LibraryProduct(prefix, "libcairo", :libcairo),
+]
+
+dependencies = [
+    "https://github.com/bicycle1885/ZlibBuilder/releases/download/v1.0.4/build_Zlib.v1.2.11.jl",
+    "https://github.com/JuliaIO/LibpngBuilder/releases/download/v1.0.3/build_libpng.v1.6.37.jl",
+    "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Pixman-v0.36.0-0/build_Pixman.v0.36.0.jl",
+    "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Bzip2-v1.0.6-2/build_Bzip2.v1.0.6.jl",
+    "https://github.com/JuliaGraphics/FreeTypeBuilder/releases/download/v2.9.1-4/build_FreeType2.v2.10.0.jl",
+    "https://github.com/giordano/Yggdrasil/releases/download/X11-v1.6.8/build_X11.v1.6.8.jl",
+    "https://github.com/giordano/Yggdrasil/releases/download/Cairo-v1.14.12/build_Cairo.v1.14.12.jl",
+]
+
+
+for dependency in dependencies
+    file = joinpath(@__DIR__, basename(dependency))
+    isfile(file) || download(dependency, file)
+    # it's a bit faster to run the build in an anonymous module instead of
+    # starting a new julia process
+
+    # Build the dependencies
+    Mod = @eval module Anon end
+    Mod.include(file)
 end
 
-group = library_group("cairo")
-
-
-libpng = library_dependency("png", aliases = ["libpng","libpng-1.5.14","libpng15","libpng12.so.0","libpng12"], runtime = false, group = group)
-pixman = library_dependency("pixman", aliases = ["libpixman","libpixman-1","libpixman-1-0","libpixman-1.0"], depends = [libpng], runtime = false, group = group)
-libffi = library_dependency("ffi", aliases = ["libffi"], runtime = false, group = group)
-gettext = library_dependency("gettext", aliases = ["libintl", "preloadable_libintl", "libgettextpo", "intltool"], os = :Unix, group = group)
-gobject = library_dependency("gobject", aliases = ["libgobject-2.0-0", "libgobject-2.0", "libgobject-2_0-0", "libgobject-2.0.so.0"], depends=[libffi, gettext], group = group)
-freetype = library_dependency("freetype", aliases = ["libfreetype"], runtime = false, group = group)
-fontconfig = library_dependency("fontconfig", aliases = ["libfontconfig-1", "libfontconfig", "libfontconfig.so.1"], depends = [freetype], runtime = false, group = group)
-cairo = library_dependency("cairo", aliases = ["libcairo-2", "libcairo","libcairo.so.2", "libcairo2"], depends = [gobject,fontconfig,libpng], group = group, validate = validate_cairo_version)
-pango = library_dependency("pango", aliases = ["libpango-1.0-0", "libpango-1.0","libpango-1.0.so.0", "libpango-1_0-0"], group = group)
-pangocairo = library_dependency("pangocairo", aliases = ["libpangocairo-1.0-0", "libpangocairo-1.0", "libpangocairo-1.0.so.0"], depends = [cairo], group = group)
-zlib = library_dependency("zlib", aliases = ["libzlib","zlib1"], os = :Windows, group = group)
-
-if Sys.iswindows()
-    using WinRPM
-    provides(WinRPM.RPM,"libpango-1_0-0",[pango,pangocairo],os = :Windows)
-    provides(WinRPM.RPM,["glib2", "libgobject-2_0-0"],gobject,os = :Windows)
-    provides(WinRPM.RPM,"zlib-devel",zlib,os = :Windows)
-    provides(WinRPM.RPM,["libcairo2","libharfbuzz0"],cairo,os = :Windows)
-end
-
-if Sys.isapple()
-    using Homebrew
-    Homebrew.add("graphite2")
-    provides( Homebrew.HB, "cairo", cairo, os = :Darwin )
-    provides( Homebrew.HB, "pango", [pango, pangocairo], os = :Darwin, onload =
-    """
-    function __init__()
-        ENV["PANGO_SYSCONFDIR"] = joinpath("$(Homebrew.prefix())", "etc")
-    end
-    """ )
-    provides( Homebrew.HB, "fontconfig", fontconfig, os = :Darwin )
-    provides( Homebrew.HB, "glib", gobject, os = :Darwin )
-    provides( Homebrew.HB, "libpng", libpng, os = :Darwin )
-    provides( Homebrew.HB, "gettext", gettext, os = :Darwin )
-    provides( Homebrew.HB, "freetype", freetype, os = :Darwin )
-    provides( Homebrew.HB, "libffi", libffi, os = :Darwin )
-    provides( Homebrew.HB, "pixman", pixman, os = :Darwin )
-end
-
-# System Package Managers
-provides(AptGet,
-    Dict(
-        "libcairo2" => cairo,
-        "libfontconfig1" => fontconfig,
-        "libpango1.0-0" => [pango,pangocairo],
-        "libglib2.0-0" => gobject,
-        "libpng12-0" => libpng,
-        "libpixman-1-0" => pixman,
-        "gettext" => gettext
-    ))
-
-# TODO: check whether these are accurate
-provides(Yum,
-    Dict(
-        "cairo" => cairo,
-        "fontconfig" => fontconfig,
-        "pango" => [pango,pangocairo],
-        "glib2" => gobject,
-        "libpng" => libpng,
-        "gettext-libs" => gettext
-    ))
-
-provides(Zypper,
-    Dict(
-        "libcairo2" => cairo,
-        "libfontconfig" => fontconfig,
-        "libpango-1_0" => [pango,pangocairo],
-        "libglib-2_0" => gobject,
-        "libpng12" => libpng,
-        "libpixman-1" => pixman,
-        "gettext" => gettext
-    ))
-
-const png_version = "1.5.14"
-
-provides(Sources,
-    Dict(
-        URI("http://www.cairographics.org/releases/pixman-0.28.2.tar.gz") => pixman,
-        URI("http://www.cairographics.org/releases/cairo-1.12.16.tar.xz") => cairo,
-        URI("http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.gz") => freetype,
-        URI("http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.10.2.tar.gz") => fontconfig,
-        URI("http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.tar.gz") => gettext,
-        URI("ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng15/libpng-$(png_version).tar.gz") => libpng,
-        URI("ftp://sourceware.org/pub/libffi/libffi-3.0.11.tar.gz") => libffi,
-        URI("http://ftp.gnome.org/pub/gnome/sources/glib/2.34/glib-2.34.3.tar.xz") => gobject,
-        URI("http://ftp.gnome.org/pub/GNOME/sources/pango/1.32/pango-1.32.6.tar.xz") => [pango,pangocairo],
-        URI("http://zlib.net/zlib-1.2.7.tar.gz") => zlib
-    ))
-
-xx(t...) = (Sys.iswindows() ? t[1] : (Sys.islinux() || length(t) == 2) ? t[2] : t[3])
-
-provides(BuildProcess,
-    Dict(
-        Autotools(libtarget = "pixman/libpixman-1.la", installed_libname = xx("libpixman-1-0.","libpixman-1.","libpixman-1.0.")*Libdl.dlext) => pixman,
-        Autotools(libtarget = xx("objs/.libs/libfreetype.la","libfreetype.la")) => freetype,
-        Autotools(libtarget = "src/libfontconfig.la") => fontconfig,
-        Autotools(libtarget = "src/libcairo.la", configure_options = append!(append!(
-                AbstractString[],
-                !Sys.islinux() ? AbstractString["--without-x","--disable-xlib","--disable-xcb"] : AbstractString[]),
-                Sys.isapple() ? AbstractString["--enable-quartz","--enable-quartz-font","--enable-quartz-image","--disable-gl"] : AbstractString[])) => cairo,
-        Autotools(libtarget = "gettext-tools/gnulib-lib/.libs/libgettextlib.la") => gettext,
-        Autotools(libtarget = "libffi.la") => libffi,
-        Autotools(libtarget = "gobject/libgobject-2.0.la") => gobject,
-        Autotools(libtarget = "pango/libpango-1.0.la") => [pango,pangocairo]
-    ))
-
-provides(BuildProcess,Autotools(libtarget = "libpng15.la"),libpng,os = :Unix)
-
-
-if VERSION < v"1.0.0"
-provides(SimpleBuild,
-    (@build_steps begin
-        GetSources(zlib)
-        @build_steps begin
-            ChangeDirectory(joinpath(BinDeps.depsdir(zlib),"src","zlib-1.2.7"))
-            MakeTargets(["-fwin32/Makefile.gcc"])
-            #MakeTargets(["-fwin32/Makefile.gcc","DESTDIR=../../usr/","INCLUDE_PATH=include","LIBRARY_PATH=lib","SHARED_MODE=1","install"])
-        end
-    end),zlib, os = :Windows)
-end
-
-prefix=joinpath(BinDeps.depsdir(libpng),"usr")
-uprefix = replace(replace(prefix,"\\" => "/"),"C:/" => "/c/")
-pngsrcdir = joinpath(BinDeps.depsdir(libpng),"src","libpng-$png_version")
-pngbuilddir = joinpath(BinDeps.depsdir(libpng),"builds","libpng-$png_version")
-provides(BuildProcess,
-    (@build_steps begin
-        GetSources(libpng)
-        CreateDirectory(pngbuilddir)
-        @build_steps begin
-            ChangeDirectory(pngbuilddir)
-            FileRule(joinpath(prefix,"lib","libpng15.dll"),@build_steps begin
-                `cmake -DCMAKE_INSTALL_PREFIX="$prefix" -G"MSYS Makefiles" $pngsrcdir`
-                `make`
-                `cp 'libpng*.dll' $prefix/lib`
-                `cp 'libpng*.a' $prefix/lib`
-                `cp 'libpng*.pc' $prefix/lib/pkgconfig`
-                `cp pnglibconf.h $prefix/include`
-                `cp $pngsrcdir/png.h $prefix/include`
-                `cp $pngsrcdir/pngconf.h $prefix/include`
-            end)
-        end
-    end),libpng, os = :Windows)
-
-
-@BinDeps.install Dict([(:gobject, :_jl_libgobject),
-                       (:cairo, :_jl_libcairo),
-                       (:pango, :_jl_libpango),
-                       (:pangocairo, :_jl_libpangocairo)])
-
-
-if Sys.isapple()
-    import Pkg.Types.printpkgstyle
-    printpkgstyle(stdout, :Installed, "Patched install script, restarting Julia is recommended.")
-end
+# Finally, write out a deps.jl file
+write_deps_file(joinpath(@__DIR__, "deps.jl"), products)