From 25918c323b903582db6bea1f4388d9e3da43b651 Mon Sep 17 00:00:00 2001 From: Dwight Guth Date: Mon, 27 Apr 2015 08:53:36 -0500 Subject: [PATCH] update to v3.5.2 for fix to maude filename escaping --- java-backend/pom.xml | 2 +- k-distribution/pom.xml | 2 +- kernel/pom.xml | 2 +- kore/pom.xml | 2 +- maude-backend/pom.xml | 2 +- .../src/main/java/org/kframework/krun/runner/KRunner.java | 5 +++-- pom.xml | 4 ++-- sdf-parser/pom.xml | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/java-backend/pom.xml b/java-backend/pom.xml index 9e6044ddac..432916abf6 100644 --- a/java-backend/pom.xml +++ b/java-backend/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 3.5.1 + 3.5.2 java-backend jar diff --git a/k-distribution/pom.xml b/k-distribution/pom.xml index 24cfbe9899..a72bc374c3 100644 --- a/k-distribution/pom.xml +++ b/k-distribution/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 3.5.1 + 3.5.2 k-distribution jar diff --git a/kernel/pom.xml b/kernel/pom.xml index 978f7935e8..7f332de5bb 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 3.5.1 + 3.5.2 kernel jar diff --git a/kore/pom.xml b/kore/pom.xml index 7749255c0c..660a8ed41f 100644 --- a/kore/pom.xml +++ b/kore/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 3.5.1 + 3.5.2 ../pom.xml kore diff --git a/maude-backend/pom.xml b/maude-backend/pom.xml index b2e547cee3..60b86064aa 100644 --- a/maude-backend/pom.xml +++ b/maude-backend/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 3.5.1 + 3.5.2 maude-backend jar 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 index 3ed685f594..343c850efc 100644 --- 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 index 2b44945058..077f3cbcf0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.kframework.k parent pom - 3.5.1 + 3.5.2 K Framework Tool Parent @@ -19,7 +19,7 @@ scm:git:https://github.com/kframework/k.git - v3.5.1 + v3.5.2 diff --git a/sdf-parser/pom.xml b/sdf-parser/pom.xml index 65b45e7356..e43c37eed8 100644 --- a/sdf-parser/pom.xml +++ b/sdf-parser/pom.xml @@ -6,7 +6,7 @@ org.kframework.k parent - 3.5.1 + 3.5.2 sdf-parser jar