flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - - Continued working on compiling the ASJS modules with Maven - Succeeded with all except "CreateJS" and "XML"
Date Fri, 13 May 2016 22:33:21 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop bf715ec10 -> f3623046a


- Continued working on compiling the ASJS modules with Maven
- Succeeded with all except "CreateJS" and "XML"


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f3623046
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f3623046
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f3623046

Branch: refs/heads/develop
Commit: f3623046afa9f7d1c48d3b50696ca9d92667bd6f
Parents: bf715ec
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Fri May 13 15:33:13 2016 -0700
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Fri May 13 15:33:13 2016 -0700

----------------------------------------------------------------------
 externs/GCL/pom.xml                                          | 1 +
 externs/cordova/pom.xml                                      | 1 +
 externs/createjs/pom.xml                                     | 1 +
 externs/google_maps/pom.xml                                  | 1 +
 externs/jasmine/pom.xml                                      | 1 +
 externs/jquery/pom.xml                                       | 1 +
 externs/js/pom.xml                                           | 2 ++
 externs/node/pom.xml                                         | 1 +
 .../src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java | 6 ++++--
 .../java/org/apache/flex/maven/flexjs/CompileExternMojo.java | 5 ++++-
 .../java/org/apache/flex/maven/flexjs/CompileJSMojo.java     | 8 ++++++++
 .../src/main/resources/config/compile-as-config.xml          | 5 +++++
 .../src/main/resources/config/compile-extern-config.xml      | 4 ++++
 .../src/main/resources/config/compile-js-config.xml          | 8 ++++++--
 14 files changed, 40 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/externs/GCL/pom.xml
----------------------------------------------------------------------
diff --git a/externs/GCL/pom.xml b/externs/GCL/pom.xml
index de5593e..5d8d897 100644
--- a/externs/GCL/pom.xml
+++ b/externs/GCL/pom.xml
@@ -42,6 +42,7 @@
                 <version>0.7.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <includeSources>true</includeSources>
                     <skipSwc>true</skipSwc>
                 </configuration>
                 <dependencies>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/externs/cordova/pom.xml
----------------------------------------------------------------------
diff --git a/externs/cordova/pom.xml b/externs/cordova/pom.xml
index 3d32bbf..23c6b17 100644
--- a/externs/cordova/pom.xml
+++ b/externs/cordova/pom.xml
@@ -45,6 +45,7 @@
                 <version>0.7.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <includeSources>true</includeSources>
                     <externcInput>
                         <fileSet>
                             <directory>${project.basedir}/src/main/javascript</directory>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/externs/createjs/pom.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/pom.xml b/externs/createjs/pom.xml
index 19f8535..84a7442 100644
--- a/externs/createjs/pom.xml
+++ b/externs/createjs/pom.xml
@@ -180,6 +180,7 @@
                 <version>0.7.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <includeSources>true</includeSources>
                     <externcInput>
                         <fileSet>
                             <directory>${project.basedir}/src/main/javascript</directory>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/externs/google_maps/pom.xml
----------------------------------------------------------------------
diff --git a/externs/google_maps/pom.xml b/externs/google_maps/pom.xml
index b85f251..da0d2fa 100644
--- a/externs/google_maps/pom.xml
+++ b/externs/google_maps/pom.xml
@@ -93,6 +93,7 @@ google.maps = {};]]></replace></replace-regexp-operation>
                 <version>0.7.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <includeSources>true</includeSources>
                     <externcInput>
                         <fileSet>
                             <directory>${project.basedir}/target/downloads</directory>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/externs/jasmine/pom.xml
----------------------------------------------------------------------
diff --git a/externs/jasmine/pom.xml b/externs/jasmine/pom.xml
index 33acf51..3af179b 100644
--- a/externs/jasmine/pom.xml
+++ b/externs/jasmine/pom.xml
@@ -65,6 +65,7 @@
                 <version>0.7.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <includeSources>true</includeSources>
                     <externcInput>
                         <fileSet>
                             <directory>${project.basedir}/target/downloads</directory>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/externs/jquery/pom.xml
----------------------------------------------------------------------
diff --git a/externs/jquery/pom.xml b/externs/jquery/pom.xml
index bd7a7b2..fb70991 100644
--- a/externs/jquery/pom.xml
+++ b/externs/jquery/pom.xml
@@ -87,6 +87,7 @@
                 <version>0.7.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <includeSources>true</includeSources>
                     <externcInput>
                         <fileSet>
                             <directory>${project.basedir}/target/downloads</directory>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/externs/js/pom.xml
----------------------------------------------------------------------
diff --git a/externs/js/pom.xml b/externs/js/pom.xml
index 611b240..863643b 100644
--- a/externs/js/pom.xml
+++ b/externs/js/pom.xml
@@ -34,6 +34,7 @@
     <name>Apache Flex - FlexJS: Externs: JS</name>
 
     <build>
+        <sourceDirectory>src/main/flex</sourceDirectory>
         <plugins>
             <!-- Download JavaScript form GitHub -->
             <plugin>
