From 843b6c6c003b00eff916eb047995ff59ba28cf66 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Tue, 20 Oct 2009 15:01:39 +0200 Subject: Moved output of gnu goals to target/nar/gnu; Fixed NAR-77 --- .../org/apache/maven/plugin/nar/AbstractGnuMojo.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java') diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java index 639dda2..9be1d44 100644 --- a/src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java @@ -31,6 +31,14 @@ import org.apache.maven.plugin.MojoFailureException; public abstract class AbstractGnuMojo extends AbstractResourcesMojo { + /** + * Use GNU goals on Windows + * + * @parameter expresssion="nar.gnu.useonwindows" default-value="false" + * @required + */ + private boolean gnuUseOnWindows; + /** * Source directory for GNU style project * @@ -40,7 +48,7 @@ public abstract class AbstractGnuMojo protected File gnuSourceDirectory; /** - * @parameter expression="${project.build.directory}/gnu" + * @parameter expression="${project.build.directory}/nar/gnu" * @required */ private File gnuTargetDirectory; @@ -74,5 +82,13 @@ public abstract class AbstractGnuMojo { return new File( gnuTargetDirectory, getAOL().toString() ); } - + + /** + * Returns true if we do not want to use GNU on Windows + * + * @return + */ + protected boolean useGnu() { + return (gnuUseOnWindows || !NarUtil.getOS( null ).equals( OS.WINDOWS )); + } } -- cgit v1.2.3