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 4fcfc5ac2d0b29d2921b0169f1b92af73af08b95 Author: Alex Harui <aha...@apache.org> AuthorDate: Tue Nov 28 13:51:57 2017 -0800 compiler-jx maven build success --- compiler-externc/pom.xml | 13 ++++++++ compiler-jx/pom.xml | 36 +++++++++++++--------- .../compiler/internal/test/MXMLTestBase.java | 4 +-- .../royale/compiler/internal/test/TestBase.java | 4 +-- .../org/apache/royale/utils/AntTestAdapter.java | 2 +- 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml index 87057f3..3c572af 100644 --- a/compiler-externc/pom.xml +++ b/compiler-externc/pom.xml @@ -107,6 +107,19 @@ </excludes> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 834bce0..5208b9a 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -43,15 +43,12 @@ <include>org/**/Test*.java</include> </includes> <excludes> - <exclude>org/apache/royale/compiler/internal/codegen/externals/**</exclude> - <exclude>org/apache/royale/compiler/internal/codegen/js/royale/**</exclude> - <exclude>**/TestGoogClass.java</exclude> - <exclude>**/TestGoogEmitter.java</exclude> - <exclude>**/TestGoogFile.java</exclude> - <exclude>**/TestRoyaleMXMLApplication.java</exclude> - <exclude>**/TestRoyaleMXMLScript.java</exclude> - <exclude>**/TestSourceMapMXMLScript.java</exclude> - <exclude>**/TestSourceMapMXMLEvents.java</exclude> + <exclude>**/TestRoyaleFile.java</exclude> + <exclude>**/TestRoyaleMXML*.java</exclude> + <exclude>**/TestSourceMap*.java</exclude> + <exclude>**/TestMXML*.java</exclude> + <exclude>**/TestRoyaleClass.java</exclude> + <exclude>**/TestTypedefsCompile.java</exclude> </excludes> </configuration> </plugin> @@ -62,14 +59,10 @@ <version>2.18.1</version> <configuration> <includes> - <include>org/apache/royale/compiler/internal/codegen/js/royale/Test*.java</include> - <!-- Disabled for now as these tests require the royale-typedefs repo to be located in a pre-defined location --> - <!--include>org/apache/royale/compiler/internal/codegen/externals/Test*.java</include--> + <include>**/TestMXML*.java</include> </includes> <excludes> - <!-- This test seems to have issues. --> - <exclude>**/TestRoyaleFile.java</exclude> - <exclude>**/TestRoyaleProject.java</exclude> + <exclude>**/TestTypedefsCompile.java</exclude> </excludes> </configuration> </plugin> @@ -84,6 +77,11 @@ </dependency> <dependency> <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-externc</artifactId> + <version>0.9.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.royale.compiler</groupId> <artifactId>compiler</artifactId> <version>0.9.0-SNAPSHOT</version> </dependency> @@ -126,6 +124,14 @@ <version>4.10</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-externc</artifactId> + <version>0.9.0-SNAPSHOT</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> </project> diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/MXMLTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/MXMLTestBase.java index 953f41f..5235ffc 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/MXMLTestBase.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/MXMLTestBase.java @@ -67,8 +67,8 @@ public class MXMLTestBase extends TestBase { namespaceMappings.add(new MXMLNamespaceMapping( "http://ns.adobe.com/mxml/2009", - FilenameNormalization.normalize("../../../compiler/src/test/resources/mxml-2009-manifest.xml"))); - String customManifestPath = FilenameNormalization.normalize("../../../compiler/src/test/resources/custom-manifest.xml"); + FilenameNormalization.normalize("../compiler/src/test/resources/mxml-2009-manifest.xml"))); + String customManifestPath = FilenameNormalization.normalize("../compiler/src/test/resources/custom-manifest.xml"); namespaceMappings.add(new MXMLNamespaceMapping( "library://ns.apache.org/royale/test", customManifestPath)); 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 357328b..950d2c0 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 @@ -681,9 +681,9 @@ public class TestBase implements ITestBase addLibraries(libraries); if (libraries.size() == 0) { - String jsSwcPath = FilenameNormalization.normalize("../../../compiler-externc/target/js.swc"); + String jsSwcPath = FilenameNormalization.normalize("../compiler-externc/target/js.swc"); libraries.add(new File(jsSwcPath)); - String customSwcPath = FilenameNormalization.normalize("../../../compiler/target/custom.swc"); + String customSwcPath = FilenameNormalization.normalize("../compiler/target/custom.swc"); libraries.add(new File(customSwcPath)); } addNamespaceMappings(namespaceMappings); diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java index 66ce772..363b4af 100644 --- a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java +++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java @@ -41,7 +41,7 @@ public class AntTestAdapter implements ITestAdapter { @Override public String getTempDir() { - return FilenameNormalization.normalize("../../target/junit-temp"); // ensure this exists + return FilenameNormalization.normalize("target/junit-temp"); // ensure this exists } @Override -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.