windows install working

zxcalc · May 2, 2014 · 327778a · 327778a
1 parent 07b0067
commit 327778a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/scala/dist/mk-linux-generic.sh b/scala/dist/mk-linux-generic.sh
@@ -22,6 +22,7 @@ cp -f dist/linux-dist/libpolyml.so.4 $BUNDLE/bin
 
 echo Including heap...
 cp -f ../core/run_protocol.ML $BUNDLE/
+cp -f dist/ml.xml $BUNDLE/
 mkdir -p $BUNDLE/heaps
 cp -f ../core/heaps/quanto.heap $BUNDLE/heaps/
 

diff --git a/scala/dist/mk-windows.bat b/scala/dist/mk-windows.bat
@@ -11,6 +11,7 @@ mkdir %BUNDLE%\bin
 REM This dummy file lets the frontend know it is running inside
 REM a generic linux bundle.
 type nul >> %BUNDLE%\windows-bundle
+copy dist\ml.xml %BUNDLE%
 
 echo Running SBT...
 call sbt package

diff --git a/scala/dist/windows-dist/QuantoDerive.aip b/scala/dist/windows-dist/QuantoDerive.aip
@@ -62,8 +62,9 @@
     <ROW File="libpolyml.a" Component_="libpolymain.a" FileName="LIBPOL~2.A|libpolyml.a" Attributes="0" SourcePath="..\..\target\QuantoDerive\bin\libpolyml.a" SelfReg="false" NextFile="libpolyml.dll.a"/>
     <ROW File="libpolyml.dll.a" Component_="libpolymain.a" FileName="LIBPOL~3.A|libpolyml.dll.a" Attributes="0" SourcePath="..\..\target\QuantoDerive\bin\libpolyml.dll.a" SelfReg="false" NextFile="libpolyml.la"/>
     <ROW File="libpolyml.la" Component_="libpolymain.a" FileName="LIBPOL~2.LA|libpolyml.la" Attributes="0" SourcePath="..\..\target\QuantoDerive\bin\libpolyml.la" SelfReg="false" NextFile="poly.exe"/>
+    <ROW File="ml.xml" Component_="run_protocol.ML" FileName="ml.xml" Attributes="0" SourcePath="..\..\target\QuantoDerive\ml.xml" SelfReg="false"/>
     <ROW File="poly.exe" Component_="poly.exe" FileName="poly.exe" Attributes="0" SourcePath="..\..\target\QuantoDerive\bin\poly.exe" SelfReg="false" NextFile="akkaactor_2.102.1.1.jar" DigSign="true"/>
-    <ROW File="quanto.heap" Component_="quanto.heap" FileName="QUANTO~1.HEA|quanto.heap" Attributes="0" SourcePath="..\..\target\QuantoDerive\heaps\quanto.heap" SelfReg="false"/>
+    <ROW File="quanto.heap" Component_="quanto.heap" FileName="QUANTO~1.HEA|quanto.heap" Attributes="0" SourcePath="..\..\target\QuantoDerive\heaps\quanto.heap" SelfReg="false" NextFile="ml.xml"/>
     <ROW File="quanto_2.101.0.jar" Component_="akkaactor_2.102.1.1.jar" FileName="QUANTO~1.JAR|quanto_2.10-1.0.jar" Attributes="0" SourcePath="..\..\target\QuantoDerive\jars\quanto_2.10-1.0.jar" SelfReg="false" NextFile="scalalibrary2.10.4.jar"/>
     <ROW File="run_protocol.ML" Component_="run_protocol.ML" FileName="RUN_PR~1.ML|run_protocol.ML" Attributes="0" SourcePath="..\..\target\QuantoDerive\run_protocol.ML" SelfReg="false" NextFile="windowsbundle"/>
     <ROW File="scalalibrary2.10.4.jar" Component_="akkaactor_2.102.1.1.jar" FileName="SCALA-~1.JAR|scala-library-2.10.4.jar" Attributes="0" SourcePath="..\..\target\QuantoDerive\jars\scala-library-2.10.4.jar" SelfReg="false" NextFile="scalaswing2.10.4.jar"/>

diff --git a/scala/src/main/scala/quanto/core/Core.scala b/scala/src/main/scala/quanto/core/Core.scala
@@ -110,7 +110,7 @@ class Core extends Actor with ActorLogging {
       fw.write(msg.code)
       fw.write("\n")
       fw.close()
-      val code = codeWrapper.format(workingDir, file.getAbsolutePath, mlCompileId)
+      val code = codeWrapper.format(workingDir.replace("\\","\\\\"), file.getAbsolutePath.replace("\\","\\\\"), mlCompileId)
 
       activeRequests.synchronized(activeRequests += mlCompileId)
       coreProcess.consoleOutput.addListener(mlCompileId)(msg.onComplete)

diff --git a/scala/src/main/scala/quanto/gui/MLEditPanel.scala b/scala/src/main/scala/quanto/gui/MLEditPanel.scala
@@ -18,7 +18,7 @@ class MLEditPanel extends BorderPanel with HasDocument {
 
   val sml = new Mode("StandardML")
 
-  val mlModeXml = if (Globals.isMacBundle) new File("ml.xml").getAbsolutePath
+  val mlModeXml = if (Globals.isBundle) new File("ml.xml").getAbsolutePath
                   else getClass.getResource("ml.xml").getPath
   sml.setProperty("file", mlModeXml)
   println(sml.getProperty("file"))
@@ -104,7 +104,8 @@ class MLEditPanel extends BorderPanel with HasDocument {
             QuantoDerive.CoreStatus.text = "Exception in ML"
             QuantoDerive.CoreStatus.foreground = Color.RED
             QuantoDerive.ConsoleProgress.indeterminate = false
-          case _ =>
+          case msg =>
+            println(msg)
             QuantoDerive.CoreStatus.text = "Unrecognised response from Poly/ML"
             QuantoDerive.CoreStatus.foreground = Color.BLUE
             QuantoDerive.ConsoleProgress.indeterminate = false

diff --git a/scala/src/main/scala/quanto/util/Globals.scala b/scala/src/main/scala/quanto/util/Globals.scala
@@ -7,4 +7,5 @@ object Globals {
   def isMacBundle: Boolean = new File("osx-bundle").exists
   def isLinuxBundle: Boolean = new File("linux-bundle").exists
   def isWindowsBundle: Boolean = new File("windows-bundle").exists
+  def isBundle: Boolean = isMacBundle || isWindowsBundle || isLinuxBundle
 }