You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/03/19 14:00:20 UTC
[4/9] git commit: [flex-falcon] [refs/heads/feature/maven-migration]
- Made the createjs extern compile
Made the createjs 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/6858a6f9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6858a6f9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6858a6f9
Branch: refs/heads/feature/maven-migration
Commit: 6858a6f9be74b0442df0bd5d49b456f175e3c85f
Parents: e8fe514
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Mar 19 13:40:13 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Mar 19 13:40:13 2016 +0100
----------------------------------------------------------------------
externs/createjs/pom.xml | 46 ++++++++++++++------
.../createjs/src/main/config/compile-config.xml | 14 +++---
2 files changed, 42 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6858a6f9/externs/createjs/pom.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/pom.xml b/externs/createjs/pom.xml
index c9cc721..066b653 100644
--- a/externs/createjs/pom.xml
+++ b/externs/createjs/pom.xml
@@ -29,7 +29,7 @@
<executions>
<execution>
<id>get-createjs</id>
- <phase>generate-resources</phase>
+ <phase>validate</phase>
<goals>
<goal>wget</goal>
</goals>
@@ -49,7 +49,7 @@
<executions>
<execution>
<id>pre-process-sources</id>
- <phase>generate-resources</phase>
+ <phase>validate</phase>
<goals>
<goal>pre-process-sources</goal>
</goals>
@@ -89,7 +89,7 @@
</execution>
<execution>
<id>pre-process-sources-ticker</id>
- <phase>generate-resources</phase>
+ <phase>validate</phase>
<goals>
<goal>pre-process-sources</goal>
</goals>
@@ -108,7 +108,7 @@
<!-- Cut off the end of Graphics.js -->
<execution>
<id>pre-process-sources-graphics</id>
- <phase>generate-resources</phase>
+ <phase>validate</phase>
<goals>
<goal>pre-process-sources</goal>
</goals>
@@ -127,7 +127,7 @@
<!-- It seems that excluding the files doesn't work, so we have to delete them -->
<execution>
<id>pre-process-delete-unused</id>
- <phase>generate-resources</phase>
+ <phase>validate</phase>
<goals>
<goal>pre-process-sources</goal>
</goals>
@@ -141,14 +141,6 @@
</operations>
</configuration>
</execution>
- <!-- Generate the ActionScript interface -->
- <execution>
- <id>generate</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
</executions>
<configuration>
<!-- Take the JavaScript from the previously downloaded and unpacked distribution -->
@@ -158,6 +150,34 @@
</includes>
</configuration>
</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-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler-jx</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6858a6f9/externs/createjs/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/src/main/config/compile-config.xml b/externs/createjs/src/main/config/compile-config.xml
index ffcf29b..e6628f3 100644
--- a/externs/createjs/src/main/config/compile-config.xml
+++ b/externs/createjs/src/main/config/compile-config.xml
@@ -49,13 +49,13 @@
</namespace>
</namespaces>
-->
-
+
<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>../../../target/generated-sources/externc/classes</path-element>
<!--
<path-element>out/as/constants</path-element>
<path-element>out/as/functions</path-element>
@@ -68,7 +68,7 @@
</compiler>
<include-sources>
- <path-element>out/as/classes</path-element>
+ <path-element>../../../target/generated-sources/externc/classes</path-element>
<!--
<path-element>out/as/constants</path-element>
<path-element>out/as/functions</path-element>
@@ -78,8 +78,12 @@
</include-sources>
<include-file>
+ <name>externs/missing.js</name>
+ <path>../javascript/missing.js</path>
+ </include-file>
+ <include-file>
<name>externs/*</name>
- <path>out/externs/*</path>
+ <path>../../../target/EaselJS-0.8.0/src</path>
</include-file>
<!--
<include-file>