Skip to content

Commit 615be60

Browse files
fixed UseExternalSingular( true )
1 parent e28ad7e commit 615be60

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "HomalgProject"
22
uuid = "50bd374c-87b5-11e9-015a-2febe71398bd"
33
authors = ["Mohamed Barakat <[email protected]>"]
4-
version = "0.3.2"
4+
version = "0.3.3"
55

66
[deps]
77
GAP = "c863536a-3901-11e9-33e7-d5cd0df7b904"

src/HomalgProject.jl

+6-5
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,24 @@ function UseExternalSingular( bool::Bool )
108108
GAP.Globals.HOMALG_IO_Singular.LaunchCAS = GAP.Globals.LaunchCAS_JSingularInterpreterForHomalg_preload
109109
return true
110110
end
111-
111+
112112
## add ~/.julia/.../Singular/deps/usr/bin/ to GAPInfo.DirectoriesSystemPrograms
113-
singular = PATH_TO_SINGULAR
114-
lib = joinpath(singular,"deps","usr","lib")
115-
singular = GAP.julia_to_gap(joinpath(singular,"deps","usr","bin"))
113+
singular = GAP.julia_to_gap(joinpath(PATH_TO_SINGULAR,"deps","usr","bin"))
116114
paths = GAP.Globals.Concatenation( GAP.julia_to_gap( [ singular ] ), GAP.Globals.GAPInfo.DirectoriesSystemPrograms )
115+
paths = GAP.Globals.Unique( paths )
117116
GAP.Globals.GAPInfo.DirectoriesSystemPrograms = paths
117+
GAP.Globals.GAPInfo.DirectoriesPrograms = GAP.Globals.List( GAP.Globals.GAPInfo.DirectoriesSystemPrograms, GAP.Globals.Directory )
118118

119119
CompileGapPackage( "io", print_available = false )
120120

121-
## LoadPackage( "IO_ForHomalg" ) ## needed when reading LaunchCAS_IO_ForHomalg.g below
121+
## loading IO_ForHomalg now suppresses its banner later
122122
LoadPackage( "IO_ForHomalg" )
123123

124124
## LoadPackage( "RingsForHomalg" ) ## needed by the variable HOMALG_IO_Singular below
125125
LoadPackage( "RingsForHomalg" )
126126

127127
## add ~/.julia/.../Singular/deps/usr/lib/ to LD_LIBRARY_PATH and DYLD_LIBRARY_PATH
128+
lib = joinpath(PATH_TO_SINGULAR,"deps","usr","lib")
128129
lib = [ "LD_LIBRARY_PATH=" * lib * ":\$LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH=" * lib * ":\$DYLD_LIBRARY_PATH" ]
129130
GAP.Globals.HOMALG_IO_Singular.environment = GAP.julia_to_gap( [GAP.julia_to_gap(lib[1]), GAP.julia_to_gap(lib[2])] )
130131

0 commit comments

Comments
 (0)