Repository: flex-falcon Updated Branches: refs/heads/feature/maven-migration a7fe27414 -> 69c141d41
Made the google_maps extern compile Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bb93aec6 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bb93aec6 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bb93aec6 Branch: refs/heads/feature/maven-migration Commit: bb93aec6102240cd0c2e0de7125d06f833c4fd7b Parents: a7fe274 Author: Christofer Dutz <[email protected]> Authored: Sat Mar 19 14:24:27 2016 +0100 Committer: Christofer Dutz <[email protected]> Committed: Sat Mar 19 14:24:27 2016 +0100 ---------------------------------------------------------------------- externs/google_maps/pom.xml | 41 +++++++++++++++----- .../src/main/config/compile-config.xml | 12 +++--- 2 files changed, 38 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb93aec6/externs/google_maps/pom.xml ---------------------------------------------------------------------- diff --git a/externs/google_maps/pom.xml b/externs/google_maps/pom.xml index fe23c37..7a94070 100644 --- a/externs/google_maps/pom.xml +++ b/externs/google_maps/pom.xml @@ -29,7 +29,7 @@ <executions> <execution> <id>get-createjs</id> - <phase>generate-resources</phase> + <phase>validate</phase> <goals> <goal>wget</goal> </goals> @@ -48,7 +48,7 @@ <executions> <execution> <id>pre-process-sources</id> - <phase>generate-resources</phase> + <phase>validate</phase> <goals> <goal>pre-process-sources</goal> </goals> @@ -62,27 +62,50 @@ var google = {}; /** @const */ google.maps = {};]]></replace></replace-regexp-operation> </operations> + <includes> + <include>**/*.js</include> + </includes> </configuration> </execution> - <!-- Generate the ActionScript interface --> + </executions> + </plugin> + <plugin> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>flexjs-maven-plugin</artifactId> + <version>0.6.0-SNAPSHOT</version> + <executions> <execution> <id>generate</id> - <phase>generate-resources</phase> + <phase>generate-sources</phase> <goals> <goal>generate</goal> </goals> </execution> + <execution> + <id>compile</id> + <phase>compile</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> </executions> - <configuration> - <includes> - <include>**/*.js</include> - </includes> - </configuration> + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>compiler-jx</artifactId> + <version>0.6.0-SNAPSHOT</version> + </dependency> + </dependencies> </plugin> </plugins> </build> <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>flex-compiler-externs-js</artifactId> + <version>0.6.0-SNAPSHOT</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb93aec6/externs/google_maps/src/main/config/compile-config.xml ---------------------------------------------------------------------- diff --git a/externs/google_maps/src/main/config/compile-config.xml b/externs/google_maps/src/main/config/compile-config.xml index ff0d4fc..1892535 100644 --- a/externs/google_maps/src/main/config/compile-config.xml +++ b/externs/google_maps/src/main/config/compile-config.xml @@ -51,25 +51,25 @@ --> <external-library-path> - <path-element>../js/out/bin/js.swc</path-element> + <path-element>../../../../js/target/flex-compiler-externs-js-0.6.0-SNAPSHOT.swc</path-element> </external-library-path> <source-path> - <path-element>out/as/classes</path-element> - <path-element>out/as/interfaces</path-element> + <path-element>../../../target/generated-sources/externc/classes</path-element> + <path-element>../../../target/generated-sources/externc/interfaces</path-element> </source-path> <warn-no-constructor>false</warn-no-constructor> </compiler> <include-sources> - <path-element>out/as/classes</path-element> - <path-element>out/as/interfaces</path-element> + <path-element>../../../target/generated-sources/externc/classes</path-element> + <path-element>../../../target/generated-sources/externc/interfaces</path-element> </include-sources> <include-file> <name>externs/google_maps_api_v3_11.js</name> - <path>externs/google_maps_api_v3_11.js</path> + <path>../../../target/downloads/google_maps_api_v3_11.js</path> </include-file> <!--
