Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: preparation for v0.7 #197

Closed
wants to merge 10 commits into from
Closed

WIP: preparation for v0.7 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c6bb5de
testing on and first deprecations (iswindows)
lobingera Aug 6, 2017
e5d1be5
Compat.Sys prefix, nightly on, 0.4 off
lobingera Aug 9, 2017
cefb1de
merge from master
lobingera Dec 6, 2017
b51cc9c
typo
lobingera Dec 6, 2017
ba84119
compat base64
lobingera Dec 7, 2017
eec75e2
some deprecation warnings
lobingera Dec 9, 2017
eea882a
some deprecation warnings
lobingera Dec 10, 2017
4c3045e
compat finalizer
lobingera Dec 10, 2017
c73e015
uninitialized needed
lobingera Jan 30, 2018
bc02291
ptr(void), deprecation warnings on where
lobingera Feb 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,10 @@ matrix:
dist: trusty
sudo: false
- language: julia
julia: 0.5
julia: nightly
os: linux
- language: julia
julia: 0.5
os: osx
- language: julia
julia: 0.6
os: osx
dist: trusty
sudo: false
notifications:
email: false
after_success:
Expand Down
9 changes: 1 addition & 8 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
environment:
matrix:
# - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
# - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
# - 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"

- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
branches:
only:
- master
Expand Down
11 changes: 6 additions & 5 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ using BinDeps
@BinDeps.setup

using Compat
#import Compat.Sys

# check for cairo version
function validate_cairo_version(name,handle)
Expand All @@ -28,15 +29,15 @@ deps = [
zlib = library_dependency("zlib", aliases = ["libzlib","zlib1"], os = :Windows, group = group)
]

if is_windows()
if Compat.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 is_apple()
if Compat.Sys.isapple()
if Pkg.installed("Homebrew") === nothing
error("Homebrew package not installed, please run Pkg.add(\"Homebrew\")")
end
Expand Down Expand Up @@ -107,7 +108,7 @@ provides(Sources,
URI("http://zlib.net/zlib-1.2.7.tar.gz") => zlib
))

xx(t...) = (is_windows() ? t[1] : (is_linux() || length(t) == 2) ? t[2] : t[3])
xx(t...) = (Compat.Sys.iswindows() ? t[1] : (Compat.Sys.islinux() || length(t) == 2) ? t[2] : t[3])

provides(BuildProcess,
@compat Dict(
Expand All @@ -116,8 +117,8 @@ provides(BuildProcess,
Autotools(libtarget = "src/libfontconfig.la") => fontconfig,
Autotools(libtarget = "src/libcairo.la", configure_options = append!(append!(
AbstractString[],
!is_linux() ? AbstractString["--without-x","--disable-xlib","--disable-xcb"] : AbstractString[]),
is_apple() ? AbstractString["--enable-quartz","--enable-quartz-font","--enable-quartz-image","--disable-gl"] : AbstractString[])) => cairo,
!Compat.Sys.islinux() ? AbstractString["--without-x","--disable-xlib","--disable-xcb"] : AbstractString[]),
Compat.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,
Expand Down
2 changes: 1 addition & 1 deletion samples/sample_alpha_paint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cr = CairoContext(c);

save(cr);

z = Array{RGB24}(2,2)
z = Array{RGB24}(uninitialized, 2,2)
c1 = convert(RGB24,colorant"grey20")
c2 = convert(RGB24,colorant"grey80")
z[1,1] = c1
Expand Down
Loading