Merge f28bd2a into 4ef1dc2

README.md

@@ -15,7 +15,7 @@ There is both a native julia interface, in the `BuildApp` module, and a command-
 
 To compile and bundle your julia program into a distributable app, use `BuildApp.build_app_bundle`:
 ```julia
-julia> using ApplicationBuilder; using BuildApp
+julia> using ApplicationBuilder
 help?> build_app_bundle()
   # 1 method for generic function "build_app_bundle":
   build_app_bundle(juliaprog_main; appname, builddir, resources, libraries, verbose, bundle_identifier, app_version, icns_file, certificate, entitlements_file)

build_app.jl

@@ -1,4 +1,4 @@
-using ArgParse, ApplicationBuilder; using BuildApp
+using ArgParse, ApplicationBuilder
 
 const julia_v07 = VERSION > v"0.7-"
 
@@ -89,4 +89,4 @@ else
     filter!((k, v) -> v ∉ (nothing, false), parsed_args)
 end
 
-BuildApp.build_app_bundle(juliaprog_main; parsed_args...)
+ApplicationBuilder.build_app_bundle(juliaprog_main; parsed_args...)

examples/blink.jl

@@ -14,7 +14,6 @@
 #      examples/blink.jl "HelloBlink"
 
 using Blink
-using ApplicationBuilder
 
 # In order to distribute this Application, we've copied all its dependencies
 # into the .app bundle via the -R and -L build flags.
@@ -84,10 +83,6 @@ function helloFromBlink()
 end
 
 Base.@ccallable function julia_main(args::Vector{String})::Cint
-    # Note that we must call this function in order for Blink to find the
-    # resources we've copied into the Application bundle.
-    ApplicationBuilder.App.change_dir_if_bundle()
-
     # Apparently starting Electron too quickly means the OS doesn't get a
     # chance to find the name of the application...
     sleep(2)

examples/commandline_hello.jl

@@ -1,10 +1,10 @@
 # A super-simple command line program that just prints hello.
-# Build this with the `commandline_app=true` flag in `BuildApp.build_app_bundle`.
+# Build this with the `commandline_app=true` flag in `ApplicationBuilder.build_app_bundle`.
 
 Base.@ccallable function julia_main(ARGS::Vector{String})::Cint
     println("Hi what's your name?")
     name = readline()
-    println("Oh hi, $name\! It's a pleasure to meet you.")
+    println("Oh hi, $name. It's a pleasure to meet you.")
     println("By the way, here's the current working directory:\n'$(pwd())'")
 
     println("\nGoodbye! (Press enter to exit)")

examples/hello.jl

@@ -1,9 +1,5 @@
-using ApplicationBuilder
-
 # Create a temporary .html file, and open it to share the greetings.
 Base.@ccallable function julia_main(ARGS::Vector{String})::Cint
-    ApplicationBuilder.App.change_dir_if_bundle()
-
     tmpdir = mktempdir()
     filename = joinpath(tmpdir, "hello.html")
     open(filename, "w") do io

examples/libui.jl

@@ -1,5 +1,3 @@
-using ApplicationBuilder
-
 using Libui
 
 
@@ -173,8 +171,6 @@ end
 
 
 Base.@ccallable function julia_main(ARGS::Vector{String})::Cint
-    ApplicationBuilder.App.change_dir_if_bundle()
-
     global progressbar = uiNewProgressBar()
     global spinbox = uiNewSpinbox(0, 100)
     global slider = uiNewSlider(0, 100)

examples/sdl.jl

@@ -6,11 +6,11 @@
 # test/build_examples/sdl.jl
 # https://github.com/NHDaly/ApplicationBuilder.jl/tree/master/test/build_examples/sdl.jl
 
-using ApplicationBuilder
-
 using SimpleDirectMediaLayer
 SDL2 = SimpleDirectMediaLayer
 
+using Compat.Pkg
+
 fontFile = joinpath(Pkg.dir("SimpleDirectMediaLayer"),
                         "assets","fonts","FiraCode","ttf","FiraCode-Regular.ttf")
 
@@ -80,7 +80,6 @@ function helloFromSDL()
 end
 
 Base.@ccallable function julia_main(args::Vector{String})::Cint
-    ApplicationBuilder.App.change_dir_if_bundle()
     helloFromSDL()
     return 0
 end