Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e364464

Browse files
committedJul 22, 2018
Fix binary_path on windows for change_dir_if_bundle()
1 parent 42b2b19 commit e364464

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed
 

‎src/ApplicationBuilder.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ end
5151
@static if is_linux() || is_windows()
5252

5353
function change_dir_if_bundle()
54-
binary_path = split(string(Base.julia_cmd()), ' ')[1][2:end]
54+
binary_path = PROGRAM_FILE # PROGRAM_FILE is set manually in program.c
5555
newpath = dirname(dirname(binary_path))
5656
cd(newpath)
5757
println("New pwd = $(pwd())")

‎src/bundle.jl

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
function build_app_bundle(script::String;
1+
if is_windows()
2+
include("installer.jl")
3+
end
4+
function build_app_bundle(script::String;
25
resources = String[],
36
libraries = String[],
47
builddir = "builddir",
5-
appname = "nothing",
8+
appname = "nothing",
69
create_installer = false)
710

811

0 commit comments

Comments
 (0)
Please sign in to comment.