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:23 UTC
[7/9] git commit: [flex-falcon] [refs/heads/feature/maven-migration]
- Made the jasmine extern compile
Made the jasmine 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/591fd68f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/591fd68f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/591fd68f
Branch: refs/heads/feature/maven-migration
Commit: 591fd68f776f273af97af2a2d70552b9df7af7f6
Parents: 4520096
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Mar 19 13:51:27 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Mar 19 13:51:27 2016 +0100
----------------------------------------------------------------------
externs/jasmine/pom.xml | 29 +++++++++++++++++---
.../jasmine/src/main/config/compile-config.xml | 12 ++++----
2 files changed, 31 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/591fd68f/externs/jasmine/pom.xml
----------------------------------------------------------------------
diff --git a/externs/jasmine/pom.xml b/externs/jasmine/pom.xml
index e4e732d..ab2b95d 100644
--- a/externs/jasmine/pom.xml
+++ b/externs/jasmine/pom.xml
@@ -29,7 +29,7 @@
<executions>
<execution>
<id>get-createjs</id>
- <phase>generate-resources</phase>
+ <phase>validate</phase>
<goals>
<goal>wget</goal>
</goals>
@@ -43,20 +43,41 @@
</plugin>
<plugin>
<groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>externc-maven-plugin</artifactId>
+ <artifactId>flexjs-maven-plugin</artifactId>
<version>0.6.0-SNAPSHOT</version>
<executions>
- <!-- Generate the ActionScript interface -->
<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>
+ <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/591fd68f/externs/jasmine/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/jasmine/src/main/config/compile-config.xml b/externs/jasmine/src/main/config/compile-config.xml
index 2af1e2a..8636ee9 100644
--- a/externs/jasmine/src/main/config/compile-config.xml
+++ b/externs/jasmine/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/functions</path-element>
+ <path-element>../../../target/generated-sources/externc/classes</path-element>
+ <path-element>../../../target/generated-sources/externc/functions</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/functions</path-element>
+ <path-element>../../../target/generated-sources/externc/classes</path-element>
+ <path-element>../../../target/generated-sources/externc/functions</path-element>
</include-sources>
<include-file>
<name>externs/jasmine-2.0.js</name>
- <path>externs/jasmine-2.0.js</path>
+ <path>../../../target/downloads/jasmine-2.0.js</path>
</include-file>
<!--