Repository: flex-falcon Updated Branches: refs/heads/develop 8c5eb3b1f -> 5c97ee2cd
- Renamed the "extern" artifacts (classifier=extern) to "typedefs" - Updated the Maven coordinates and classifiers in the framework module to reflect the latest changes Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/5c97ee2c Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/5c97ee2c Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/5c97ee2c Branch: refs/heads/develop Commit: 5c97ee2cdf3945ce937f936a5abe642644d4b9d7 Parents: 8c5eb3b Author: Christofer Dutz <[email protected]> Authored: Mon Jul 18 09:25:00 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Mon Jul 18 09:25:00 2016 +0200 ---------------------------------------------------------------------- .../apache/flex/maven/flexjs/CompileASMojo.java | 2 +- .../flex/maven/flexjs/CompileAppMojo.java | 2 +- .../flex/maven/flexjs/CompileExternMojo.java | 106 ------------------- .../apache/flex/maven/flexjs/CompileJSMojo.java | 2 +- .../flex/maven/flexjs/CompileTypedefsMojo.java | 106 +++++++++++++++++++ 5 files changed, 109 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5c97ee2c/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 668a1e7..f705cb6 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 @@ -98,7 +98,7 @@ public class CompileASMojo @Override protected boolean includeLibrary(Artifact library) { - return !"extern".equalsIgnoreCase(library.getClassifier()); + return !"typedefs".equalsIgnoreCase(library.getClassifier()); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5c97ee2c/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java index ed01bd5..d407143 100644 --- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java +++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java @@ -177,7 +177,7 @@ public class CompileAppMojo @Override protected boolean includeLibrary(Artifact library) { // Strip out all externs except if the dependency was declared inside the pom itself. - return !"extern".equalsIgnoreCase(library.getClassifier()) || + return !"typedefs".equalsIgnoreCase(library.getClassifier()) || (outputJavaScript && library.getDependencyTrail().size() == 2); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5c97ee2c/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 deleted file mode 100644 index 57e06d7..0000000 --- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.flex.maven.flexjs; - -import org.apache.flex.tools.FlexTool; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugins.annotations.Component; -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; -import org.apache.maven.project.MavenProjectHelper; - -import java.io.File; -import java.util.LinkedList; -import java.util.List; - -/** - * goal which compiles a project into a flexjs swc library. - */ -@Mojo(name="compile-extern",defaultPhase = LifecyclePhase.PROCESS_SOURCES) -public class CompileExternMojo - extends BaseMojo -{ - - @Parameter(defaultValue = "${project.artifactId}-${project.version}-extern.swc") - protected String outputFileName; - - @Parameter(defaultValue = "false") - private boolean skipExtern; - - @Component - private MavenProjectHelper projectHelper; - - @Override - protected String getToolGroupName() { - return "Falcon"; - } - - @Override - protected String getFlexTool() { - return FlexTool.FLEX_TOOL_COMPC; - } - - @Override - protected String getConfigFileName() { - return "compile-extern-config.xml"; - } - - protected File getOutput() { - return new File(outputDirectory, outputFileName); - } - - @Override - protected boolean skip() { - return skipExtern; - } - - @Override - public void execute() throws MojoExecutionException - { - super.execute(); - - if(getOutput().exists()) { - // Add the extern to the artifact. - projectHelper.attachArtifact(project, getOutput(), "extern"); - } - } - - @Override - protected List<Namespace> getNamespaces() { - List<Namespace> namespaces = new LinkedList<Namespace>(); - for(Namespace namespace : super.getNamespaces()) { - if(namespace.getType().equals(Namespace.TYPE_DEFAULT) || namespace.getType().equals(Namespace.TYPE_JS)) { - namespaces.add(namespace); - } - } - return namespaces; - } - - @Override - protected List<Define> getDefines() { - List<Define> defines = super.getDefines(); - defines.add(new Define("COMPILE::JS", "true")); - defines.add(new Define("COMPILE::SWF", "false")); - return defines; - } - - @Override - protected boolean includeLibrary(Artifact library) { - return "extern".equalsIgnoreCase(library.getClassifier()); - } - -} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5c97ee2c/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 50d5d53..59b77ea 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 @@ -119,7 +119,7 @@ public class CompileJSMojo @Override protected boolean includeLibrary(Artifact library) { - return "extern".equalsIgnoreCase(library.getClassifier()); + return "typedefs".equalsIgnoreCase(library.getClassifier()); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5c97ee2c/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileTypedefsMojo.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileTypedefsMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileTypedefsMojo.java new file mode 100644 index 0000000..013c778 --- /dev/null +++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileTypedefsMojo.java @@ -0,0 +1,106 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flex.maven.flexjs; + +import org.apache.flex.tools.FlexTool; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.project.MavenProjectHelper; + +import java.io.File; +import java.util.LinkedList; +import java.util.List; + +/** + * goal which compiles a project into a flexjs swc library. + */ +@Mojo(name="compile-extern",defaultPhase = LifecyclePhase.PROCESS_SOURCES) +public class CompileTypedefsMojo + extends BaseMojo +{ + + @Parameter(defaultValue = "${project.artifactId}-${project.version}-extern.swc") + protected String outputFileName; + + @Parameter(defaultValue = "false") + private boolean skipExtern; + + @Component + private MavenProjectHelper projectHelper; + + @Override + protected String getToolGroupName() { + return "Falcon"; + } + + @Override + protected String getFlexTool() { + return FlexTool.FLEX_TOOL_COMPC; + } + + @Override + protected String getConfigFileName() { + return "compile-extern-config.xml"; + } + + protected File getOutput() { + return new File(outputDirectory, outputFileName); + } + + @Override + protected boolean skip() { + return skipExtern; + } + + @Override + public void execute() throws MojoExecutionException + { + super.execute(); + + if(getOutput().exists()) { + // Add the extern to the artifact. + projectHelper.attachArtifact(project, getOutput(), "typedefs"); + } + } + + @Override + protected List<Namespace> getNamespaces() { + List<Namespace> namespaces = new LinkedList<Namespace>(); + for(Namespace namespace : super.getNamespaces()) { + if(namespace.getType().equals(Namespace.TYPE_DEFAULT) || namespace.getType().equals(Namespace.TYPE_JS)) { + namespaces.add(namespace); + } + } + return namespaces; + } + + @Override + protected List<Define> getDefines() { + List<Define> defines = super.getDefines(); + defines.add(new Define("COMPILE::JS", "true")); + defines.add(new Define("COMPILE::SWF", "false")); + return defines; + } + + @Override + protected boolean includeLibrary(Artifact library) { + return "typedefs".equalsIgnoreCase(library.getClassifier()); + } + +}
