update to v3.5.2 for fix to maude filename escaping

kframework · Apr 28, 2015 · 25918c3 · 25918c3
1 parent c41270a
commit 25918c3
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/java-backend/pom.xml b/java-backend/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kframework.k</groupId>
     <artifactId>parent</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
   </parent>
   <artifactId>java-backend</artifactId>
   <packaging>jar</packaging>

diff --git a/k-distribution/pom.xml b/k-distribution/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kframework.k</groupId>
     <artifactId>parent</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
   </parent>
   <artifactId>k-distribution</artifactId>
   <packaging>jar</packaging>

diff --git a/kernel/pom.xml b/kernel/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kframework.k</groupId>
     <artifactId>parent</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
   </parent>
   <artifactId>kernel</artifactId>
   <packaging>jar</packaging>

diff --git a/kore/pom.xml b/kore/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kframework.k</groupId>
     <artifactId>parent</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>kore</artifactId>

diff --git a/maude-backend/pom.xml b/maude-backend/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kframework.k</groupId>
     <artifactId>parent</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
   </parent>
   <artifactId>maude-backend</artifactId>
   <packaging>jar</packaging>

diff --git a/maude-backend/src/main/java/org/kframework/krun/runner/KRunner.java b/maude-backend/src/main/java/org/kframework/krun/runner/KRunner.java
@@ -6,6 +6,7 @@
 import org.kframework.kompile.KompileOptions;
 import org.kframework.krun.KRunOptions;
 import org.kframework.krun.ioserver.main.IOServer;
+import org.kframework.utils.StringUtil;
 import org.kframework.utils.file.JarInfo;
 import org.kframework.utils.maude.MaudeRun;
 
@@ -68,8 +69,8 @@ public int run() {
             String commandTemplate = "load {0}\nmod KRUNNER is including {1} .\neq #TCPPORT = {2,number,#} .\nendm\nload {3}\n";
 
             String command = MessageFormat.format(commandTemplate,
-                    JarInfo.windowfyPath(files.resolveKompiled("main.maude").getAbsolutePath()),
-                    kompileOptions.mainModule(), server.getPort(), JarInfo.windowfyPath(files.resolveTemp("maude_in").getAbsolutePath()));
+                    StringUtil.enquoteCString(JarInfo.windowfyPath(files.resolveKompiled("main.maude").getAbsolutePath())),
+                    kompileOptions.mainModule(), server.getPort(), StringUtil.enquoteCString(JarInfo.windowfyPath(files.resolveTemp("maude_in").getAbsolutePath())));
             Process _maudeProcess = runMaude();
             BufferedWriter maudeInput = new BufferedWriter(new OutputStreamWriter(_maudeProcess.getOutputStream()));
             maudeInput.write(command + "\n");

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>org.kframework.k</groupId>
   <artifactId>parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.5.1</version>
+  <version>3.5.2</version>
   <name>K Framework Tool Parent</name>
 
   <modules>
@@ -19,7 +19,7 @@
 
   <scm>
     <connection>scm:git:https://github.com/kframework/k.git</connection>
-    <tag>v3.5.1</tag>
+    <tag>v3.5.2</tag>
   </scm>
 
   <repositories>

diff --git a/sdf-parser/pom.xml b/sdf-parser/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kframework.k</groupId>
     <artifactId>parent</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
   </parent>
   <artifactId>sdf-parser</artifactId>
   <packaging>jar</packaging>