diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-31 08:57:43 +0100 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-31 08:57:43 +0100 |
commit | 327a7e538d35ca6a582e2d812a2d1c8afd625d17 (patch) | |
tree | 68482b0a3a95cb99b43a3b838e104910b064dd48 /src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java | |
parent | fcb737024b9672dd73b014a53246252f95628989 (diff) | |
download | maven-nar-plugin-327a7e538d35ca6a582e2d812a2d1c8afd625d17.tar.gz maven-nar-plugin-327a7e538d35ca6a582e2d812a2d1c8afd625d17.tar.bz2 maven-nar-plugin-327a7e538d35ca6a582e2d812a2d1c8afd625d17.tar.xz maven-nar-plugin-327a7e538d35ca6a582e2d812a2d1c8afd625d17.zip |
Libs now in correct place in target, part of NAR-90
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java')
-rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java index 0a7478a..b98a8cb 100644 --- a/src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java @@ -81,6 +81,7 @@ public abstract class AbstractResourcesMojo File includeDir = new File( srcDir, resourceIncludeDir ); if ( includeDir.exists() ) { + // FIXME NAR-90 File includeDstDir = new File( getTargetDirectory(), "include" ); getLog().debug( "Copying includes from " + includeDir + " to " + includeDstDir ); copied += NarUtil.copyDirectoryStructure( includeDir, includeDstDir, null, NarUtil.DEFAULT_EXCLUDES ); @@ -98,10 +99,8 @@ public abstract class AbstractResourcesMojo File binDir = new File( srcDir, resourceBinDir ); if ( binDir.exists() ) { - File binDstDir = new File( getTargetDirectory(), "bin" ); - binDstDir = new File( binDstDir, aol ); + File binDstDir = getLayout().getLibDirectory( getTargetDirectory(), aol, Library.EXECUTABLE ); getLog().debug( "Copying binaries from " + binDir + " to " + binDstDir ); - copied += NarUtil.copyDirectoryStructure( binDir, binDstDir, null, NarUtil.DEFAULT_EXCLUDES ); } @@ -122,10 +121,7 @@ public abstract class AbstractResourcesMojo { Library library = (Library) i.next(); String type = library.getType(); - File libDstDir = new File( getTargetDirectory(), "lib" ); - libDstDir = new File( libDstDir, aol ); - libDstDir = new File( libDstDir, type ); - + File libDstDir = getLayout().getLibDirectory( getTargetDirectory(), aol, type ); getLog().debug( "Copying libraries from " + libDir + " to " + libDstDir ); // filter files for lib |