Skip to content

Commit d5ffe69

Browse files
authored
Merge pull request #452 from JuliaInterop/binary-build-1.3
Fix binary build for Julia 1.3, fix #444
2 parents c5bdd65 + c409fd6 commit d5ffe69

File tree

8 files changed

+179
-143
lines changed

8 files changed

+179
-143
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ language: julia
44
os:
55
- linux
66
- osx
7+
- windows
78

89
julia:
910
- 1.1
1011
- 1.2
12+
- 1.3
1113
- nightly
1214

1315
matrix:

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name = "Cxx"
22
uuid = "a0b5b9ef-44b7-5148-a2d1-f6db19f3c3d2"
3-
version = "0.3.3"
3+
version = "0.4.0"
44

55
[compat]
6-
julia = "1.1"
7-
BinaryProvider = "0.5.0"
6+
julia = "^1.3"
7+
BinaryProvider = "^0.5.0"
88

99
[deps]
1010
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"

appveyor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ environment:
22
matrix:
33
- julia_version: 1.1
44
- julia_version: 1.2
5+
- julia_version: 1.3
56
- julia_version: nightly
67

78
platform:
@@ -33,9 +34,9 @@ build_script:
3334
- echo "%JL_BUILD_SCRIPT%"
3435
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
3536

36-
# test_script:
37-
# - echo "%JL_TEST_SCRIPT%"
38-
# - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
37+
test_script:
38+
- echo "%JL_TEST_SCRIPT%"
39+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
3940

4041
# # Uncomment to support code coverage upload. Should only be enabled for packages
4142
# # which would have coverage gaps without running on Windows

deps/build_libcxxffi.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ products = [
88
]
99

1010
# Download binaries from hosted location
11-
bin_prefix = "https://github.com/JuliaInterop/Cxx.jl/releases/download/libcxxffi-binaries/"
11+
bin_prefix = "https://github.com/JuliaInterop/Cxx.jl/releases/download/libcxxffi-binaries-1.3/"
1212

1313
# Listing of files generated by BinaryBuilder:
1414
download_info = Dict(
15-
Linux(:x86_64, libc=:glibc) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-linux-gnu-gcc7.tar.gz", "cc53946f4867d95f543ad112db6a5ce40bbdf9f5b9a8982906a14c1cff5aaced"),
16-
MacOS(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-apple-darwin14-gcc7.tar.gz", "76aa1dfc7ecb97069043ed6e19b685371e04daf92d73201aaf054678e2a11cf1"),
17-
Windows(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-w64-mingw32-gcc7.tar.gz", "9730c0c438e3cfcfc793d05e511b428e01aebf75085bd36582c822e220532790"),
18-
FreeBSD(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-unknown-freebsd11.1-gcc7.tar.gz", "930df7bf7ecded6936dd9f637787b7eade402c07c0c2b2b49c4e72329d6bd9ef"),
15+
Linux(:x86_64, libc=:glibc) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-linux-gnu-libgfortran4.tar.gz", "e7d2bf1791f0d03491ec2b918f7ba4b12bbaf1281e42fd54bcc0defb716c106e"),
16+
MacOS(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-apple-darwin14-libgfortran4.tar.gz", "ed170a5be89ddd7b5b672005b4fecba181f5b9f19b2c93c9dbae5334eb7dd167"),
17+
Windows(:x86_64) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-w64-mingw32-libgfortran4.tar.gz", "b53aaab234a2e4241e81280bc587ca125296e82d8365ffd4b74b0cd422bc3416"),
18+
#FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libcxxffi.v0.0.0.x86_64-unknown-freebsd11.1-gcc7.tar.gz", "930df7bf7ecded6936dd9f637787b7eade402c07c0c2b2b49c4e72329d6bd9ef"),
1919
)
2020

2121
# Install unsatisfied or updated dependencies:

0 commit comments

Comments
 (0)