This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch feature/rename in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit d7528f3b8dddd2b768e1f9d0c5f9b89004e389b3 Author: Alex Harui <[email protected]> AuthorDate: Thu Nov 16 19:08:13 2017 -0800 no errors compiling compiler-jx --- compiler-jx/build.xml | 9 +++++---- .../main/java/org/apache/royale/compiler/clients/MXMLJSC.java | 4 +++- .../compiler/internal/codegen/js/royale/JSRoyaleEmitter.java | 3 ++- .../compiler/internal/projects/RoyaleProjectConfigurator.java | 8 ++++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml index df733d9..4d52ad6 100644 --- a/compiler-jx/build.xml +++ b/compiler-jx/build.xml @@ -63,6 +63,10 @@ <property name="build.number" value="0"/> <path id="classpath"> + <filelist dir="${royale.lib.dir}/"> + <file name="compiler.jar" /> + <file name="compiler-common.jar" /> + </filelist> <filelist dir="${royale.lib.dir}/external"> <file name="antlr.jar" /> <file name="commons-lang-2.6.jar" /> @@ -85,9 +89,6 @@ classpathref="classpath" source="${javac.src}" target="${javac.src}"> <src path="${src}" /> - <classpath> - <pathelement path="${royale.basedir}/target/classes" /> - </classpath> </javac> </target> @@ -100,7 +101,7 @@ <target name="main" depends="prebuild,compile"> - <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" /> + <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"/> diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java index 33771de..dcf12f5 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java @@ -55,6 +55,7 @@ import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration; import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate; import org.apache.royale.compiler.internal.projects.CompilerProject; import org.apache.royale.compiler.internal.projects.RoyaleJSProject; +import org.apache.royale.compiler.internal.projects.RoyaleProjectConfigurator; import org.apache.royale.compiler.internal.projects.ISourceFileHandler; import org.apache.royale.compiler.internal.targets.RoyaleJSTarget; import org.apache.royale.compiler.internal.targets.JSTarget; @@ -827,7 +828,8 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider, projectConfigurator.setConfiguration(args, ICompilerSettingsConstants.FILE_SPECS_VAR); } - + projectConfigurator.applyToProject(project); + // getCompilerProblemSettings initializes the configuration problems = new ProblemQuery(projectConfigurator.getCompilerProblemSettings()); problems.addAll(projectConfigurator.getConfigurationProblems()); diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java index 1d199fa..7abd39d 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java @@ -37,6 +37,7 @@ import org.apache.royale.compiler.definitions.INamespaceDefinition; import org.apache.royale.compiler.definitions.IPackageDefinition; import org.apache.royale.compiler.definitions.ITypeDefinition; import org.apache.royale.compiler.definitions.metadata.IMetaTagAttribute; +import org.apache.royale.compiler.definitions.references.INamespaceResolvedReference; import org.apache.royale.compiler.embedding.EmbedAttribute; import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation; @@ -957,7 +958,7 @@ public class JSRoyaleEmitter extends JSGoogEmitter implements IJSRoyaleEmitter if (nodeDef instanceof FunctionDefinition && isCustomNamespace((FunctionDefinition)nodeDef)) { - String ns = ((FunctionDefinition)nodeDef).getNamespaceReference().resolveAETNamespace(getWalker().getProject()).getName(); + String ns = ((INamespaceResolvedReference)((FunctionDefinition)nodeDef).getNamespaceReference()).resolveAETNamespace(getWalker().getProject()).getName(); write(ns + "::"); } write(((IIdentifierNode)node).getName()); diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java index d8b9e40..edfc9e1 100644 --- a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java +++ b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java @@ -266,6 +266,14 @@ public class RoyaleProjectConfigurator extends Configurator } } + /** + * Constructor + */ + public RoyaleProjectConfigurator(Class<? extends Configuration> configurationClass) + { + super(configurationClass); + } + @Override public boolean applyToProject(ICompilerProject project) { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
