flex-commits mailing list archives

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

Branch: refs/heads/feature/maven-migration
Commit: a7fe274140f93c1a73beb8e141279c1732b9c7cf
Parents: b988d21
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Sat Mar 19 14:00:09 2016 +0100
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Sat Mar 19 14:00:09 2016 +0100

----------------------------------------------------------------------
 externs/node/pom.xml                            | 27 +++++++++++++++++---
 externs/node/src/main/config/compile-config.xml |  8 +++---
 .../node/src/main/config/generate-config.xml    |  3 ++-
 3 files changed, 30 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a7fe2741/externs/node/pom.xml
----------------------------------------------------------------------
diff --git a/externs/node/pom.xml b/externs/node/pom.xml
index 9765bcf..b0fde8f 100644
--- a/externs/node/pom.xml
+++ b/externs/node/pom.xml
@@ -19,20 +19,41 @@
         <plugins>
             <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/a7fe2741/externs/node/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/node/src/main/config/compile-config.xml b/externs/node/src/main/config/compile-config.xml
index 66ae820..fe3b2a6 100644
--- a/externs/node/src/main/config/compile-config.xml
+++ b/externs/node/src/main/config/compile-config.xml
@@ -22,22 +22,22 @@
         <accessible>true</accessible>
         
         <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/functions</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/functions</path-element>
+        <path-element>../../../target/generated-sources/externc/functions</path-element>
     </include-sources>
 
     <include-file>
         <name>externs/node.js</name>
-        <path>externs/node.js</path>
+        <path>../javascript/node.js</path>
     </include-file>
 </flex-config>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a7fe2741/externs/node/src/main/config/generate-config.xml
----------------------------------------------------------------------
diff --git a/externs/node/src/main/config/generate-config.xml b/externs/node/src/main/config/generate-config.xml
index c09741b..ecde54f 100644
--- a/externs/node/src/main/config/generate-config.xml
+++ b/externs/node/src/main/config/generate-config.xml
@@ -24,13 +24,14 @@
         <locale/>
         
         <source-path>
-            <path-element>../javascript</path-element>
+            <path-element>src/main/javascript</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
     
     <external>
+        <path-element>../javascript/node.js</path-element>
     </external>
 
     <as-root>../../../target/generated-sources/externc</as-root>


Mime
View raw message