Repository: flex-asjs Updated Branches: refs/heads/dual a363f8c3c -> 8d5fe2c67
try to get native examples to build. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d83e462c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d83e462c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d83e462c Branch: refs/heads/dual Commit: d83e462c4cc4ebff8e3f6c8f4dc04ea5eb3973b0 Parents: a363f8c Author: Alex Harui <[email protected]> Authored: Thu Mar 2 21:56:13 2017 -0800 Committer: Alex Harui <[email protected]> Committed: Thu Mar 2 21:56:13 2017 -0800 ---------------------------------------------------------------------- examples/native/AngularExample/pom.xml | 1 + examples/native/ButtonExample/pom.xml | 1 + examples/native/USStatesMap/pom.xml | 1 + examples/native/pom.xml | 23 +++++++++++++++-------- examples/pom.xml | 15 +-------------- 5 files changed, 19 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d83e462c/examples/native/AngularExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/native/AngularExample/pom.xml b/examples/native/AngularExample/pom.xml index 28d3b63..8743fc7 100644 --- a/examples/native/AngularExample/pom.xml +++ b/examples/native/AngularExample/pom.xml @@ -43,6 +43,7 @@ <extensions>true</extensions> <configuration> <mainClass>AngularExample.as</mainClass> + <targets>JS</targets> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d83e462c/examples/native/ButtonExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/native/ButtonExample/pom.xml b/examples/native/ButtonExample/pom.xml index e2acc18..7de1b4e 100644 --- a/examples/native/ButtonExample/pom.xml +++ b/examples/native/ButtonExample/pom.xml @@ -43,6 +43,7 @@ <extensions>true</extensions> <configuration> <mainClass>ButtonExample.as</mainClass> + <targets>JS</targets> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d83e462c/examples/native/USStatesMap/pom.xml ---------------------------------------------------------------------- diff --git a/examples/native/USStatesMap/pom.xml b/examples/native/USStatesMap/pom.xml index 8f4540d..daed565 100644 --- a/examples/native/USStatesMap/pom.xml +++ b/examples/native/USStatesMap/pom.xml @@ -43,6 +43,7 @@ <extensions>true</extensions> <configuration> <mainClass>USStatesMap.as</mainClass> + <targets>JS</targets> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d83e462c/examples/native/pom.xml ---------------------------------------------------------------------- diff --git a/examples/native/pom.xml b/examples/native/pom.xml index 64d211e..a0e8bb3 100644 --- a/examples/native/pom.xml +++ b/examples/native/pom.xml @@ -35,8 +35,9 @@ <name>Apache Flex - FlexJS: Examples: Native</name> <modules> - <!-- Seems to be missing a module with the angular types --> + <!-- Seems to be missing a module with the angular types <module>AngularExample</module> + --> <!-- Also seems to be missing something --> <module>ButtonExample</module> <!-- Also seems to be missing something --> @@ -44,13 +45,19 @@ </modules> <dependencies> - <dependency> - <groupId>com.adobe.flash.framework</groupId> - <artifactId>playerglobal</artifactId> - <version>${flash.version}</version> - <type>swc</type> - <scope>provided</scope> - </dependency> + <!-- + By declaring this dependency here, we force the flexjs-externs-js to be + added to the external library path of all modules. Without this it would + have gone to the library path. + --> + <dependency> + <groupId>org.apache.flex.flexjs.typedefs</groupId> + <artifactId>flexjs-typedefs-js</artifactId> + <version>${flexjs.typedefs.version}</version> + <type>swc</type> + <classifier>typedefs</classifier> + <scope>runtime</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d83e462c/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index b328e7c..2ebcc32 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -40,7 +40,7 @@ <modules> <module>flexjs</module> - <!--module>native</module--> + <module>native</module> <module>examples-tests</module> <module>examples-integrationtests</module> @@ -70,19 +70,6 @@ <artifactId>flexjs-maven-plugin</artifactId> <version>${flexjs.compiler.version}</version> <extensions>true</extensions> - <executions> - <!-- Add a second execution with output set to JavaScript (Flash is the default) --> - <execution> - <id>compile-javascript</id> - <phase>compile</phase> - <goals> - <goal>compile-app</goal> - </goals> - <configuration> - <outputJavaScript>true</outputJavaScript> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
