diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-17 16:33:28 +0100 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-17 16:33:28 +0100 |
commit | 0975240ce6b505db32a87233f31c8d1377b14c54 (patch) | |
tree | edf3933a3bd151673c3ab1bb9338c4411bab89c2 /src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java | |
parent | bb9f382d1024e60f672b9c484031f40772a54a4b (diff) | |
download | maven-nar-plugin-0975240ce6b505db32a87233f31c8d1377b14c54.tar.gz maven-nar-plugin-0975240ce6b505db32a87233f31c8d1377b14c54.tar.bz2 maven-nar-plugin-0975240ce6b505db32a87233f31c8d1377b14c54.tar.xz maven-nar-plugin-0975240ce6b505db32a87233f31c8d1377b14c54.zip |
Cleanup
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java')
-rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java index 96b369f..d921fe6 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java @@ -58,7 +58,7 @@ public class NarTestCompileMojo } // make sure destination is there - getTargetDirectory().mkdirs(); + getTestTargetDirectory().mkdirs(); for ( Iterator i = getTests().iterator(); i.hasNext(); ) { @@ -81,7 +81,7 @@ public class NarTestCompileMojo task.setOuttype( outTypeEnum ); // outDir - File outDir = new File( getTargetDirectory(), "bin" ); + File outDir = new File( getTestTargetDirectory(), "bin" ); outDir = new File( outDir, getAOL().toString() ); outDir.mkdirs(); @@ -91,7 +91,7 @@ public class NarTestCompileMojo task.setOutfile( outFile ); // object directory - File objDir = new File( getTargetDirectory(), "obj" ); + File objDir = new File( getTestTargetDirectory(), "obj" ); objDir = new File( objDir, getAOL().toString() ); objDir.mkdirs(); task.setObjdir( objDir ); @@ -132,8 +132,8 @@ public class NarTestCompileMojo // FIXME hardcoded values String libName = getFinalName(); - File includeDir = getLayout().getIncludeDirectory( super.getTargetDirectory() ); - File libDir = getLayout().getLibDirectory( super.getTargetDirectory(), getAOL().toString(), test.getLink() ); + File includeDir = getLayout().getIncludeDirectory( getTargetDirectory() ); + File libDir = getLayout().getLibDirectory( getTargetDirectory(), getAOL().toString(), test.getLink() ); // copy shared library // FIXME why do we do this ? @@ -235,7 +235,7 @@ public class NarTestCompileMojo } } - protected File getTargetDirectory() + protected File getTestTargetDirectory() { return new File( getMavenProject().getBuild().getDirectory(), "test-nar" ); } |