Skip to content
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

Jump to bottom

setup_override_dir.jl: allow passing args to configure #1060

Merged
merged 1 commit into from
Oct 28, 2024
Merged

setup_override_dir.jl: allow passing args to configure #1060

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
4 changes: 2 additions & 2 deletions .github/workflows/gap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ jobs:
mv GAPROOT /tmp/GAPROOT
cd /tmp/GAPROOT
./autogen.sh
./configure
./configure --enable-Werror
make -j`nproc`
- name: "Override bundled GAP"
run: |
julia --proj=override etc/setup_override_dir.jl /tmp/GAPROOT /tmp/gap_jll_override
julia --proj=override etc/setup_override_dir.jl /tmp/GAPROOT /tmp/gap_jll_override --enable-Werror
- name: "Run tests"
run: |
julia --proj=override etc/run_with_override.jl /tmp/gap_jll_override --depwarn=error -e "using Pkg; Pkg.test(\"GAP\")"
Expand Down
8 changes: 7 additions & 1 deletion etc/setup_override_dir.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ length(ARGS) >= 1 || error("must provide path of GAP source directory as first a
length(ARGS) >= 2 || error("must provide path of destination directory as second argument")
gap_prefix = popfirst!(ARGS)
prefix = popfirst!(ARGS)
debugmode = length(ARGS) > 0 && ARGS[1] == "--debug"
if length(ARGS) > 0 && ARGS[1] == "--debug"
debugmode = true
popfirst!(ARGS)
else
debugmode = false
end

# TODO: should the user be allowed to provide a tmp_gap_build_dir ? that might
# be handy for incremental updates
Expand Down Expand Up @@ -94,6 +99,7 @@ push!(extraargs, "CPPFLAGS=-DUSE_GAP_INSIDE_JULIA=1")
--with-gc=julia
--with-julia=$(juliabin)
$(extraargs)
$(ARGS)
`)

@info "Building GAP in $(tmp_gap_build_dir)"
Expand Down
Loading