Merge pull request #53 from lucatrv/add-sysimage-flag

Add "--sysimage" flag

Author: ViralBShah

README.md

@@ -3,15 +3,16 @@
 Helper script to build libraries and executables from Julia code.
 
 ```
-usage: juliac.jl [-v] [-q] [-c] [-C <target>] [-O {0,1,2,3}]
-                 [-g {0,1,2}] [--inline {yes|no}]
+usage: juliac.jl [-v] [-q] [-c] [-J <file>] [-C <target>]
+                 [-O {0,1,2,3}] [-g {0,1,2}] [--inline {yes|no}]
                  [--check-bounds {yes|no}] [--math-mode {ieee,fast}]
                  [--depwarn {yes|no|error}] [-o] [-s] [-e] [-j]
                  [--version] [-h] juliaprog [cprog] [builddir]
 
 positional arguments:
   juliaprog             Julia program to compile
-  cprog                 C program to compile (if not provided, a
+  cprog                 C program to compile (required only when
+                        building an executable; if not provided a
                         minimal standard program is used)
   builddir              build directory, either absolute or relative
                         to the Julia program directory (default:
@@ -21,6 +22,8 @@ optional arguments:
   -v, --verbose         increase verbosity
   -q, --quiet           suppress non-error messages
   -c, --clean           delete builddir
+  -J, --sysimage <file>
+                        start up with the given system image file
   -C, --cpu-target <target>
                         limit usage of CPU features up to <target>
   -O, --optimize {0,1,2,3}

juliac.jl

@@ -19,7 +19,7 @@ function main(args)
         "cprog"
             arg_type = String
             default = nothing
-            help = "C program to compile (if not provided, a minimal standard program is used)"
+            help = "C program to compile (required only when building an executable; if not provided a minimal standard program is used)"
         "builddir"
             arg_type = String
             default = "builddir"
@@ -33,6 +33,11 @@ function main(args)
         "--clean", "-c"
             action = :store_true
             help = "delete builddir"
+        "--sysimage", "-J"
+            arg_type = String
+            default = nothing
+            metavar = "<file>"
+            help = "start up with the given system image file"
         "--cpu-target", "-C"
             arg_type = String
             default = nothing
@@ -111,6 +116,7 @@ function main(args)
         parsed_args["verbose"],
         parsed_args["quiet"],
         parsed_args["clean"],
+        parsed_args["sysimage"],
         parsed_args["cpu-target"],
         parsed_args["optimize"],
         parsed_args["debug"],
@@ -125,8 +131,9 @@ function main(args)
     )
 end
 
-function julia_compile(julia_program, c_program=nothing, build_dir="builddir", verbose=false, quiet=false, clean=false,
-                       cpu_target=nothing, optimize=nothing, debug=nothing, inline=nothing, check_bounds=nothing, math_mode=nothing, depwarn=nothing,
+function julia_compile(julia_program, c_program=nothing, build_dir="builddir", verbose=false, quiet=false,
+                       clean=false, sysimage = nothing, cpu_target=nothing, optimize=nothing, debug=nothing,
+                       inline=nothing, check_bounds=nothing, math_mode=nothing, depwarn=nothing,
                        object=false, shared=false, executable=true, julialibs=true)
 
     verbose && quiet && (verbose = false)
@@ -135,9 +142,11 @@ function julia_compile(julia_program, c_program=nothing, build_dir="builddir", v
     isfile(julia_program) || error("Cannot find file:\n  \"$julia_program\"")
     quiet || println("Julia program file:\n  \"$julia_program\"")
 
-    c_program = c_program == nothing ? joinpath(@__DIR__, "program.c") : abspath(c_program)
-    isfile(c_program) || error("Cannot find file:\n  \"$c_program\"")
-    quiet || println("C program file:\n  \"$c_program\"")
+    if executable
+        c_program = c_program == nothing ? joinpath(@__DIR__, "program.c") : abspath(c_program)
+        isfile(c_program) || error("Cannot find file:\n  \"$c_program\"")
+        quiet || println("C program file:\n  \"$c_program\"")
+    end
 
     cd(dirname(julia_program))
 
@@ -176,14 +185,19 @@ function julia_compile(julia_program, c_program=nothing, build_dir="builddir", v
 
     delete_object = false
     if object || shared || executable
-        julia_cmd = `$(Base.julia_cmd()) --startup-file=no`
-        cpu_target == nothing || splice!(julia_cmd.exec, 2, ["-C$cpu_target"])
+        julia_cmd = `$(Base.julia_cmd())`
+        if length(julia_cmd.exec) != 5 || !all(startswith.(julia_cmd.exec[2:5], ["-C", "-J", "--compile", "--depwarn"]))
+            error("Unexpected format of \"Base.julia_cmd()\", you may be using an incompatible version of Julia")
+        end
+        sysimage == nothing || (julia_cmd.exec[3] = "-J$sysimage")
+        push!(julia_cmd.exec, "--startup-file=no")
+        cpu_target == nothing || (julia_cmd.exec[2] = "-C$cpu_target")
         optimize == nothing || push!(julia_cmd.exec, "-O$optimize")
         debug == nothing || push!(julia_cmd.exec, "-g$debug")
         inline == nothing || push!(julia_cmd.exec, "--inline=$inline")
         check_bounds == nothing || push!(julia_cmd.exec, "--check-bounds=$check_bounds")
         math_mode == nothing || push!(julia_cmd.exec, "--math-mode=$math_mode")
-        depwarn == nothing || splice!(julia_cmd.exec, 5, ["--depwarn=$depwarn"])
+        depwarn == nothing || (julia_cmd.exec[5] = "--depwarn=$depwarn")
         is_windows() && (julia_program = replace(julia_program, "\\", "\\\\"))
         expr = "
   VERSION >= v\"0.7+\" && Base.init_load_path($(repr(JULIA_HOME))) # initialize location of site-packages
@@ -192,7 +206,7 @@ function julia_compile(julia_program, c_program=nothing, build_dir="builddir", v
   include($(repr(julia_program))) # include \"julia_program\" file
   empty!(Base.LOAD_CACHE_PATH) # reset / remove build-system-relative paths"
         command = `$julia_cmd -e $expr`
-        verbose && println("Populate \".ji\" local cache:\n  $command")
+        verbose && println("Build \".ji\" files local cache:\n  $command")
         run(command)
         command = `$julia_cmd --output-o $o_file -e $expr`
         verbose && println("Build object file \"$o_file\":\n  $command")