create windows build

chakravala · May 21, 2017 · 57511ad · 57511ad
1 parent 109689b
commit 57511ad
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 18 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -56,8 +56,19 @@ if !is_windows()
      end
      println("DONE")
    end
- else
-   warn("Windows build of redpsl not currently supported.")
+else
+   try
+     cmd = `\"%programfiles%\\Reduce\\bin\\redpsl.bat\"`
+     process = spawn(cmd)
+     kill(process)
+   catch
+     cd(wdir)
+     setup = "Reduce-Setup"
+     download(http*date*"/"*setup*"_"*date*".exe"*dl,joinpath(wdir,"$(setup)_$(date).exe"))
+     run(`$(setup)_$(date).exe`)
+     run(`DEL $(setup)_$(date).exe`)
+   end
+   #warn("Windows build of redpsl not currently supported.")
  end
 
 cd(oldwdir)
diff --git a/src/Reduce.jl b/src/Reduce.jl
@@ -9,28 +9,39 @@ immutable PSL <: Base.AbstractPipe
   input::Pipe; output::Pipe; process::Base.Process
   function PSL()
     rpsl = "redpsl"
-    try
-      # Setup pipes and reduce process
-      input = Pipe(); output = Pipe()
-      process = spawn(`$rpsl`, (input, output, STDERR))
-      # Close the unneeded ends of Pipes
-      close(input.out); close(output.in)
-      return new(input, output, process)
-    catch
+    if !is_windows()
+      try
+        # Setup pipes and reduce process
+        input = Pipe(); output = Pipe()
+        process = spawn(`$rpsl`, (input, output, STDERR))
+        # Close the unneeded ends of Pipes
+        close(input.out); close(output.in)
+        return new(input, output, process)
+      catch
+        # Setup pipes and reduce process
+        input = Pipe(); output = Pipe()
+        if is_linux()
+          cmd = `$(joinpath(dirname(@__FILE__),"..","deps","usr","bin"))/$rpsl`
+        elseif is_apple()
+          cmd = `$(joinpath(dirname(@__FILE__),"..","deps","psl"))/$rpsl`
+        else
+          cmd = `$(joinpath(dirname(@__FILE__),"..","Reduce-svn4052-src","bin"))/$rpsl`
+        end
+        process = spawn(cmd, (input, output, STDERR))
+        # Close the unneeded ends of Pipes
+        close(input.out); close(output.in)
+        return new(input, output, process)
+      end
+    else
       # Setup pipes and reduce process
       input = Pipe(); output = Pipe()
-      if is_linux()
-        cmd = `$(joinpath(dirname(@__FILE__),"..","deps","usr","bin"))/$rpsl`
-      elseif is_apple()
-        cmd = `$(joinpath(dirname(@__FILE__),"..","deps","psl"))/$rpsl`
-      else
-        cmd = `$(joinpath(dirname(@__FILE__),"..","Reduce-svn4052-src","bin"))/$rpsl`
-      end
+      cmd = `\"%programfiles%\\Reduce\\bin\\redpsl.bat\"`
       process = spawn(cmd, (input, output, STDERR))
       # Close the unneeded ends of Pipes
       close(input.out); close(output.in)
       return new(input, output, process)
-    end; end; end
+    end
+  end; end
 
 Base.kill(rs::PSL) = kill(rs.process)
 Base.process_exited(rs::PSL) = process_exited(rs.process)