Use relocatable folders for the scripts (#56)

Author: gbaraldi

Project.toml

@@ -11,6 +11,7 @@ ObjectFile = "d8793406-e978-5875-9003-1fc021f44a92"
 PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
 Patchelf_jll = "f2cf89d6-2bfd-5c44-bd2c-068eea195c0c"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
 StructIO = "53d494c1-5632-5724-8f4c-31dff12d585f"
 
 [compat]
@@ -21,6 +22,7 @@ ObjectFile = "0.5"
 PackageCompiler = "2"
 Patchelf_jll = "0.18"
 Pkg = "1"
+RelocatableFolders = "1"
 StructIO = "0.3"
 julia = "1.10"
 

src/JuliaC.jl

@@ -1,11 +1,14 @@
 module JuliaC
 
-@static if VERSION >= v"1.12.0-rc1"
 using Pkg
 using PackageCompiler
 using LazyArtifacts
+using RelocatableFolders
+
+@static if VERSION >= v"1.12.0-rc1"
 
 include("JuliaConfig.jl")
+const SCRIPTS_DIR = @path joinpath(@__DIR__, "scripts")
 
 Base.@kwdef mutable struct ImageRecipe
     # codegen options

src/compiling.jl

@@ -100,7 +100,7 @@ function compile_products(recipe::ImageRecipe)
     for a in recipe.julia_args
         cmd = `$cmd $a`
     end
-    cmd = `$cmd $(joinpath(@__DIR__, "scripts", "juliac-buildscript.jl")) --source $(abspath(recipe.file)) $(recipe.output_type)`
+    cmd = `$cmd $(joinpath(JuliaC.SCRIPTS_DIR, "juliac-buildscript.jl")) --scripts-dir $(JuliaC.SCRIPTS_DIR) --source $(abspath(recipe.file)) $(recipe.output_type)`
     if recipe.add_ccallables
         cmd = `$cmd --compile-ccallable`
     end

src/scripts/juliac-buildscript.jl

@@ -27,11 +27,13 @@ end
 #   --output-<type>              : One of: exe | lib | sysimage | o | bc. Controls entrypoint setup.
 #   --compile-ccallable          : Export ccallable entrypoints (for shared libraries).
 #   --use-loaded-libs            : Enable Libdl.dlopen override to reuse existing loads.
-source_path, output_type, add_ccallables, use_loaded_libs = let
+#   --scripts-dir <path>         : Directory containing build helper scripts.
+source_path, output_type, add_ccallables, use_loaded_libs, scripts_dir = let
     source_path = ""
     output_type = ""
     add_ccallables = false
     use_loaded_libs = false
+    scripts_dir = abspath(dirname(PROGRAM_FILE))
     it = Iterators.Stateful(ARGS)
     for arg in it
         if startswith(arg, "--source=")
@@ -40,6 +42,12 @@ source_path, output_type, add_ccallables, use_loaded_libs = let
             nextarg = popfirst!(it)
             nextarg === nothing && error("Missing value for --source")
             source_path = nextarg
+        elseif startswith(arg, "--scripts-dir=")
+            scripts_dir = split(arg, "=", limit=2)[2]
+        elseif arg == "--scripts-dir"
+            nextarg = popfirst!(it)
+            nextarg === nothing && error("Missing value for --scripts-dir")
+            scripts_dir = nextarg
         elseif arg == "--output-exe" || arg == "--output-lib" || arg == "--output-sysimage" || arg == "--output-o" || arg == "--output-bc"
             output_type = arg
         elseif arg == "--compile-ccallable" || arg == "--add-ccallables"
@@ -49,7 +57,7 @@ source_path, output_type, add_ccallables, use_loaded_libs = let
         end
     end
     source_path == "" && error("Missing required --source <path>")
-    (source_path, output_type, add_ccallables, use_loaded_libs)
+    (source_path, output_type, add_ccallables, use_loaded_libs, scripts_dir)
 end
 
 # Load user code
@@ -135,13 +143,13 @@ end
 Core.Compiler._verify_trim_world_age[] = Base.get_world_counter()
 
 if Base.JLOptions().trim != 0
-    include(joinpath(@__DIR__, "juliac-trim-base.jl"))
-    include(joinpath(@__DIR__, "juliac-trim-stdlib.jl"))
+    include(joinpath(scripts_dir, "juliac-trim-base.jl"))
+    include(joinpath(scripts_dir, "juliac-trim-stdlib.jl"))
 end
 
 # Optionally install Libdl overrides to reuse existing loaded libs on absolute dlopen
 if use_loaded_libs
-    include(joinpath(@__DIR__, "juliac-libdl-overrides.jl"))
+    include(joinpath(scripts_dir, "juliac-libdl-overrides.jl"))
 end
 
 empty!(Core.ARGS)