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:25:09 UTC
[1/2] git commit: [flex-falcon] [refs/heads/feature/maven-migration]
- Made the google_maps extern compile
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 <ch...@codecentric.de>
Authored: Sat Mar 19 14:24:27 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
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>
<!--
[2/2] git commit: [flex-falcon] [refs/heads/feature/maven-migration]
- Added some log output to the pre-process-sources mojo (now you can see what
files it's working on)
Posted by cd...@apache.org.
Added some log output to the pre-process-sources mojo (now you can see what files it's working on)
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/69c141d4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/69c141d4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/69c141d4
Branch: refs/heads/feature/maven-migration
Commit: 69c141d41b76e24198d43d6d7530d3e372cca248
Parents: bb93aec
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Mar 19 14:25:04 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Mar 19 14:25:04 2016 +0100
----------------------------------------------------------------------
.../flex/compiler/tools/patchfiles/PreProcessSourcesMojo.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/69c141d4/compiler-build-tools/src/main/java/org/apache/flex/compiler/tools/patchfiles/PreProcessSourcesMojo.java
----------------------------------------------------------------------
diff --git a/compiler-build-tools/src/main/java/org/apache/flex/compiler/tools/patchfiles/PreProcessSourcesMojo.java b/compiler-build-tools/src/main/java/org/apache/flex/compiler/tools/patchfiles/PreProcessSourcesMojo.java
index facd686..94028a6 100644
--- a/compiler-build-tools/src/main/java/org/apache/flex/compiler/tools/patchfiles/PreProcessSourcesMojo.java
+++ b/compiler-build-tools/src/main/java/org/apache/flex/compiler/tools/patchfiles/PreProcessSourcesMojo.java
@@ -66,6 +66,7 @@ public class PreProcessSourcesMojo
Set<File> candidates = scan.getIncludedSources(downloadesSourceDirectory, null);
for(File candidate : candidates) {
if(operations != null) {
+ getLog().info("- Processing file: " + candidate.getPath());
for (Operation operation : operations) {
try {
operation.perform(candidate);