Skip to content

Commit

Permalink
Don't create gap.sh, remove gap_exe()
Browse files Browse the repository at this point in the history
  • Loading branch information
fingolfin committed Oct 1, 2021
1 parent 7ce2605 commit a84b0c3
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 25 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
run: julia --color=yes -e 'using Pkg ; Pkg.add(["Singular", "Nemo"])'
- name: "GAP tests"
run: |
gap_sh=$(julia --project=. -e 'import GAP; print(GAP.gap_exe())');
export GAP="$gap_sh -A --quitonbreak --norepl"
julia --project=. -e 'import GAP; GAP.create_gap_sh("/tmp")'
export GAP="/tmp/gap.sh -A --quitonbreak --norepl"
etc/ci_test.sh
- name: "Process Julia code coverage"
Expand All @@ -73,8 +73,7 @@ jobs:
using GAP
GAP.Packages.install("profiling", interactive = false) || exit(1)
'
gap_sh=$(julia --project=. -e 'import GAP; print(GAP.gap_exe())');
$gap_sh -A --quitonbreak --norepl etc/gather_coverage.g
/tmp/gap.sh -A --quitonbreak --norepl etc/gather_coverage.g
cat gap-lcov.info >> lcov.info
- name: "Upload coverage data to Codecov"
Expand Down Expand Up @@ -111,9 +110,9 @@ jobs:
julia --project=docs --color=yes test/doctest.jl
- name: "Build GAP manual"
run: |
gap_sh=$(julia --project=. -e 'import GAP; print(GAP.gap_exe())');
julia --project=. -e 'import GAP; GAP.create_gap_sh("/tmp")'
cd pkg/JuliaInterface
$gap_sh -A --quitonbreak --norepl makedoc.g
/tmp/gap.sh -A --quitonbreak --norepl makedoc.g
cd ../..
mkdir -p docs/src/assets/html/JuliaInterface/
cp pkg/JuliaInterface/doc/*.{html,css,js} docs/src/assets/html/JuliaInterface/
Expand Down
6 changes: 4 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
This is the first release of the 0.7.x series. It contains the following breaking
changes compared to the 0.6.x release:

- `LoadPackageAndExposeGlobals` was removed. If you are using this, see
- Remove `LoadPackageAndExposeGlobals`. If you are using this, see
<https://github.com/oscar-system/GAP.jl/pull/696> for alternatives.
- Remove all `convert` methods. If you were using `convert(GapObj, val)`,
you can use `GapObj(val)` or `julia_to_gap(val)` instead. If you were
using `convert(T,gapobj)`, use `T(gapobj)` or `julia_to_gap(gapobj)`
instead.
- Remove `IsArgumentForJuliaFunction` from the GAP side.
- Remove `IsArgumentForJuliaFunction` from the GAP side. There was no
actual use case, so hopefully nobody was using it
- Remove `GAP.gap_exe()`. Instead please use `GAP.create_gap_sh(path)`.

Other changes:

Expand Down
11 changes: 5 additions & 6 deletions pkg/JuliaInterface/gap/JuliaInterface.gd
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,11 @@
#! afterwards the package <Package>JuliaInterface</Package> is already
#! installed and loaded.
#!
#! Alternatively, one can start &GAP; in the traditional way,
#! by executing a shell script.
#! Such a script is generated automatically during the installation of
#! &GAP; via &Julia;,
#! its location is returned in a &Julia; session by
#! <Listing Type="Julia">using GAP; GAP.gap_exe()</Listing>
#! Alternatively, one can start &GAP; in the traditional way, by executing
#! a shell script. Such a script can be created in a location of your choice
#! via the following &Julia; command, where <F>dstdir</F> is a directory
#! path in which a <F>gap.sh</F> script plus some auxiliary files will be placed:
#! <Listing Type="Julia">using GAP; GAP.create_gap_sh(dstdir)</Listing>
#!
#! Note that the <Package>JuliaInterface</Package> code belongs to
#! <URL><Link>https://github.com/oscar-system/GAP.jl</Link>
Expand Down
6 changes: 0 additions & 6 deletions src/prompt.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
function gap_exe()
return joinpath(GAPROOT, "bin", "gap.sh")
end

export gap_exe

"""
prompt()
Expand Down
5 changes: 0 additions & 5 deletions src/setup.jl
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,6 @@ function regenerate_gaproot(gaproot_mutable)
run(pipeline(`make V=1 -j$(Sys.CPU_THREADS)`, stdout="build.log", append=true))
end

##
## Create custom gap.sh
##
create_gap_sh(joinpath(gaproot_mutable, "bin"))

return gaproot_mutable
end # function

Expand Down

0 comments on commit a84b0c3

Please sign in to comment.