Updates for Julia 1.0

Author: barche

.ci/build_tarballs.jl

@@ -11,11 +11,9 @@ function getscript(version)
     return """
     Julia_ROOT=/usr/local
 
-    apk add p7zip
-
     # Download julia
     cd /usr/local
-    curl -L "https://github.com/barche/julia-binaries/releases/download/$version/julia-$version-\$target.tar.gz" | tar -zx --strip-components=1 
+    curl -L "https://github.com/JuliaPackaging/JuliaBuilder/releases/download/$version/julia-$version-\$target.tar.gz" | tar -zx --strip-components=1 
     
     # Build libcxxwrap
     cd \$WORKSPACE/srcdir/libcxxwrap-julia*
@@ -31,11 +29,11 @@ end
 # These are the platforms we will build for by default, unless further
 # platforms are passed in on the command line
 platforms = [
-    #Linux(:i686),
     Linux(:x86_64),
     MacOS(:x86_64),
     Windows(:i686),
-    Windows(:x86_64)
+    Windows(:x86_64),
+    #Linux(:i686)
 ]
 
 # The products that we will ensure are always built
@@ -52,5 +50,5 @@ version_number = get(ENV, "TRAVIS_TAG", "")
 if version_number == ""
     version_number = "v0.99"
 end
-download_info_07 = build_tarballs(ARGS, "libcxxwrap-julia-0.7", VersionNumber(version_number), sources, getscript("0.7.0-beta"), platforms, products, dependencies)
-@show download_info_07
+build_tarballs(ARGS, "libcxxwrap-julia-0.7", VersionNumber(version_number), sources, getscript("0.7.0"), platforms, products, dependencies)
+build_tarballs(ARGS, "libcxxwrap-julia-1.0", VersionNumber(version_number), sources, getscript("1.0.0"), platforms, products, dependencies)

.travis.yml

@@ -20,7 +20,7 @@ sudo: required
 before_script:
   - cd ../..
   - pwd
-  - julia -e 'Pkg.clone("https://github.com/JuliaPackaging/BinaryProvider.jl")'
+  - julia -e 'Pkg.add("BinaryProvider")'
   - julia -e 'Pkg.clone("https://github.com/JuliaPackaging/BinaryBuilder.jl"); Pkg.build()'
 
 script:

include/jlcxx/jlcxx_config.hpp

@@ -15,7 +15,7 @@
 
 #define JLCXX_VERSION_MAJOR 0
 #define JLCXX_VERSION_MINOR 3
-#define JLCXX_VERSION_PATCH 1
+#define JLCXX_VERSION_PATCH 2
 
 // From https://stackoverflow.com/questions/5459868/concatenate-int-to-string-using-c-preprocessor
 #define __JLCXX_STR_HELPER(x) #x

include/jlcxx/type_conversion.hpp

@@ -2,7 +2,7 @@
 #define JLCXX_TYPE_CONVERSION_HPP
 
 #include <julia.h>
-#if JULIA_VERSION_MAJOR == 0 && JULIA_VERSION_MINOR > 4
+#if JULIA_VERSION_MAJOR == 0 && JULIA_VERSION_MINOR > 4 || JULIA_VERSION_MAJOR > 0
 #include <julia_threads.h>
 #endif
 

src/jlcxx.cpp

@@ -4,7 +4,7 @@
 #include "jlcxx/jlcxx_config.hpp"
 
 #include <julia.h>
-#if JULIA_VERSION_MAJOR == 0 && JULIA_VERSION_MINOR > 4
+#if JULIA_VERSION_MAJOR == 0 && JULIA_VERSION_MINOR > 4 || JULIA_VERSION_MAJOR > 0
 #include <julia_threads.h>
 #endif
 
@@ -19,7 +19,7 @@ JLCXX_API jl_array_t* gc_protected()
   static jl_array_t* m_arr = nullptr;
   if (m_arr == nullptr)
   {
-#if JULIA_VERSION_MAJOR == 0 && JULIA_VERSION_MINOR > 4
+#if JULIA_VERSION_MAJOR == 0 && JULIA_VERSION_MINOR > 4 || JULIA_VERSION_MAJOR > 0
     jl_value_t* array_type = apply_array_type(jl_any_type, 1);
     m_arr = jl_alloc_array_1d(array_type, 0);
 #else