move compile-js after compile-as so new COMPJSC can inject js files into the SWC. No more need for generated-sources folder for framework swcs
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e02ae9e0 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e02ae9e0 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e02ae9e0 Branch: refs/heads/feature-autobuild/maven-archetypes Commit: e02ae9e0651cf9d1564d422c0bcc77766f303e99 Parents: f84ae9a Author: Alex Harui <aha...@apache.org> Authored: Tue Oct 4 11:09:46 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Tue Oct 4 11:09:46 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java | 6 +++--- .../src/main/resources/META-INF/plexus/components.xml | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e02ae9e0/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 59b77ea..7f0506c 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 @@ -33,8 +33,8 @@ public class CompileJSMojo extends BaseMojo { - @Parameter(defaultValue = "generated-sources/flexjs") - private String outputDirectoryName; + @Parameter(defaultValue = "${project.artifactId}-${project.version}.swc") + private String outputFileName; @Parameter(defaultValue = "false") private boolean skipSwc; @@ -59,7 +59,7 @@ public class CompileJSMojo @Override protected File getOutput() { - return new File(outputDirectory, outputDirectoryName); + return new File(outputDirectory, outputFileName); } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e02ae9e0/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml index e732c38..78dbe96 100644 --- a/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml +++ b/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml @@ -39,15 +39,13 @@ Moved to the process-sources phase as we might want to generate JavaScript from generated sources. --> - <process-sources> - org.apache.flex.flexjs.compiler:flexjs-maven-plugin:compile-js - </process-sources> <process-resources> org.apache.maven.plugins:maven-resources-plugin:resources </process-resources> <!-- Compile the ActionScript to Flash (SWC) --> <compile> org.apache.flex.flexjs.compiler:flexjs-maven-plugin:compile-as, + org.apache.flex.flexjs.compiler:flexjs-maven-plugin:compile-js, org.apache.flex.flexjs.compiler:flexjs-maven-plugin:compile-extern, </compile> <process-test-resources>
