Repository: flex-falcon Updated Branches: refs/heads/develop b921b9b5a -> 9c7adb248
- Renamed two test exclusions to match recent class renamings - Updated the extern poms to supress swc compilation (hack which needs fine-tuning) Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9c7adb24 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9c7adb24 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9c7adb24 Branch: refs/heads/develop Commit: 9c7adb248e41bce0514b639eb1bc3684201ffd83 Parents: b921b9b Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Fri May 6 18:36:59 2016 +0200 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Fri May 6 18:36:59 2016 +0200 ---------------------------------------------------------------------- compiler-jx/pom.xml | 4 ++-- externs/GCL/pom.xml | 3 +++ externs/cordova/pom.xml | 3 ++- externs/createjs/pom.xml | 1 + externs/google_maps/pom.xml | 3 ++- externs/jasmine/pom.xml | 1 + externs/jquery/pom.xml | 1 + externs/js/pom.xml | 1 + externs/node/pom.xml | 1 + .../org/apache/flex/maven/flexjs/CompileASMojo.java | 5 ++++- .../org/apache/flex/maven/flexjs/CompileJSMojo.java | 14 +------------- .../src/main/resources/config/compile-js-config.xml | 8 ++++++-- 12 files changed, 25 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/compiler-jx/pom.xml ---------------------------------------------------------------------- diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 6affd81..fba2002 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -48,7 +48,7 @@ <exclude>org/apache/flex/compiler/internal/codegen/externals/**</exclude> <exclude>org/apache/flex/compiler/internal/codegen/js/flexjs/**</exclude> <exclude>**/TestGoogClass.java</exclude> - <exclude>**/TestGoogEmiter.java</exclude> + <exclude>**/TestGoogEmitter.java</exclude> <exclude>**/TestGoogFile.java</exclude> <exclude>**/TestVF2JSFile.java</exclude> <exclude>**/TestVF2JSMXMLApplication.java</exclude> @@ -76,7 +76,7 @@ <exclude>**/TestExternalsJSCompile.java</exclude> <exclude>**/TestFlexJSProject.java</exclude> <exclude>**/TestFlexJSMXMLApplication.java</exclude> - <exclude>**/TestFlexJSEmiter.java</exclude> + <exclude>**/TestFlexJSEmitter.java</exclude> <exclude>**/TestFlexJSClass.java</exclude> <exclude>**/TestFlexJSExpressions.java</exclude> <exclude>**/TestFlexJSFile.java</exclude> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/externs/GCL/pom.xml ---------------------------------------------------------------------- diff --git a/externs/GCL/pom.xml b/externs/GCL/pom.xml index d3794f4..91b4c04 100644 --- a/externs/GCL/pom.xml +++ b/externs/GCL/pom.xml @@ -41,6 +41,9 @@ <artifactId>flexjs-maven-plugin</artifactId> <version>0.6.0-SNAPSHOT</version> <extensions>true</extensions> + <configuration> + <skipSwc>true</skipSwc> + </configuration> <dependencies> <dependency> <groupId>org.apache.flex.flexjs.compiler</groupId> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/externs/cordova/pom.xml ---------------------------------------------------------------------- diff --git a/externs/cordova/pom.xml b/externs/cordova/pom.xml index 4be8ca7..90b3b6f 100644 --- a/externs/cordova/pom.xml +++ b/externs/cordova/pom.xml @@ -53,7 +53,8 @@ </includes> </fileSet> </externcInput> - </configuration> + <skipSwc>true</skipSwc> + </configuration> <dependencies> <dependency> <groupId>org.apache.flex.flexjs.compiler</groupId> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/externs/createjs/pom.xml ---------------------------------------------------------------------- diff --git a/externs/createjs/pom.xml b/externs/createjs/pom.xml index 5d1bff7..c3e00f0 100644 --- a/externs/createjs/pom.xml +++ b/externs/createjs/pom.xml @@ -222,6 +222,7 @@ </class-exclude> </class-excludes> </externcConfig> + <skipSwc>true</skipSwc> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/externs/google_maps/pom.xml ---------------------------------------------------------------------- diff --git a/externs/google_maps/pom.xml b/externs/google_maps/pom.xml index 46bec98..cb82cc0 100644 --- a/externs/google_maps/pom.xml +++ b/externs/google_maps/pom.xml @@ -101,7 +101,8 @@ google.maps = {};]]></replace></replace-regexp-operation> </includes> </fileSet> </externcInput> - </configuration> + <skipSwc>true</skipSwc> + </configuration> <dependencies> <dependency> <groupId>org.apache.flex.flexjs.compiler</groupId> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/externs/jasmine/pom.xml ---------------------------------------------------------------------- diff --git a/externs/jasmine/pom.xml b/externs/jasmine/pom.xml index beeed4c..9d5edd2 100644 --- a/externs/jasmine/pom.xml +++ b/externs/jasmine/pom.xml @@ -87,6 +87,7 @@ </exclude> </excludes> </externcConfig> + <skipSwc>true</skipSwc> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/externs/jquery/pom.xml ---------------------------------------------------------------------- diff --git a/externs/jquery/pom.xml b/externs/jquery/pom.xml index 7301182..4e9739f 100644 --- a/externs/jquery/pom.xml +++ b/externs/jquery/pom.xml @@ -158,6 +158,7 @@ </exclude> </excludes> </externcConfig> + <skipSwc>true</skipSwc> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/externs/js/pom.xml ---------------------------------------------------------------------- diff --git a/externs/js/pom.xml b/externs/js/pom.xml index b012d90..8cfdc2e 100644 --- a/externs/js/pom.xml +++ b/externs/js/pom.xml @@ -203,6 +203,7 @@ </exclude> </excludes> </externcConfig> + <skipSwc>true</skipSwc> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/externs/node/pom.xml ---------------------------------------------------------------------- diff --git a/externs/node/pom.xml b/externs/node/pom.xml index 52adfd8..f084aba 100644 --- a/externs/node/pom.xml +++ b/externs/node/pom.xml @@ -89,6 +89,7 @@ </exclude> </excludes> </externcConfig> + <skipSwc>true</skipSwc> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java index 52db4bb..26635e8 100644 --- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java +++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java @@ -37,6 +37,9 @@ public class CompileASMojo @Parameter(defaultValue = "${project.artifactId}-${project.version}.swc") private String outputFileName; + @Parameter(defaultValue = "false") + private boolean skipSwc; + @Override protected String getToolGroupName() { return "Falcon"; @@ -59,7 +62,7 @@ public class CompileASMojo @Override protected boolean skip() { - return false; + return skipSwc; } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/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 3e0bcc9..b6e7780 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 @@ -63,19 +63,7 @@ public class CompileJSMojo @Override protected boolean skip() { - return false; - } - - @Override - protected List<String> getCompilerArgs(File configFile) { - List<String> args = super.getCompilerArgs(configFile); - //args.add("+flexlib=/Users/christoferdutz/Devtools/Apache/apache-flex-4.15.0/frameworks"); - //args.add("+flexlib=/Users/christoferdutz/Projects/Apache/Flex/flex-asjs/frameworks"); - args.add("-js-output-type=FLEXJS"); - args.add("-define=COMPILE::AS3,false"); - args.add("-define=COMPILE::JS,true"); - //args.add("-keep-asdoc"); - return args; + return skipSwc; } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c7adb24/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 60346a1..61d1b5d 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 @@ -73,10 +73,10 @@ </define> </compiler> - <include-sources> + <!--include-sources> #foreach($sourcePath in $sourcePaths) <path-element>$sourcePath</path-element> #end - </include-sources> + </include-sources--> <include-namespaces> #foreach($namespace in $namespaces) <uri>$namespace.uri</uri> @@ -88,6 +88,10 @@ #end </include-classes> + <js-output-type>FLEXJS</js-output-type> + + <keep-asdoc>true</keep-asdoc> + <output>${output}</output> </flex-config>
