summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-27 14:23:04 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-27 14:23:04 +0100
commit7b37aa82c72edb6e1e15768367e76621ddfbadfc (patch)
tree2462a0864bb2e954f063efe40401f4434b641d69 /src/main
parent92ec9b8e2f069406cad40d9466bf449cac0e3dee (diff)
downloadmaven-nar-plugin-7b37aa82c72edb6e1e15768367e76621ddfbadfc.tar.gz
maven-nar-plugin-7b37aa82c72edb6e1e15768367e76621ddfbadfc.tar.bz2
maven-nar-plugin-7b37aa82c72edb6e1e15768367e76621ddfbadfc.tar.xz
maven-nar-plugin-7b37aa82c72edb6e1e15768367e76621ddfbadfc.zip
Fixed NAR-109
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/AbstractNarLayout.java1
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/Compiler.java12
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/Fortran.java1
3 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractNarLayout.java b/src/main/java/org/apache/maven/plugin/nar/AbstractNarLayout.java
index e5dc7b5..2d13e63 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractNarLayout.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractNarLayout.java
@@ -29,7 +29,6 @@ import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.archiver.zip.ZipArchiver;
/**
* @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
diff --git a/src/main/java/org/apache/maven/plugin/nar/Compiler.java b/src/main/java/org/apache/maven/plugin/nar/Compiler.java
index bfbece5..3c18951 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Compiler.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Compiler.java
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.nar;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -217,6 +218,13 @@ public abstract class Compiler
* @required
*/
private boolean clearDefaultOptions;
+
+ /**
+ * Comma separated list of filenames to compile in order
+ *
+ * @parameter expression=""
+ */
+ private String compileOrder;
private AbstractCompileMojo mojo;
@@ -582,6 +590,10 @@ public abstract class Compiler
mojo.getLog().debug( "Checking for existence of " + getLanguage() + " source directory: " + srcDir );
if ( srcDir.exists() )
{
+ if (compileOrder != null) {
+ compiler.setOrder(Arrays.asList(StringUtils.split(compileOrder, ", ")));
+ }
+
ConditionalFileSet fileSet = new ConditionalFileSet();
fileSet.setProject( mojo.getAntProject() );
fileSet.setIncludes( StringUtils.join( includeSet.iterator(), "," ) );
diff --git a/src/main/java/org/apache/maven/plugin/nar/Fortran.java b/src/main/java/org/apache/maven/plugin/nar/Fortran.java
index aef297d..52cd77d 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Fortran.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Fortran.java
@@ -27,7 +27,6 @@ package org.apache.maven.plugin.nar;
public class Fortran
extends Compiler
{
-
public Fortran()
{
}