Fix binary_path on windows for change_dir_if_bundle()

NHDaly · Jul 22, 2018 · d5c33a3 · d5c33a3
1 parent c7c6150
commit d5c33a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/ApplicationBuilder.jl b/src/ApplicationBuilder.jl
@@ -51,7 +51,7 @@ end
 @static if is_linux() || is_windows()
 
 	function change_dir_if_bundle()
-		binary_path = split(string(Base.julia_cmd()), ' ')[1][2:end]
+ 		binary_path = PROGRAM_FILE  # PROGRAM_FILE is set manually in program.c
 		newpath = dirname(dirname(binary_path))
 		cd(newpath)
 		println("New pwd = $(pwd())")

diff --git a/src/bundle.jl b/src/bundle.jl
@@ -1,8 +1,11 @@
-function build_app_bundle(script::String; 
+if is_windows()
+	include("installer.jl")
+end
+function build_app_bundle(script::String;
 				resources = String[],
 				libraries = String[],
 				builddir = "builddir",
-				appname = "nothing", 
+				appname = "nothing",
 				create_installer = false)