Skip to content

fix for building on OSX against Node 6.2.2 / Julia 0.4.6 #32

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

Open
complyue wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix for building on OSX against Node 6.2.2 / Julia 0.4.6 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc0bb3f
generalize build on OSX, resolve Julia dir from /Applications by glob
complyue Jun 28, 2016
9c2109f
fix building on mac: missing include dir
complyue Jun 28, 2016
fabf904
fix warning: 'delete' applied to a pointer that was allocated with 'n…
complyue Jun 28, 2016
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
3 changes: 3 additions & 0 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
{ "juliaInclude":"/usr/include/julia" },
{ "juliaInclude":"<(juliaBase)/include/julia" }
],
[ "OS=='mac'",
{ "juliaInclude":"<(juliaBase)/include/julia" }
],
[ "OS == 'linux'",
{ "gcc_target":"<!(python tools/nj_config.py <(OS) gcc_target)" },
{ "gcc_target":"" }
Expand Down
2 changes: 1 addition & 1 deletion src/Call.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ nj::Result nj::Call::eval(vector<shared_ptr<nj::Value>> &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)
Expand Down
7 changes: 5 additions & 2 deletions tools/find_julia.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os
import sys
import subprocess
import glob


def julia_from_which_julia():
Expand Down Expand Up @@ -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":
Expand Down
7 changes: 5 additions & 2 deletions tools/nj_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import sys
import subprocess
import platform
import glob


def which(cmd):
Expand Down Expand Up @@ -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):
Expand Down