diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-16 16:52:34 +0200 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-16 16:52:34 +0200 |
| commit | 982b7a322e648d388cc77c06f80b2947a7bd8a52 (patch) | |
| tree | 74c042cd7871a7099e0cc43538ee4f8175ca4f80 /src/main/java/org/apache/maven/plugin/nar/Linker.java | |
| parent | 9b1643ef71a5b0d6c9db8cb9859b045c4adad911 (diff) | |
| download | maven-nar-plugin-982b7a322e648d388cc77c06f80b2947a7bd8a52.tar.gz maven-nar-plugin-982b7a322e648d388cc77c06f80b2947a7bd8a52.tar.bz2 maven-nar-plugin-982b7a322e648d388cc77c06f80b2947a7bd8a52.tar.xz maven-nar-plugin-982b7a322e648d388cc77c06f80b2947a7bd8a52.zip | |
Fixed NAR-71 and part of NAR-69
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/Linker.java')
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/Linker.java | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/Linker.java b/src/main/java/org/apache/maven/plugin/nar/Linker.java index 26256cb..d6d8345 100644 --- a/src/main/java/org/apache/maven/plugin/nar/Linker.java +++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java @@ -192,27 +192,36 @@ public class Linker Set defs = new HashSet(); try { - File cSrcDir = mojo.getC().getSourceDirectory(); - if ( cSrcDir.exists() ) - defs.addAll( FileUtils.getFiles( cSrcDir, "**/*.def", null ) ); + List cSrcDirs = mojo.getC().getSourceDirectories(); + for (Iterator i = cSrcDirs.iterator(); i.hasNext(); ) { + File dir = (File)i.next(); + if ( dir.exists() ) + defs.addAll( FileUtils.getFiles( dir, "**/*.def", null ) ); + } } catch ( IOException e ) { } try { - File cppSrcDir = mojo.getCpp().getSourceDirectory(); - if ( cppSrcDir.exists() ) - defs.addAll( FileUtils.getFiles( cppSrcDir, "**/*.def", null ) ); + List cppSrcDirs = mojo.getCpp().getSourceDirectories(); + for (Iterator i = cppSrcDirs.iterator(); i.hasNext(); ) { + File dir = (File)i.next(); + if ( dir.exists() ) + defs.addAll( FileUtils.getFiles( dir, "**/*.def", null ) ); + } } catch ( IOException e ) { } try { - File fortranSrcDir = mojo.getFortran().getSourceDirectory(); - if ( fortranSrcDir.exists() ) - defs.addAll( FileUtils.getFiles( fortranSrcDir, "**/*.def", null ) ); + List fortranSrcDirs = mojo.getFortran().getSourceDirectories(); + for (Iterator i = fortranSrcDirs.iterator(); i.hasNext(); ) { + File dir = (File)i.next(); + if ( dir.exists() ) + defs.addAll( FileUtils.getFiles( dir, "**/*.def", null ) ); + } } catch ( IOException e ) { |