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/12/15 09:06:14 UTC
[royale-compiler] branch feature/as2wasm updated (66d82ab ->
839ceb8)
This is an automated email from the ASF dual-hosted git repository.
erikdebruin pushed a change to branch feature/as2wasm
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from 66d82ab Merge branch 'develop' into as2wasm
new d1d1655 Getting all my paths “straight”
new 1eff836 Fixed some merge issues
add aa75db8 missed some folders
add 51ff038 use base NOTICE
add 741c8ff comment out tar-gzip so it doesn't conflict with the one in royale-asjs when called from royale-asjs
new 839ceb8 Merge branch 'develop' into as2wasm
The 3 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:
build.xml | 36 +++++++++++++++++--
compiler-jx/.classpath | 12 ++++---
compiler-jx/.project | 10 ++++++
compiler-jx/build.xml | 2 +-
.../codegen/js/royale/TestRoyaleGlobalClasses.java | 6 ++--
.../royale/compiler/internal/test/TestBase.java | 41 ++++++++++++----------
compiler/.classpath | 4 +--
compiler/.project | 5 +++
8 files changed, 83 insertions(+), 33 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].
[royale-compiler] 01/03: Getting all my paths “straight”
Posted by er...@apache.org.
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 d1d16550388335f947389d606f5103dd6300a1d7
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Mon Dec 11 11:54:00 2017 +0100
Getting all my paths “straight”
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
---
compiler-jx/.classpath | 12 +++++++-----
compiler-jx/.project | 10 ++++++++++
compiler/.classpath | 4 ++--
compiler/.project | 5 +++++
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath
index 9c9ddc7..ae64092 100644
--- a/compiler-jx/.classpath
+++ b/compiler-jx/.classpath
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="COMPILER_TEST_UTILS"/>
+ <classpathentry kind="src" path="java"/>
+ <classpathentry excluding="**/EnvProperties.java" kind="src" path="COMPILER_TEST_UTILS"/>
<classpathentry kind="src" path="src/test/java"/>
<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="/Users/erik/Documents/git/royale-compiler/compiler-test-utils/target/classes"/>
<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="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="lib" path="/compiler/lib/compiler-common.jar"/>
- <classpathentry kind="lib" path="/Users/aharui/git/royale/ant/royale-compiler/compiler/lib/external/commons-compress-1.10.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/compiler-common"/>
- <classpathentry combineaccessrules="false" kind="src" path="/compiler-externc"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler/lib/external/commons-compress-1.10.jar"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-externc/target/classes"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-common/target/classes"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/compiler-jx/.project b/compiler-jx/.project
index bcdd822..c7393cf 100644
--- a/compiler-jx/.project
+++ b/compiler-jx/.project
@@ -26,6 +26,16 @@
<type>2</type>
<location>/Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java</location>
</link>
+ <link>
+ <name>compiler-common</name>
+ <type>2</type>
+ <location>/Users/erik/Documents/git/royale-compiler/compiler-common</location>
+ </link>
+ <link>
+ <name>java</name>
+ <type>2</type>
+ <location>/Users/erik/Documents/git/royale-compiler/compiler-externc/src/test/java</location>
+ </link>
</linkedResources>
<variableList>
<variable>
diff --git a/compiler/.classpath b/compiler/.classpath
index 5e26dcd..2bab346 100644
--- a/compiler/.classpath
+++ b/compiler/.classpath
@@ -22,8 +22,8 @@
<classpathentry kind="lib" path="lib/external/commons-lang3-3.4.jar"/>
<classpathentry kind="lib" path="lib/external/jburg.jar"/>
<classpathentry kind="lib" path="lib/external/commons-compress-1.10.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/compiler-common"/>
<classpathentry kind="lib" path="lib/compiler-common.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/compiler-externc"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-jx/lib/externc.jar"/>
+ <classpathentry kind="lib" path="/Users/erik/Documents/git/royale-compiler/compiler-test-utils/target/classes"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/compiler/.project b/compiler/.project
index 7c6ccaa..3ce7e76 100644
--- a/compiler/.project
+++ b/compiler/.project
@@ -31,6 +31,11 @@
<location>/Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java</location>
</link>
<link>
+ <name>compiler-test-utils</name>
+ <type>2</type>
+ <location>/Users/erik/Documents/git/royale-compiler/compiler-test-utils</location>
+ </link>
+ <link>
<name>royale-ant-tasks</name>
<type>2</type>
<location>/Users/aharui/git/royale/ant/royale-compiler/royale-ant-tasks/src/main/java</location>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-compiler] 02/03: Fixed some merge issues
Posted by er...@apache.org.
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 1eff836025da25704eeba3dda11a73f064475bcf
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Mon Dec 11 12:47:28 2017 +0100
Fixed some merge issues
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
---
.../codegen/js/royale/TestRoyaleGlobalClasses.java | 6 ++--
.../royale/compiler/internal/test/TestBase.java | 41 ++++++++++++----------
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
index 6e7352e..1084cd2 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
@@ -45,9 +45,9 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
public void setUp()
{
backend = createBackend();
- project = new RoyaleJSProject(workspace, backend);
- project.config = new JSGoogConfiguration();
- project.setProxyBaseClass("custom.TestProxy");
+ royaleJSProject = new RoyaleJSProject(workspace, backend);
+ royaleJSProject.config = new JSGoogConfiguration();
+ royaleJSProject.setProxyBaseClass("custom.TestProxy");
super.setUp();
}
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
index 0f49239..9e728bf 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
@@ -46,9 +46,11 @@ import org.apache.royale.compiler.codegen.as.IASEmitter;
import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
import org.apache.royale.compiler.config.Configurator;
import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSBackend;
import org.apache.royale.compiler.internal.codegen.as.ASFilterWriter;
import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
import org.apache.royale.compiler.internal.projects.RoyaleProjectConfigurator;
+import org.apache.royale.compiler.internal.projects.RoyaleWASTProject;
import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
import org.apache.royale.compiler.internal.targets.JSTarget;
import org.apache.royale.compiler.internal.tree.as.FunctionNode;
@@ -85,7 +87,8 @@ public class TestBase implements ITestBase
protected static EnvProperties env = EnvProperties.initiate();
protected static Workspace workspace = new Workspace();
- protected RoyaleJSProject project;
+ protected RoyaleJSProject royaleJSProject;
+ protected RoyaleWASTProject royaleWASTProject;
protected IBackend backend;
protected ASFilterWriter writer;
@@ -111,23 +114,23 @@ public class TestBase implements ITestBase
{
errors = new ArrayList<ICompilerProblem>();
- if (project == null)
+ if (royaleJSProject == null)
{
backend = createBackend();
- project = new RoyaleJSProject(workspace, backend);
- project.setProxyBaseClass("custom.TestProxy");
+ royaleJSProject = new RoyaleJSProject(workspace, backend);
+ royaleJSProject.setProxyBaseClass("custom.TestProxy");
}
- project.setProblems(errors);
- RoyaleProjectConfigurator.configure(project);
+ royaleJSProject.setProblems(errors);
+ RoyaleProjectConfigurator.configure(royaleJSProject);
try {
Configurator projectConfigurator = backend.createConfigurator();
- project.setTargetSettings(projectConfigurator.getTargetSettings(null));
+ royaleJSProject.setTargetSettings(projectConfigurator.getTargetSettings(null));
}
catch (UnsupportedOperationException e)
{
}
- writer = backend.createWriterBuffer(project);
+ writer = ((IJSBackend) backend).createWriterBuffer(royaleJSProject);
try
{
@@ -317,7 +320,7 @@ public class TestBase implements ITestBase
.normalize(tempFile.getAbsolutePath());
Collection<ICompilationUnit> mainFileCompilationUnits = workspace
- .getCompilationUnits(normalizedMainFileName, project);
+ .getCompilationUnits(normalizedMainFileName, royaleJSProject);
ICompilationUnit cu = null;
for (ICompilationUnit cu2 : mainFileCompilationUnits)
@@ -338,7 +341,7 @@ public class TestBase implements ITestBase
return null;
}
fileNode = result.getAST();
- project.getDependencies(cu);
+ royaleJSProject.getDependencies(cu);
}
catch (InterruptedException e)
{
@@ -366,12 +369,12 @@ public class TestBase implements ITestBase
ICompilationUnit mainCU = Iterables
.getOnlyElement(workspace.getCompilationUnits(
- FilenameNormalization.normalize(mainFileName), project));
+ FilenameNormalization.normalize(mainFileName), royaleJSProject));
- project.mainCU = mainCU;
+ royaleJSProject.mainCU = mainCU;
Configurator projectConfigurator = backend.createConfigurator();
- JSTarget target = (JSTarget) backend.createTarget(project,
+ JSTarget target = (JSTarget) ((IJSBackend) backend).createTarget(royaleJSProject,
projectConfigurator.getTargetSettings(null), null);
ArrayList<ICompilerProblem> errors = new ArrayList<ICompilerProblem>();
@@ -393,7 +396,7 @@ public class TestBase implements ITestBase
System.out.println(sb.toString());
return compiledFileNames;
}
- List<ICompilationUnit> reachableCompilationUnits = project
+ List<ICompilationUnit> reachableCompilationUnits = royaleJSProject
.getReachableCompilationUnitsInSWFOrder(ImmutableSet.of(mainCU));
for (final ICompilationUnit cu : reachableCompilationUnits)
{
@@ -415,9 +418,9 @@ public class TestBase implements ITestBase
final File outputClassFile = getOutputClassFile(qname
+ "_output", outputRootDir);
- ASFilterWriter writer = backend.createWriterBuffer(project);
+ ASFilterWriter writer = ((IJSBackend) backend).createWriterBuffer(royaleJSProject);
IASEmitter emitter = backend.createEmitter(writer);
- IASBlockWalker walker = backend.createWalker(project,
+ IASBlockWalker walker = ((IJSBackend) backend).createWalker(royaleJSProject,
errors, emitter);
walker.visitCompilationUnit(cu);
@@ -681,9 +684,9 @@ public class TestBase implements ITestBase
addLibraries(libraries);
addNamespaceMappings(namespaceMappings);
- project.setSourcePath(sourcePaths);
- project.setLibraries(libraries);
- project.setNamespaceMappings(namespaceMappings);
+ royaleJSProject.setSourcePath(sourcePaths);
+ royaleJSProject.setLibraries(libraries);
+ royaleJSProject.setNamespaceMappings(namespaceMappings);
}
protected void addLibraries(List<File> libraries)
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-compiler] 03/03: Merge branch 'develop' into as2wasm
Posted by er...@apache.org.
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 839ceb8c7d171e7e4e8d1468e0c078191f6b3d0b
Merge: 1eff836 741c8ff
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Fri Dec 15 10:05:50 2017 +0100
Merge branch 'develop' into as2wasm
build.xml | 36 +++++++++++++++++++++++++++++++++---
compiler-jx/build.xml | 2 +-
2 files changed, 34 insertions(+), 4 deletions(-)
diff --cc compiler-jx/build.xml
index 7891931,3bfa292..e002e67
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@@ -111,29 -105,8 +111,29 @@@
<property name="jar.classpath" value="commons-io.jar guava.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar ../../lib/external/commons-lang-2.6.jar ../../compiler/lib/external/commons-lang-2.6.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar" />
<copy file="${basedir}/../LICENSE.base" tofile="${classes.dir}/META-INF/LICENSE"/>
- <copy file="${basedir}/../NOTICE" tofile="${classes.dir}/META-INF/NOTICE"/>
+ <copy file="${basedir}/../NOTICE.base" 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="" >
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
+ <manifest>
+ <attribute name="Sealed" value="${manifest.sealed}"/>
+ <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
+ <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
+ <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
+ <attribute name="Main-Class" value="org.apache.royale.compiler.clients.WASTC" />
+ <attribute name="Class-Path" value="compiler.jar" />
+ </manifest>
+ </jar>
+
<echo message="Building ${jsc.jar}" />
<jar file="${jsc.jar}" basedir="${classes.dir}"
includes="**/*.properties,org/apache/**/*,com/google/**/*,META-INF/**/*"
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.