royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [royale-compiler] 01/02: Revert "‘wat2wasm’ is installed globally, no need to specify it’s path"
Date Fri, 17 Nov 2017 14:36:23 GMT
This is an automated email from the ASF dual-hosted git repository.

erikdebruin pushed a commit to branch feature/as2wasm
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 47cd9500fe0cf671516227d484d8b80d1fef73ad
Author: Erik de Bruin <erik@ixsoftware.nl>
AuthorDate: Fri Nov 17 15:31:31 2017 +0100

    Revert "‘wat2wasm’ is installed globally, no need to specify it’s path"
    
    This reverts commit cc15111174ad62ac17d701732cd6cad3190909fd.
---
 .../royale/compiler/internal/codegen/wast/WASTPublisher.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java
index 94465ba..fa2c182 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java
@@ -29,6 +29,7 @@ import org.apache.royale.compiler.clients.problems.ProblemQuery;
 import org.apache.royale.compiler.codegen.wast.IWASTPublisher;
 import org.apache.royale.compiler.config.Configuration;
 import org.apache.royale.compiler.internal.projects.RoyaleWASTProject;
+import org.apache.royale.utils.EnvProperties;
 
 public class WASTPublisher implements IWASTPublisher {
 
@@ -44,6 +45,8 @@ public class WASTPublisher implements IWASTPublisher {
 
 	private File outputFolder;
 	private File outputParentFolder;
+
+	private EnvProperties env;
 	
 	
 	
@@ -69,7 +72,9 @@ public class WASTPublisher implements IWASTPublisher {
 			
 			String targetWatFilePath = targetPath + "/" + mainProjectFileName + ".wat";
 			
-			String[] cmd = { "wat2wasm", targetWatFilePath, "-o", targetPath + "/" + mainProjectFileName
+ ".wasm" };
+			env = EnvProperties.initiate();
+			
+			String[] cmd = { env.WAT2WASM + "/wat2wasm", targetWatFilePath, "-o", targetPath + "/"
+ mainProjectFileName + ".wasm" };
 
 			Process p = new ProcessBuilder(cmd).redirectError(Redirect.INHERIT)
                     .redirectOutput(Redirect.INHERIT)

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <commits@royale.apache.org>.

Mime
View raw message