You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2017/12/01 05:55:20 UTC
[royale-compiler] branch feature/rename updated: more windows path
fixing
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
The following commit(s) were added to refs/heads/feature/rename by this push:
new 099f95c more windows path fixing
099f95c is described below
commit 099f95c13672ef2e4258a745eb02c306578f45d4
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 30 21:55:13 2017 -0800
more windows path fixing
---
.../compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java | 3 ++-
.../compiler/internal/codegen/js/royale/TestRoyaleProject.java | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java
index f7f7ccd..ce5bca2 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java
@@ -38,6 +38,7 @@ import org.apache.royale.compiler.internal.codegen.mxml.jsc.MXMLJSCJSEmitter;
import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleBackend;
import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProjectConfigurator;
import org.apache.royale.compiler.internal.targets.RoyaleJSTarget;
import org.apache.royale.compiler.internal.targets.JSTarget;
import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
@@ -63,7 +64,7 @@ public class MXMLJSCJSBackend extends MXMLRoyaleBackend
@Override
public Configurator createConfigurator()
{
- return new Configurator(JSGoogConfiguration.class);
+ return new RoyaleProjectConfigurator(JSGoogConfiguration.class);
}
@Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
index 927bbae..e70f212 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
@@ -213,11 +213,11 @@ public class TestRoyaleProject extends TestGoogProject
String expected = path + "/royale/projects/bad_overrides/Test.as(31:29)\n" +
"interface method someFunction in interface IA is implemented with an incompatible signature in class Test\n" +
- testAdapter.getUnitTestBaseDir().getPath() + "/royale/projects/bad_overrides/Test.as(36:26)\n" +
+ path + "/royale/projects/bad_overrides/Test.as(36:26)\n" +
"interface method someOtherFunction in interface IA is implemented with an incompatible signature in class Test\n" +
- testAdapter.getUnitTestBaseDir().getPath() + "/royale/projects/bad_overrides/Test.as(31:29)\n" +
+ path + "/royale/projects/bad_overrides/Test.as(31:29)\n" +
"Incompatible override.\n" +
- testAdapter.getUnitTestBaseDir().getPath() + "/royale/projects/bad_overrides/Test.as(36:26)\n" +
+ path + "/royale/projects/bad_overrides/Test.as(36:26)\n" +
"Incompatible override.\n";
assertThat(out, is(expected));
}
@@ -247,7 +247,7 @@ public class TestRoyaleProject extends TestGoogProject
assertThat(out, is(path +
"/royale/projects/package_conflicts_ambiguous_definition/mypackage/TestClass.as(29:20)\nAmbiguous reference to Event\n" +
- testAdapter.getUnitTestBaseDir().getPath() +
+ path +
"/royale/projects/package_conflicts_ambiguous_definition/mypackage/TestClass.as(30:41)\nAmbiguous reference to Event\n"));
}
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].