flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [8/9] git commit: [flex-falcon] [refs/heads/feature/maven-migration] - Made the jquery extern compile
Date Sat, 19 Mar 2016 13:00:24 GMT
Made the jquery 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/b988d210
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b988d210
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b988d210

Branch: refs/heads/feature/maven-migration
Commit: b988d21068a4b31fece0d1986af9d72697f23900
Parents: 591fd68
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Sat Mar 19 13:54:46 2016 +0100
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Sat Mar 19 13:54:46 2016 +0100

----------------------------------------------------------------------
 externs/jquery/pom.xml                          | 29 +++++++++++++++++---
 .../jquery/src/main/config/compile-config.xml   | 20 +++++++-------
 externs/pom.xml                                 |  2 +-
 3 files changed, 36 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b988d210/externs/jquery/pom.xml
----------------------------------------------------------------------
diff --git a/externs/jquery/pom.xml b/externs/jquery/pom.xml
index cb289b5..97e344a 100644
--- a/externs/jquery/pom.xml
+++ b/externs/jquery/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/b988d210/externs/jquery/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/jquery/src/main/config/compile-config.xml b/externs/jquery/src/main/config/compile-config.xml
index c290bdf..f3d8bd0 100644
--- a/externs/jquery/src/main/config/compile-config.xml
+++ b/externs/jquery/src/main/config/compile-config.xml
@@ -51,29 +51,29 @@
         -->
 		
         <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/constants</path-element>
-            <path-element>out/as/interfaces</path-element>
-            <path-element>out/as/typedefs</path-element>
+            <path-element>../../../target/generated-sources/externc/classes</path-element>
+            <path-element>../../../target/generated-sources/externc/constants</path-element>
+            <path-element>../../../target/generated-sources/externc/interfaces</path-element>
+            <path-element>../../../target/generated-sources/externc/typedefs</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/constants</path-element>
-        <path-element>out/as/interfaces</path-element>
-        <path-element>out/as/typedefs</path-element>
+        <path-element>../../../target/generated-sources/externc/classes</path-element>
+        <path-element>../../../target/generated-sources/externc/constants</path-element>
+        <path-element>../../../target/generated-sources/externc/interfaces</path-element>
+        <path-element>../../../target/generated-sources/externc/typedefs</path-element>
     </include-sources>
 
     <include-file>
         <name>externs/jquery-1.9.js</name>
-        <path>externs/jquery-1.9.js</path>
+        <path>../../../target/downloads/jquery-1.9.js</path>
     </include-file>
 
     <!--

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b988d210/externs/pom.xml
----------------------------------------------------------------------
diff --git a/externs/pom.xml b/externs/pom.xml
index ecd084f..834468d 100644
--- a/externs/pom.xml
+++ b/externs/pom.xml
@@ -21,7 +21,7 @@
         <module>GCL</module>
         <module>google_maps</module>
         <module>jasmine</module>
-        <!--module>jquery</module-->
+        <module>jquery</module>
         <module>js</module>
         <module>node</module>
     </modules>


Mime
View raw message