diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-01 21:55:04 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-01 21:55:04 +0100 |
| commit | 4f5f88c356ed02b8135c7b4b03a816dbe8f975b8 (patch) | |
| tree | 13bad0a12a2c342897d8638eeaa21740ab223155 /src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java | |
| parent | 3eff363d20e095c82a5a57220e681ed9c7c0cf65 (diff) | |
| download | maven-nar-plugin-4f5f88c356ed02b8135c7b4b03a816dbe8f975b8.tar.gz maven-nar-plugin-4f5f88c356ed02b8135c7b4b03a816dbe8f975b8.tar.bz2 maven-nar-plugin-4f5f88c356ed02b8135c7b4b03a816dbe8f975b8.tar.xz maven-nar-plugin-4f5f88c356ed02b8135c7b4b03a816dbe8f975b8.zip | |
Fixed target part (include) for NAR-90
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java')
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java index cefc224..88f7267 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java @@ -84,7 +84,7 @@ public class NarCompileMojo try { // FIXME, should the include paths be defined at a higher level ? - getCpp().copyIncludeFiles( getMavenProject(), new File( getTargetDirectory(), "include" ) ); + getCpp().copyIncludeFiles( getMavenProject(), getLayout().getIncludeDirectory( getTargetDirectory() ) ); } catch ( IOException e ) { @@ -142,6 +142,7 @@ public class NarCompileMojo outDir.mkdirs(); // outFile + // FIXME NAR-90 we could get the final name from layout File outFile; if ( type.equals( Library.EXECUTABLE ) ) { @@ -264,7 +265,7 @@ public class NarCompileMojo File dir = new File( getNarManager().getNarFile( dependency ).getParentFile(), "nar" ); // FIXME NAR-90 // dir = getLayout().getLibDirectory( dir, aol, binding ); - dir = new File(dir, "lib/"+aol.toString()+"/"+binding); + dir = new File( dir, "lib/" + aol.toString() + "/" + binding ); getLog().debug( "Looking for Library Directory: " + dir ); if ( dir.exists() ) { |