Skip to content

Define new at-generate_jll_init macro to replace hardcoded __init__ #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Define new at-generate_jll_init macro to replace hardcoded __init__ #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/wrapper_generators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ macro generate_init_footer()
end)
end

macro generate_jll_init(expr::Expr)
return quote
function $(esc(Symbol("__init__")))()
$(esc(expr))
end # __init__()
end
end

"""
emit_preference_path_load(pref_name, default_value)
Expand Down
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/aarch64-linux-gnu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/aarch64-linux-musl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/armv7l-linux-gnueabihf.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/armv7l-linux-musleabihf.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/i686-linux-gnu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/i686-linux-musl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/i686-w64-mingw32.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/powerpc64le-linux-gnu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/x86_64-apple-darwin14.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/x86_64-linux-gnu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/x86_64-linux-musl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/HelloWorldC_jll/src/wrappers/x86_64-w64-mingw32.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export hello_world, goodbye_world
JLLWrappers.@generate_wrapper_header("HelloWorldC")
JLLWrappers.@declare_executable_product(hello_world)
JLLWrappers.@declare_executable_product(goodbye_world)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header()
JLLWrappers.@init_executable_product(
hello_world,
Expand All @@ -16,4 +16,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/aarch64-linux-gnu-libgfortran4-cxx03-mpi+mpich.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPICH_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPICH_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/aarch64-linux-gnu-libgfortran4-cxx03-mpi+mpitrampoline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPItrampoline_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPItrampoline_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/aarch64-linux-gnu-libgfortran4-cxx11-mpi+mpich.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPICH_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPICH_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/aarch64-linux-gnu-libgfortran4-cxx11-mpi+mpitrampoline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPItrampoline_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPItrampoline_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/aarch64-linux-gnu-libgfortran5-cxx03-mpi+mpich.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPICH_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPICH_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/aarch64-linux-gnu-libgfortran5-cxx03-mpi+mpitrampoline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPItrampoline_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPItrampoline_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/aarch64-linux-gnu-libgfortran5-cxx11-mpi+mpich.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPICH_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPICH_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/aarch64-linux-gnu-libgfortran5-cxx11-mpi+mpitrampoline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPItrampoline_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPItrampoline_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/armv7l-linux-gnueabihf-libgfortran4-cxx03-mpi+mpich.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPICH_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPICH_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/armv7l-linux-gnueabihf-libgfortran4-cxx03-mpi+mpitrampoline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPItrampoline_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPItrampoline_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/armv7l-linux-gnueabihf-libgfortran4-cxx11-mpi+mpich.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPICH_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPICH_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/armv7l-linux-gnueabihf-libgfortran4-cxx11-mpi+mpitrampoline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPItrampoline_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPItrampoline_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
4 changes: 2 additions & 2 deletions test/LAMMPS_jll/src/wrappers/armv7l-linux-gnueabihf-libgfortran5-cxx03-mpi+mpich.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using MPICH_jll
JLLWrappers.@generate_wrapper_header("LAMMPS")
JLLWrappers.@declare_library_product(liblammps, "liblammps.so.0")
JLLWrappers.@declare_executable_product(lmp)
function __init__()
JLLWrappers.@generate_jll_init begin
JLLWrappers.@generate_init_header(CompilerSupportLibraries_jll, Preferences, MPICH_jll)
JLLWrappers.@init_library_product(
liblammps,
Expand All @@ -21,4 +21,4 @@ function __init__()
)

JLLWrappers.@generate_init_footer()
end # __init__()
end
Loading