royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [royale-compiler] branch feature/as2wasm updated: ‘wat2wasm’ is installed globally, no need to specify it’s path
Date Fri, 17 Nov 2017 13:39:39 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


The following commit(s) were added to refs/heads/feature/as2wasm by this push:
     new cc15111  ‘wat2wasm’ is installed globally, no need to specify it’s path
cc15111 is described below

commit cc15111174ad62ac17d701732cd6cad3190909fd
Author: Erik de Bruin <erik@ixsoftware.nl>
AuthorDate: Fri Nov 17 14:39:30 2017 +0100

    ‘wat2wasm’ is installed globally, no need to specify it’s path
    
    Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
---
 .../royale/compiler/internal/codegen/wast/WASTPublisher.java       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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 fa2c182..94465ba 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,7 +29,6 @@ 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 {
 
@@ -45,8 +44,6 @@ public class WASTPublisher implements IWASTPublisher {
 
 	private File outputFolder;
 	private File outputParentFolder;
-
-	private EnvProperties env;
 	
 	
 	
@@ -72,9 +69,7 @@ public class WASTPublisher implements IWASTPublisher {
 			
 			String targetWatFilePath = targetPath + "/" + mainProjectFileName + ".wat";
 			
-			env = EnvProperties.initiate();
-			
-			String[] cmd = { env.WAT2WASM + "/wat2wasm", targetWatFilePath, "-o", targetPath + "/"
+ mainProjectFileName + ".wasm" };
+			String[] cmd = { "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