implemented PSL environment variable #51

Project.toml

@@ -1,7 +1,7 @@
 name = "Reduce"
 uuid = "93e0c654-6965-5f22-aba9-9c1ae6b3c259"
 authors = ["Michael Reed"]
-version = "1.2.10"
+version = "1.2.11"
 
 [deps]
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

deps/build.jl

@@ -30,17 +30,10 @@ end
 if !Sys.iswindows()
     try
         try
-            process = _spawn(`$rpsl`)
+            process = _spawn(red())
             kill(process)
         catch
-            if Sys.islinux()
-                cmd = `$(joinpath(wdir,"usr","bin"))/$rpsl`
-            elseif Sys.isapple()
-                cmd = `$(joinpath(wdir,"psl"))/$rpsl`
-            else
-                cmd = `$(joinpath(wdir,"Reduce-svn$(rsvn[ρ])-src","bin"))/$rpsl`
-            end
-            process = _spawn(cmd)
+            process = _spawn(redsys(wdir))
             kill(process)
             !isfile("ver") && writever(0)
         end
@@ -49,9 +42,9 @@ if !Sys.iswindows()
         rtg = "reduce.tar.gz"
         dl = "/download"
         cd(wdir)
-        println("Building Reduce.jl with CSL binaries ... ")
+        println("Building Reduce.jl with $(ispsl() ? "PSL" : "CSL") binaries ... ")
         if Sys.islinux()
-            src = "/reduce-csl_"
+            src = "/reduce-$(redsl())_"
             if occursin("64",read(`uname -m`,String))
                 download(http*date[ρ]*"/linux64"*src*rsvn[ρ]*"_amd64.tgz"*dl,joinpath(wdir,rtg))
             else
@@ -65,8 +58,8 @@ if !Sys.iswindows()
             snap = "Reduce-snapshot"
             download(http*date[ρ]*"/macintosh/"*snap*"_"*rsvn[ρ]*".dmg"*dl,joinpath(wdir,"$(snap)_$(date[ρ]).dmg"))
             run(`hdiutil attach $(wdir)/$(snap)_$(date[ρ]).dmg`)
-            run(`rm -rf $(joinpath(wdir,"csl"))`)
-            run(`cp -r /Volumes/$(snap)/csl $(wdir)/csl`)
+            run(`rm -rf $(joinpath(wdir,redsl()))`)
+            run(`cp -r /Volumes/$(snap)/csl $(wdir)/$(redsl())`)
             run(`hdiutil unmount /Volumes/$(snap)`)
             run(`rm $(snap)_$(date[ρ]).dmg`)
             writever(ρ)
@@ -83,16 +76,14 @@ if !Sys.iswindows()
     end
 else
     try
-        #cmd = `"$(wdir)\psl\bpsl.exe" -td 16000000 -f "$(wdir)\red\reduce.img"`
-        cmd = `"$(wdir)\reduce.exe" --nogui`
-        process = _spawn(cmd)
+        process = _spawn(redsys(wdir))
         kill(process)
     catch
         cd(wdir)
-        println("Building Reduce.jl with CSL binaries ...")
-        cab = "wincsl.cab"
+        println("Building Reduce.jl with $(ispsl() ? "PSL" : "CSL") binaries ...")
+        cab,winsl = "winred.cab",ispsl() ? "winpsl64" : "wincsl"
         http = "https://master.dl.sourceforge.net/project/reduce-algebra/snapshot_"
-        download(http*date[ρ]*"/windows/wincsl_$(rsvn[ρ]).cab",joinpath(wdir,cab))
+        download(http*date[ρ]*"/windows/$(winsl)_$(rsvn[ρ]).cab",joinpath(wdir,cab))
         open("redextract.bat","w") do f
                 write(f,"expand $cab \"$(wdir)\" -F:*\n")
                 #write(f,"reg Query \"HKLM\\Hardware\\Description\\System\\CentralProcessor\\0\" | find /i \"x86\" > NUL && set OSQ=32BIT || set OSQ=64BIT\n")

deps/svn.jl

@@ -1,7 +1,10 @@
 #   This file is part of Reduce.jl. It is licensed under the MIT license
 #   Copyright (C) 2017 Michael Reed
 
-rpsl = "redcsl"
+ispsl() = haskey(ENV,"PSL")
+red() = ispsl() ? `redpsl` : `redcsl -w`
+red(path) = ispsl() ? `$path/redpsl` : `$path/redcsl -w`
+redsl() = ispsl() ? "psl" : "csl"
 
 ρ = 7
 
@@ -25,6 +28,24 @@ rsvn = Dict(
   6 =>  "5377",
   7 =>  "5424")
 
+function redsys(dir)
+    if !(Sys.iswindows())
+        if Sys.islinux()
+            red(joinpath(dir,"usr","bin"))
+        elseif Sys.isapple()
+            red(joinpath(dir,ispsl() ? "psl" : "csl"))
+        else
+            rsl = red(joinpath(dir,"Reduce-svn$(rsvn[ρ])-src","bin"))
+        end
+    else
+        if ispsl()
+            `"$(dir)\psl\bpsl.exe" -td 16000000 -f "$(dir)\red\reduce.img"`
+        else
+            `"$(dir)\reduce.exe" --nogui`
+        end
+    end
+end
+
 function _spawn(cmd, input=devnull, output=devnull)
     run(pipeline(cmd, stdin=input, stdout=output, stderr=stderr), wait=false)
 end

src/Reduce.jl

@@ -16,26 +16,16 @@ struct PSL <: Base.AbstractPipe
         # Setup pipes and reduce process
         input = Pipe()
         output = Pipe()
-        rsl = `$(split(rpsl))`
-        dirf = @__DIR__
+        rsl = red()
+        dirf = joinpath(@__DIR__,"..","deps")
         if !Sys.iswindows()
             try
-                process = _spawn(rsl, input, output)
+                process = _spawn(red(), input, output)
             catch
-                if Sys.islinux()
-                    rsl = `$(joinpath(dirf,"..","deps","usr","bin"))/$rpsl`
-                elseif Sys.isapple()
-                    rsl = `$(joinpath(dirf,"..","deps","csl"))/$rpsl -w`
-                else
-                    rsl = `$(joinpath(dirf,"..","Reduce-svn$(rsvn[ρ])-src","bin"))/$rpsl`
-                end
-                process = _spawn(rsl, input, output)
+                process = _spawn(redsys(dirf), input, output)
             end
         else
-            dirf = joinpath(dirf,"..","deps")
-            #rsl = `"$(dirf)\psl\bpsl.exe" -td 16000000 -f "$(dirf)\red\reduce.img"`
-            rsl = `"$(dirf)\reduce.exe" --nogui`
-            process = _spawn(rsl, input, output)
+            process = _spawn(redsys(dirf), input, output)
         end
         # Close the unneeded ends of Pipes
         close(input.out)