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

Switch to GAP 4.11.0 point release #364

Merged
merged 1 commit into from
Mar 6, 2020
Merged

Switch to GAP 4.11.0 point release #364

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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
# test with external GAP
- julia: 1.1
os: linux
env: GAPROOT=$TRAVIS_BUILD_DIR/gap
env: GAPROOT=$TRAVIS_BUILD_DIR/gap-4.11.0

- stage: "Documentation"
julia: 1.1
Expand Down
28 changes: 11 additions & 17 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@

import Pkg

gap_version = v"4.11.0"

extra_gap_root = abspath(joinpath(@__DIR__, ".."))
gap_root = abspath(joinpath(extra_gap_root, "gap"))
gap_root = abspath(joinpath(extra_gap_root, "gap-$(gap_version)"))
install_gap = true

if haskey(ENV, "GAPROOT")
Expand All @@ -22,45 +24,37 @@ julia_binary = get(ENV, "JULIA_BINARY", Sys.BINDIR)
## Install GAP
if install_gap
println("Installing GAP ...")
gap_branch = "stable-4.11"
cd(extra_gap_root)
run(`rm -rf gap`)
run(`git clone --depth=1 -b $(gap_branch) https://github.com/gap-system/gap`)
cd("gap")
run(`./autogen.sh`)
run(`rm -rf gap-$(gap_version)`)
filename = download("https://www.gap-system.org/pub/gap/gap-4.$(gap_version.minor)/tar.bz2/gap-$(gap_version).tar.bz2")
run(`tar xjf $(filename)`)
cd("gap-$(gap_version)")
run(`./configure --with-gc=julia --with-julia=$(julia_binary)`)
run(`make -j$(Sys.CPU_THREADS)`)

gap_install_packages = get(ENV, "GAP_INSTALL_PACKAGES", "yes")
if gap_install_packages == "yes"
run(`make bootstrap-pkg-full`)
cd("pkg")
# eliminate a few big packages that take long to compile
pkgs = Base.Filesystem.readdir()
pkgs = Base.filter(x -> occursin(r"^(Normaliz|semigroups|simpcomp)", x), pkgs)
run(`rm -rf $pkgs`)
run(`../bin/BuildPackages.sh`)
elseif gap_install_packages == "minimal"
run(`make bootstrap-pkg-minimal`)
elseif gap_install_packages == "debug"
run(`make bootstrap-pkg-minimal`)
cd("pkg")
run(`git clone https://github.com/gap-packages/io`)
run(`git clone https://github.com/gap-packages/profiling`)
run(`git clone https://github.com/gap-packages/AutoDoc`)
run(`../bin/BuildPackages.sh io profiling`)
pkgs = Base.Filesystem.readdir()
pkgs = Base.filter(x -> occursin(r"^(io|profiling)", x), pkgs)
run(`../bin/BuildPackages.sh $pkgs`)
end
end

gap_executable = abspath(joinpath(gap_root, "gap"))

##
## Compile JuliaInterface/Experimental
##
println("Compiling JuliaInterface and JuliaExperimental ...")
cd(abspath(joinpath(@__DIR__, "..", "pkg", "GAPJulia" )))
run(`./configure $gap_root`)
run(`make`)
run(`make -j$(Sys.CPU_THREADS)`)

##
## Write deps.jl file containing the necessary paths
Expand Down
17 changes: 7 additions & 10 deletions etc/travis_install_gap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@
set -e

# Download and install GAP
git clone --depth=1 -b stable-4.11 https://github.com/gap-system/gap
cd gap
./autogen.sh
GAP_VERSION_SERIES=4.11
GAP_VERSION=4.11.0
wget https://www.gap-system.org/pub/gap/gap-${GAP_VERSION_SERIES}/tar.bz2/gap-${GAP_VERSION}.tar.bz2
tar xf gap-${GAP_VERSION}.tar.bz2
cd gap-${GAP_VERSION}
./configure --with-gc=julia --with-julia
make -j4
make bootstrap-pkg-minimal

# build a few packages
cd pkg

git clone https://github.com/gap-packages/io
git clone https://github.com/gap-packages/profiling
git clone https://github.com/gap-packages/AutoDoc

$GAPROOT/bin/BuildPackages.sh --with-gaproot=$GAPROOT io profiling
$GAPROOT/bin/BuildPackages.sh --with-gaproot=$GAPROOT io* profiling*