From f1b81976ecd5fca5201a463a973e755a45fb0578 Mon Sep 17 00:00:00 2001 From: K Pamnany Date: Fri, 28 Feb 2025 13:28:01 -0500 Subject: [PATCH 1/6] Use `JULIA_DEPOT_PATH` and `JULIA_LOAD_PATH` from the environment When these environment variables are set, use them. --- src/julia_init.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/julia_init.c b/src/julia_init.c index d598f90b..112c4f85 100644 --- a/src/julia_init.c +++ b/src/julia_init.c @@ -46,19 +46,39 @@ void set_depot_load_path(const char *root_dir) { #else char *julia_share_subdir = "/share/julia"; #endif - char *share_dir = - calloc(sizeof(char), strlen(root_dir) + strlen(julia_share_subdir) + 1); - strcat(share_dir, root_dir); - strcat(share_dir, julia_share_subdir); + int share_path_len = strlen(root_dir) + strlen(julia_share_subdir) + 1; + + char *curr_depot_path = getenv("JULIA_DEPOT_PATH"); + int curr_depot_path_len = curr_depot_path == NULL ? 0 : strlen(curr_depot_path); + int new_depot_path_len = curr_depot_path_len + 1 + share_path_len; + char *new_depot_path = calloc(sizeof (char), new_depot_path_len); + if (curr_depot_path_len > 0) { + strcat(new_depot_path, curr_depot_path); + strcat(new_depot_path, ":"); + } + strcat(new_depot_path, root_dir); + strcat(new_depot_path, julia_share_subdir); + + char *curr_load_path = getenv("JULIA_LOAD_PATH"); + int curr_load_path_len = curr_load_path == NULL ? 0 : strlen(curr_load_path); + int new_load_path_len = curr_load_path_len + 1 + share_path_len; + char *new_load_path = calloc(sizeof (char), new_load_path_len); + if (curr_load_path_len > 0) { + strcat(new_load_path, curr_load_path); + strcat(new_load_path, ":"); + } + strcat(new_load_path, root_dir); + strcat(new_load_path, julia_share_subdir); #ifdef _WIN32 - _putenv_s("JULIA_DEPOT_PATH", share_dir); - _putenv_s("JULIA_LOAD_PATH", share_dir); + _putenv_s("JULIA_DEPOT_PATH", new_depot_path); + _putenv_s("JULIA_LOAD_PATH", new_load_path); #else - setenv("JULIA_DEPOT_PATH", share_dir, 1); - setenv("JULIA_LOAD_PATH", share_dir, 1); + setenv("JULIA_DEPOT_PATH", new_depot_path, 1); + setenv("JULIA_LOAD_PATH", new_load_path, 1); #endif - free(share_dir); + free(new_load_path); + free(new_depot_path); } void init_julia(int argc, char **argv) { From a0f317e1d1f52cfe66f1910c4e5bc747a4358993 Mon Sep 17 00:00:00 2001 From: K Pamnany Date: Wed, 5 Mar 2025 11:56:11 -0500 Subject: [PATCH 2/6] Address review comment --- src/julia_init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/julia_init.c b/src/julia_init.c index 112c4f85..9bbb865a 100644 --- a/src/julia_init.c +++ b/src/julia_init.c @@ -42,8 +42,10 @@ const char *get_sysimage_path(const char *libname) { void set_depot_load_path(const char *root_dir) { #ifdef _WIN32 + char *path_sep = ";"; char *julia_share_subdir = "\\share\\julia"; #else + char *path_sep = ":"; char *julia_share_subdir = "/share/julia"; #endif int share_path_len = strlen(root_dir) + strlen(julia_share_subdir) + 1; @@ -54,7 +56,7 @@ void set_depot_load_path(const char *root_dir) { char *new_depot_path = calloc(sizeof (char), new_depot_path_len); if (curr_depot_path_len > 0) { strcat(new_depot_path, curr_depot_path); - strcat(new_depot_path, ":"); + strcat(new_depot_path, path_sep); } strcat(new_depot_path, root_dir); strcat(new_depot_path, julia_share_subdir); @@ -65,7 +67,7 @@ void set_depot_load_path(const char *root_dir) { char *new_load_path = calloc(sizeof (char), new_load_path_len); if (curr_load_path_len > 0) { strcat(new_load_path, curr_load_path); - strcat(new_load_path, ":"); + strcat(new_load_path, path_sep); } strcat(new_load_path, root_dir); strcat(new_load_path, julia_share_subdir); From db0989feeeb53f88e1633869a296352d28715301 Mon Sep 17 00:00:00 2001 From: K Pamnany Date: Mon, 16 Jun 2025 17:47:36 -0400 Subject: [PATCH 3/6] Add test --- test/runtests.jl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index 8db26274..ff4bd0fd 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -110,8 +110,12 @@ end rm(joinpath(new_depot, "compiled"); recursive=true, force=true) rm(joinpath(new_depot, "artifacts"); recursive=true, force=true) end # try + test_load_path = mktempdir() + test_depot_path = mktempdir() app_path(app_name) = abspath(app_compiled_dir, "bin", app_name * (Sys.iswindows() ? ".exe" : "")) - app_output = read(`$(app_path("MyApp")) I get --args áéíóú --julia-args --threads=3 --check-bounds=yes -O1`, String) + app_output = withenv("JULIA_DEPOT_PATH" => test_depot_path, "JULIA_LOAD_PATH" => test_load_path) do + read(`$(app_path("MyApp")) I get --args áéíóú --julia-args --threads=3 --check-bounds=yes -O1`, String) + end # Check stdlib filtering if filter == true @@ -140,6 +144,9 @@ end # Check app is precompiled in a normal process @test occursin("outputo: ok", app_output) @test occursin("myrand: ok", app_output) + # Check env-provided depot and load paths are accepted + @test occursin("DEPOT_PATH: [\"$test_depot_path", app_output) + @test occursin("LOAD_PATH: [\"$test_load_path", app_output) # Check distributed @test occursin("n = 20000000", app_output) @test occursin("From worker 2:\t8", app_output) From 90142df613fb89a49c3c3cae9c8f53aaedfc4f7b Mon Sep 17 00:00:00 2001 From: K Pamnany Date: Tue, 7 Oct 2025 12:35:11 -0400 Subject: [PATCH 4/6] Fix the embedding wrapper as well --- src/embedding_wrapper.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/src/embedding_wrapper.c b/src/embedding_wrapper.c index e74dbe2f..2394d49d 100644 --- a/src/embedding_wrapper.c +++ b/src/embedding_wrapper.c @@ -37,22 +37,45 @@ jl_value_t *checked_eval_string(const char *code) { void set_depot_load_path(const char *root_dir) { #ifdef _WIN32 + char *path_sep = ";"; char *julia_share_subdir = "\\share\\julia"; #else + char *path_sep = ":"; char *julia_share_subdir = "/share/julia"; #endif - char *share_dir = - calloc(sizeof(char), strlen(root_dir) + strlen(julia_share_subdir) + 1); - strcat(share_dir, root_dir); - strcat(share_dir, julia_share_subdir); + int share_path_len = strlen(root_dir) + strlen(julia_share_subdir) + 1; + + char *curr_depot_path = getenv("JULIA_DEPOT_PATH"); + int curr_depot_path_len = curr_depot_path == NULL ? 0 : strlen(curr_depot_path); + int new_depot_path_len = curr_depot_path_len + 1 + share_path_len; + char *new_depot_path = calloc(sizeof (char), new_depot_path_len); + if (curr_depot_path_len > 0) { + strcat(new_depot_path, curr_depot_path); + strcat(new_depot_path, path_sep); + } + strcat(new_depot_path, root_dir); + strcat(new_depot_path, julia_share_subdir); + + char *curr_load_path = getenv("JULIA_LOAD_PATH"); + int curr_load_path_len = curr_load_path == NULL ? 0 : strlen(curr_load_path); + int new_load_path_len = curr_load_path_len + 1 + share_path_len; + char *new_load_path = calloc(sizeof (char), new_load_path_len); + if (curr_load_path_len > 0) { + strcat(new_load_path, curr_load_path); + strcat(new_load_path, path_sep); + } + strcat(new_load_path, root_dir); + strcat(new_load_path, julia_share_subdir); #ifdef _WIN32 - _putenv_s("JULIA_DEPOT_PATH", share_dir); - _putenv_s("JULIA_LOAD_PATH", share_dir); + _putenv_s("JULIA_DEPOT_PATH", new_depot_path); + _putenv_s("JULIA_LOAD_PATH", new_load_path); #else - setenv("JULIA_DEPOT_PATH", share_dir, 1); - setenv("JULIA_LOAD_PATH", share_dir, 1); + setenv("JULIA_DEPOT_PATH", new_depot_path, 1); + setenv("JULIA_LOAD_PATH", new_load_path, 1); #endif + free(new_load_path); + free(new_depot_path); } // main function (windows UTF16 -> UTF8 argument conversion code copied from From ba56f81a55e0fc1a115710f408270b34de144255 Mon Sep 17 00:00:00 2001 From: K Pamnany Date: Tue, 7 Oct 2025 14:06:11 -0400 Subject: [PATCH 5/6] Fix `occursin` search --- test/runtests.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index ff4bd0fd..d80ac19e 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -145,8 +145,8 @@ end @test occursin("outputo: ok", app_output) @test occursin("myrand: ok", app_output) # Check env-provided depot and load paths are accepted - @test occursin("DEPOT_PATH: [\"$test_depot_path", app_output) - @test occursin("LOAD_PATH: [\"$test_load_path", app_output) + @test occursin("DEPOT_PATH = [\"$test_depot_path", app_output) + @test occursin("LOAD_PATH = [\"$test_load_path", app_output) # Check distributed @test occursin("n = 20000000", app_output) @test occursin("From worker 2:\t8", app_output) From 4d34b765f586335d0f16b4aa37713ef92af3abd2 Mon Sep 17 00:00:00 2001 From: K Pamnany Date: Wed, 8 Oct 2025 16:04:26 -0400 Subject: [PATCH 6/6] Fix Windows test --- test/runtests.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index d80ac19e..8473c2e7 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -145,8 +145,8 @@ end @test occursin("outputo: ok", app_output) @test occursin("myrand: ok", app_output) # Check env-provided depot and load paths are accepted - @test occursin("DEPOT_PATH = [\"$test_depot_path", app_output) - @test occursin("LOAD_PATH = [\"$test_load_path", app_output) + @test occursin("DEPOT_PATH = [\"$(escape_string(test_depot_path))", app_output) + @test occursin("LOAD_PATH = [\"$(escape_string(test_load_path))", app_output) # Check distributed @test occursin("n = 20000000", app_output) @test occursin("From worker 2:\t8", app_output)