You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by er...@apache.org on 2017/11/15 15:14:58 UTC
[royale-compiler] branch feature/wast updated (5459191 -> b17978d)
This is an automated email from the ASF dual-hosted git repository.
erikdebruin pushed a change to branch feature/wast
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from 5459191 Make sure we pick up ‘glue.js’ from the correct location
new 6830ee5 Fix build scripts; ignore WASTC test
new b17978d Use actual source name instead of fixed string
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
compiler-jx/.classpath | 12 ++++++------
compiler-jx/build.xml | 11 +++++++++++
.../compiler/internal/codegen/wast/WASTPublisher.java | 13 +++++++++----
.../compiler/internal/codegen/wast/TestWASTClass.java | 2 ++
4 files changed, 28 insertions(+), 10 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].
[royale-compiler] 01/02: Fix build scripts; ignore WASTC test
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erikdebruin pushed a commit to branch feature/wast
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 6830ee55299dc18cbf2b88f44f468aced180f30f
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Wed Nov 15 11:12:11 2017 +0100
Fix build scripts; ignore WASTC test
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
---
compiler-jx/.classpath | 12 ++++++------
compiler-jx/build.xml | 11 +++++++++++
.../royale/compiler/internal/codegen/wast/TestWASTClass.java | 2 ++
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath
index e730144..2bc1f74 100644
--- a/compiler-jx/.classpath
+++ b/compiler-jx/.classpath
@@ -6,12 +6,12 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/compiler"/>
- <classpathentry kind="lib" path="lib/google/closure-compiler/compiler.jar"/>
- <classpathentry kind="lib" path="lib/commons-io.jar"/>
- <classpathentry kind="lib" path="lib/args4j.jar"/>
- <classpathentry kind="lib" path="lib/guava.jar"/>
- <classpathentry kind="lib" path="lib/flex-tool-api.jar"/>
- <classpathentry kind="lib" path="lib/junit-4.10.jar"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/google/closure-compiler/compiler.jar"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/commons-io.jar"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/args4j.jar"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/guava.jar"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/flex-tool-api.jar"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/junit-4.10.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Commons Compress"/>
<classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler/lib/external/commons-lang-2.6.jar"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 793bf02..a031506 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -97,6 +97,11 @@
<mkdir dir="${classes.dir}/META-INF" />
<mkdir dir="${lib}/google/closure-compiler" />
<ant antfile="${basedir}/src/main/resources/downloads.xml" dir="${basedir}/src/main/resources" inheritAll="false"/>
+ <ant dir="../compiler-test-utils">
+ <target name="clean" />
+ <target name="main" />
+ </ant>
+ <copy file="${basedir}/../compiler-test-utils/target/classes/org/apache/royale/utils/EnvProperties.class" tofile="${classes.dir}/org/apache/royale/utils/EnvProperties.class"/>
</target>
<target name="main" depends="prebuild,compile">
@@ -107,6 +112,11 @@
<copy file="${basedir}/../NOTICE" tofile="${classes.dir}/META-INF/NOTICE"/>
<echo message="Building ${wastc.jar}" />
+ <ant dir="../compiler-test-utils">
+ <target name="clean" />
+ <target name="main" />
+ </ant>
+ <copy file="${basedir}/../compiler-test-utils/target/classes/org/apache/royale/utils/EnvProperties.class" tofile="${classes.dir}/org/apache/royale/utils/EnvProperties.class"/>
<jar file="${wastc.jar}" basedir="${classes.dir}"
includes="**/*.properties,org/apache/**/*,META-INF/**/*"
excludes="" >
@@ -223,6 +233,7 @@
<include name="mxmlc.jar" />
<include name="jsc.jar" />
<include name="asdoc.jar" />
+ <include name="wastc.jar" />
</fileset>
</delete>
</target>
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java
index eab8957..bf178e6 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java
@@ -21,6 +21,7 @@ package org.apache.royale.compiler.internal.codegen.wast;
import org.apache.royale.compiler.internal.test.WASTTestBase;
import org.apache.royale.compiler.tree.as.IClassNode;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -30,6 +31,7 @@ import org.junit.Test;
*/
public class TestWASTClass extends WASTTestBase {
+ @Ignore
@Test
public void testClassSimple()
{
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-compiler] 02/02: Use actual source name instead of fixed
string
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erikdebruin pushed a commit to branch feature/wast
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit b17978dd13f2b931ec0ee078d6e8d21b7a7c6bbb
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Wed Nov 15 15:55:33 2017 +0100
Use actual source name instead of fixed string
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
---
.../compiler/internal/codegen/wast/WASTPublisher.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 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 f1fb81b..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
@@ -40,6 +40,8 @@ public class WASTPublisher implements IWASTPublisher {
private Configuration configuration;
+
+ private String mainProjectFileName;
private File outputFolder;
private File outputParentFolder;
@@ -47,6 +49,7 @@ public class WASTPublisher implements IWASTPublisher {
private EnvProperties env;
+
@Override
public File getOutputFolder() {
outputParentFolder = new File(configuration.getTargetFileDirectory()).getParentFile();
@@ -65,11 +68,13 @@ public class WASTPublisher implements IWASTPublisher {
try {
String targetPath = getOutputFolder().getPath();
- String targetWatFilePath = targetPath + "/HelloWorld.wat";
+ mainProjectFileName = configuration.getMainDefinition();
+
+ String targetWatFilePath = targetPath + "/" + mainProjectFileName + ".wat";
env = EnvProperties.initiate();
- String[] cmd = { env.WAT2WASM + "/wat2wasm", targetWatFilePath, "-o", targetPath + "/HelloWorld.wasm" };
+ String[] cmd = { env.WAT2WASM + "/wat2wasm", targetWatFilePath, "-o", targetPath + "/" + mainProjectFileName + ".wasm" };
Process p = new ProcessBuilder(cmd).redirectError(Redirect.INHERIT)
.redirectOutput(Redirect.INHERIT)
@@ -138,7 +143,7 @@ public class WASTPublisher implements IWASTPublisher {
htmlFile.append(" <meta charset=\"utf-8\">\n");
htmlFile.append(" <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n");
htmlFile.append("\n");
- htmlFile.append(" <title>Royale WASM</title>\n");
+ htmlFile.append(" <title>" + mainProjectFileName + " - Royale WAST</title>\n");
htmlFile.append("\n");
htmlFile.append(" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n");
htmlFile.append("</head>\n");
@@ -150,7 +155,7 @@ public class WASTPublisher implements IWASTPublisher {
htmlFile.append("\n");
htmlFile.append("<script>\n");
htmlFile.append("\n");
- htmlFile.append(" fetchAndInstantiate('HelloWorld.wasm')\n");
+ htmlFile.append(" fetchAndInstantiate('" + mainProjectFileName + ".wasm')\n");
htmlFile.append(" .then(function(instance) {\n");
htmlFile.append(" document.getElementById('wasm-output').innerHTML = 'The result from the call to the WASM method is: ' + instance.exports.add(3, 7); // 10\n");
htmlFile.append(" });\n");
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.