@@ -124,6 +125,7 @@
                 <version>0.7.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <includeSources>true</includeSources>
                     <externcInput>
                         <fileSet>
                             <directory>${project.basedir}/src/main/javascript</directory>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/externs/node/pom.xml
----------------------------------------------------------------------
diff --git a/externs/node/pom.xml b/externs/node/pom.xml
index b0115fe..1727b52 100644
--- a/externs/node/pom.xml
+++ b/externs/node/pom.xml
@@ -67,6 +67,7 @@
                 <version>0.7.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <includeSources>true</includeSources>
                     <externcInput>
                         <fileSet>
                             <directory>${project.basedir}/src/main/javascript</directory>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
index 962ef19..62321bf 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
@@ -45,6 +45,9 @@ public abstract class BaseMojo
     private String targetPlayer = "11.1";
 
     @Parameter
+    private boolean includeSources = false;
+
+    @Parameter
     private boolean debug = false;
 
     @Parameter(readonly = true, defaultValue = "${repositorySystemSession}")
@@ -74,6 +77,7 @@ public abstract class BaseMojo
         context.put("namespaces", namespaces);
         context.put("includeClasses", includeClasses);
         context.put("targetPlayer", targetPlayer);
+        context.put("includeSources", includeSources);
         context.put("debug", debug);
         context.put("output", getOutput());
 
@@ -98,8 +102,6 @@ public abstract class BaseMojo
     protected List<String> getCompilerArgs(File configFile) {
         List<String> args = new LinkedList<String>();
         args.add("-load-config=" + configFile.getPath());
-//        args.add("+playerglobal.version=20.0");
-//        args.add("+env.AIR_HOME=20.0");
         return args;
     }
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
index 60f3411..b91cb2a 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
@@ -39,6 +39,9 @@ public class CompileExternMojo
     @Parameter(defaultValue = "${project.artifactId}-${project.version}-extern.swc")
     protected String outputFileName;
 
+    @Parameter(defaultValue = "false")
+    private boolean skipExtern;
+
     @Component
     private MavenProjectHelper projectHelper;
 
@@ -63,7 +66,7 @@ public class CompileExternMojo
 
     @Override
     protected boolean skip() {
-        return false;
+        return skipExtern;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
index b6e7780..1b181e6 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
@@ -79,6 +79,14 @@ public class CompileJSMojo
     }
 
     @Override
+    protected List<String> getCompilerArgs(File configFile) {
+        List<String> args = super.getCompilerArgs(configFile);
+        args.add("-js-output-type=FLEXJS");
+        args.add("-compiler.strict-xml=true");
+        return args;
+    }
+
+    @Override
     protected boolean includeLibrary(Artifact library) {
         return "extern".equalsIgnoreCase(library.getClassifier());
     }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/flexjs-maven-plugin/src/main/resources/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-as-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-as-config.xml
index de28c26..2526018 100644
--- a/flexjs-maven-plugin/src/main/resources/config/compile-as-config.xml
+++ b/flexjs-maven-plugin/src/main/resources/config/compile-as-config.xml
@@ -65,6 +65,7 @@
         </locale>
 
         <warn-no-constructor>false</warn-no-constructor>
+        <show-deprecation-warnings>false</show-deprecation-warnings>
 
         <define append="true">
             <name>COMPILE::JS</name>
@@ -77,6 +78,10 @@
     </compiler>
 
     <include-sources>
+#if($includeSources)
+#foreach($sourcePath in $sourcePaths)        <path-element>$sourcePath</path-element>
+#end
+#end
     </include-sources>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml
index 60346a1..1b399a8 100644
--- a/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml
+++ b/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml
@@ -63,6 +63,8 @@
         <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
         <binding-value-change-event-type>valueChange</binding-value-change-event-type>
 
+        <show-deprecation-warnings>false</show-deprecation-warnings>
+
         <define append="true">
             <name>COMPILE::JS</name>
             <value>true</value>
@@ -74,8 +76,10 @@
     </compiler>
 
     <include-sources>
+#if($includeSources)
 #foreach($sourcePath in $sourcePaths)        <path-element>$sourcePath</path-element>
 #end
+#end
     </include-sources>
 
     <include-namespaces>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f3623046/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml
index 61d1b5d..e1ece41 100644
--- a/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml
+++ b/flexjs-maven-plugin/src/main/resources/config/compile-js-config.xml
@@ -63,6 +63,8 @@
         <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
         <binding-value-change-event-type>valueChange</binding-value-change-event-type>
 
+        <show-deprecation-warnings>false</show-deprecation-warnings>
+
         <define append="true">
             <name>COMPILE::JS</name>
             <value>true</value>
@@ -73,10 +75,12 @@
         </define>
     </compiler>
 
-    <!--include-sources>
+    <include-sources>
+#if($includeSources)
 #foreach($sourcePath in $sourcePaths)        <path-element>$sourcePath</path-element>
 #end
-    </include-sources-->
+#end
+    </include-sources>
 
     <include-namespaces>
 #foreach($namespace in $namespaces)        <uri>$namespace.uri</uri>


Mime
View raw message