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] Optionally store deps.jl in a different directory #991

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Optionally store deps.jl in a different directory #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ try # make sure deps.jl file is removed on error
error("Python 2.7 or later is required for PyCall")
end

writeifchanged("deps.jl", """
dep_path = get(ENV, "PYCALL_DEPOT", "")

writeifchanged(joinpath(dep_path, "deps.jl"), """
const python = "$(escape_string(python))"
const libpython = "$(escape_string(libpy_name))"
const pyprogramname = "$(escape_string(programname))"
Expand Down
7 changes: 6 additions & 1 deletion src/startup.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ end

if !symbols_present
# Python not present. Use deps.jl
const depfile = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
const depfile =
if haskey(ENV, "PYCALL_DEPOT")
joinpath(ENV["PYCALL_DEPOT"], "deps.jl")
else
joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
end
isfile(depfile) || error("PyCall not properly installed. Please run Pkg.build(\"PyCall\")")
include(depfile) # generated by Pkg.build("PyCall")
# Only to be used at top-level - pointer will be invalid after reload
Expand Down