From dc0bb3f8196f7077578a6f789f7c8231dff85a08 Mon Sep 17 00:00:00 2001 From: ComplYue Date: Tue, 28 Jun 2016 09:49:32 +0800 Subject: [PATCH 1/3] generalize build on OSX, resolve Julia dir from /Applications by glob --- tools/find_julia.py | 7 +++++-- tools/nj_config.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/find_julia.py b/tools/find_julia.py index 78d726c..728cbdc 100755 --- a/tools/find_julia.py +++ b/tools/find_julia.py @@ -1,6 +1,7 @@ import os import sys import subprocess +import glob def julia_from_which_julia(): @@ -41,8 +42,10 @@ def julia_from_home_directory_win(): return ""; def julia_from_applications(): - julia_dir = "/Applications/Julia-0.3.0.app/Contents/Resources/julia/" - if os.path.isdir(julia_dir): return julia_dir + julia_dirs = glob.glob("/Applications/Julia-*.app/Contents/Resources/julia/") + if(julia_dirs is not None and len(julia_dirs) > 0): + julia_dirs.sort(reverse=True) # use latest if multiple homes exist + return julia_dirs[0] return "" if sys.argv[1] == "win": diff --git a/tools/nj_config.py b/tools/nj_config.py index d90a21c..3ab84e3 100644 --- a/tools/nj_config.py +++ b/tools/nj_config.py @@ -3,6 +3,7 @@ import sys import subprocess import platform +import glob def which(cmd): @@ -51,8 +52,10 @@ def julia_base_from_home_directory_win(): return path def julia_base_from_applications(): - julia_dir = "/Applications/Julia-0.3.0.app/Contents/Resources/julia/" - if os.path.isdir(julia_dir): return julia_dir + julia_dirs = glob.glob("/Applications/Julia-*.app/Contents/Resources/julia/") + if(julia_dirs is not None and len(julia_dirs) > 0): + julia_dirs.sort(reverse=True) # use latest if multiple homes exist + return julia_dirs[0] return "" def find_julia_base(operating_system): From 9c2109f8ba6f841f61741a22c0d834fa35c97c2b Mon Sep 17 00:00:00 2001 From: ComplYue Date: Tue, 28 Jun 2016 09:50:16 +0800 Subject: [PATCH 2/3] fix building on mac: missing include dir --- binding.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/binding.gyp b/binding.gyp index ff2cf8c..38bf17d 100644 --- a/binding.gyp +++ b/binding.gyp @@ -33,6 +33,9 @@ { "juliaInclude":"/usr/include/julia" }, { "juliaInclude":"<(juliaBase)/include/julia" } ], + [ "OS=='mac'", + { "juliaInclude":"<(juliaBase)/include/julia" } + ], [ "OS == 'linux'", { "gcc_target":" Date: Tue, 28 Jun 2016 10:05:55 +0800 Subject: [PATCH 3/3] fix warning: 'delete' applied to a pointer that was allocated with 'new[]'; --- src/Call.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Call.cpp b/src/Call.cpp index a8c2a90..757af1e 100644 --- a/src/Call.cpp +++ b/src/Call.cpp @@ -162,7 +162,7 @@ nj::Result nj::Call::eval(vector> &args,int64_t exprId) if(!jl_args[i]) rvalue_error = true; } if(!rvalue_error) jl_res = jl_call(func,jl_args,(int)numArgs); - delete jl_args; + delete[] jl_args; } if(rvalue_error)