Repository: flex-falcon Updated Branches: refs/heads/develop 0b0d65143 -> 273f08198 - Made all compilers ignore non "swc" dependencies - Removed the functionality to auto-zip the JS compiler output as we are doing this with the maven-war-plugin now Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/273f0819 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/273f0819 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/273f0819 Branch: refs/heads/develop Commit: 273f08198f9dd3d0d515cf152f0f0f931d258ec8 Parents: 0b0d651 Author: Christofer Dutz Authored: Wed Jul 6 14:20:35 2016 +0200 Committer: Christofer Dutz Committed: Wed Jul 6 14:20:35 2016 +0200 ---------------------------------------------------------------------- .../org/apache/flex/maven/flexjs/BaseMojo.java | 4 +-- .../flex/maven/flexjs/CompileAppMojo.java | 30 ++++---------------- 2 files changed, 7 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/273f0819/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 e02f073..7452c6d 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 @@ -268,8 +268,8 @@ public abstract class BaseMojo List filteredLibraries = new LinkedList(); if(artifacts != null) { for(Artifact artifact : artifacts) { - // Strip out resource-bundles (for now). - if(!"rb.swc".equals(artifact.getType())) { + // Strip out non SWCs for now + if("swc".equals(artifact.getType())) { filteredLibraries.add(artifact); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/273f0819/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 42ffc04..ed01bd5 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 @@ -24,13 +24,8 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProjectHelper; import org.apache.velocity.VelocityContext; -import java.io.*; -import java.util.Collections; -import java.util.HashSet; +import java.io.File; import java.util.List; -import java.util.Set; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; /** * goal which compiles a project into a flexjs sef application. @@ -116,23 +111,8 @@ public class CompileAppMojo super.execute(); if(getOutput().exists()) { - // If it's JavaScript output we have to zip up the output - // and set the resulting zip file as the artifact file, or - // Maven will complain about missing packaging not assigning - // a file to the build. - if(outputJavaScript) { - File outputArchive = new File(outputDirectory, javascriptOutputFileName); - // If debug is turned on, package the debug output. - if(debug) { - zipDirectory(new File(getOutput(), "bin/js-debug"), outputArchive); - } - // If it's not turned on, package the release-version. - else { - zipDirectory(new File(getOutput(), "bin/js-release"), outputArchive); - } - // Attach the file created by the compiler as artifact file to maven. - mavenProjectHelper.attachArtifact(project, "war", outputArchive); - } else { + // If we are building JavaScript output, the war plugin will attach the war + if(!outputJavaScript) { // Attach the file created by the compiler as artifact file to maven. project.getArtifact().setFile(getOutput()); } @@ -210,7 +190,7 @@ public class CompileAppMojo return super.isForceSwcExternalLibraryPath(); } - private void zipDirectory(File source, File target) { + /*private void zipDirectory(File source, File target) { byte[] buffer = new byte[1024]; try { FileOutputStream fos = new FileOutputStream(target); @@ -266,6 +246,6 @@ public class CompileAppMojo String curFileRelativePath = curFile.getPath().substring(source.getPath().length() + 1); return Collections.singleton(curFileRelativePath); } - } + }*/ }