refactor

Author: SimonDanisch

examples/program.c

@@ -13,23 +13,51 @@ JULIA_DEFINE_FAST_TLS()
 #endif
 
 // Declare C prototype of a function defined in Julia
-extern void julia_main();
+extern int julia_main(jl_array_t*);
 
+// main function (windows UTF16 -> UTF8 argument conversion code copied from julia's ui/repl.c)
+#ifndef _OS_WINDOWS_
 int main(int argc, char *argv[])
 {
-    intptr_t v;
-
-    // Initialize Julia
+    int retcode;
+    int i;
     uv_setup_args(argc, argv); // no-op on Windows
+#else
+int wmain(int argc, wchar_t *wargv[], wchar_t *envp[])
+{
+    int retcode;
+    int i;
+    char **argv;
+    for (i = 0; i < argc; i++) { // convert the command line to UTF8
+        wchar_t *warg = argv[i];
+        size_t len = WideCharToMultiByte(CP_UTF8, 0, warg, -1, NULL, 0, NULL, NULL);
+        if (!len) return 1;
+        char *arg = (char*)alloca(len);
+        if (!WideCharToMultiByte(CP_UTF8, 0, warg, -1, arg, len, NULL, NULL)) return 1;
+        argv[i] = arg;
+    }
+#endif
+
+    // initialization
     libsupport_init();
+    // jl_options.compile_enabled = JL_OPTIONS_COMPILE_OFF;
     // JULIAC_PROGRAM_LIBNAME defined on command-line for compilation
     jl_options.image_file = JULIAC_PROGRAM_LIBNAME;
     julia_init(JL_IMAGE_JULIA_HOME);
 
-    // Do some work
-    julia_main();
-
-    // Cleanup and graceful exit
-    jl_atexit_hook(0);
-    return 0;
+    // build arguments array: `String[ unsafe_string(argv[i]) for i in 1:argc ]`
+    jl_array_t *ARGS = jl_alloc_array_1d(jl_apply_array_type(jl_string_type, 1), 0);
+    JL_GC_PUSH1(&ARGS);
+    jl_array_grow_end(ARGS, argc - 1);
+    for (i = 1; i < argc; i++) {
+        jl_value_t *s = (jl_value_t*)jl_cstr_to_string(argv[i]);
+        jl_arrayset(ARGS, s, i - 1);
+    }
+    // call the work function, and get back a value
+    retcode = julia_main(ARGS);
+    JL_GC_POP();
+
+    // Cleanup and gracefully exit
+    jl_atexit_hook(retcode);
+    return retcode;
 }

examples/program2.c

@@ -14,13 +14,12 @@ else
 end
 
 using SnoopCompile
-using ArgParse
-julia_v07 &&
-is_windows() && using WinRPM
 
+iswindows() && using WinRPM
 
-include("juliac.jl")
-include("build_sysimg.jl")
+
+include("static_julia.jl")
+include("api.jl")
 include("snooping.jl")
 
 const sysimage_binaries = (
@@ -62,7 +61,7 @@ Can also be used to build a native system image for a downloaded cross compiled
 """
 function build_clean_image(debug = false)
     backup = sysimgbackup_folder()
-    build_sysimg(backup, "native")
+    build_sysimg(backup, joinpath(@__DIR__, "empty_userimg.jl"))
     copy_system_image(backup, default_sysimg_path(debug))
 end
 
@@ -145,7 +144,7 @@ function compile_package(packages::Tuple{String, String}...; force = false, reus
     end
     !isfile(userimg) && reuse && error("Nothing to reuse. Please run `compile_package(reuse = true)`")
     image_path = sysimg_folder()
-    build_sysimg(image_path, "native", userimg)
+    build_sysimg(image_path, userimg)
     imgfile = joinpath(image_path, "sys.$(Libdl.dlext)")
     if force
         try
@@ -178,7 +177,6 @@ function compile_package(packages::Tuple{String, String}...; force = false, reus
 end
 
 
-
 export compile_package, revert, build_clean_image
 
 

juliastatic.jl

@@ -0,0 +1,54 @@
+
+"""
+    build_sysimg(sysimg_path=default_sysimg_path(), cpu_target="native", userimg_path=nothing; force=false)
+
+Rebuild the system image. Store it in `sysimg_path`, which defaults to a file named `sys.ji`
+that sits in the same folder as `libjulia.{so,dylib}`, except on Windows where it defaults
+to `JULIA_HOME/../lib/julia/sys.ji`.  Use the cpu instruction set given by `cpu_target`.
+Valid CPU targets are the same as for the `-C` option to `julia`, or the `-march` option to
+`gcc`.  Defaults to `native`, which means to use all CPU instructions available on the
+current processor. Include the user image file given by `userimg_path`, which should contain
+directives such as `using MyPackage` to include that package in the new system image. New
+system image will not replace an older image unless `force` is set to true.
+"""
+function build_sysimg(sysimg_path, userimg_path = nothing;
+        verbose = false, quiet = false,
+        cpu_target = nothing, optimize = nothing,
+        debug = nothing, inline = nothing, check_bounds = nothing,
+        math_mode = nothing
+    )
+    julia_compile(
+        userimg_path, julia_program_basename = "sys",
+
+        cpu_target = cpu_target, optimize = optimize,
+        debug = debug, inline = inline, check_bounds = check_bounds,
+        math_mode = math_mode, verbose = verbose, quiet = quiet,
+
+        cprog = nothing, builddir = sysimg_path,
+        clean = false, sysimage = nothing,
+        compile = nothing, depwarn = nothing, autodeps = false,
+        object = true, shared = true, executable = false, julialibs = false,
+    )
+end
+
+
+function build_shared_lib(
+        library, library_name;
+        verbose = false, quiet = false,
+        cpu_target = "native", optimize = nothing, debug = nothing,
+        inline = nothing, check_bounds = nothing, math_mode = nothing
+    )
+    julia_compile(
+
+        library, julia_program_basename = library_name,
+
+        cpu_target = cpu_target, optimize = optimize,
+        debug = debug, inline = inline, check_bounds = check_bounds,
+        math_mode = math_mode, verbose = verbose, quiet = quiet,
+
+        cprog = nothing, builddir = sysimg_path,
+        clean = false, sysimage = nothing,
+        compile = nothing, depwarn = nothing, autodeps = false,
+        object = true, shared = true, executable = false, julialibs = true,
+    )
+end