From 982b7a322e648d388cc77c06f80b2947a7bd8a52 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Fri, 16 Oct 2009 16:52:34 +0200 Subject: Fixed NAR-71 and part of NAR-69 --- .../java/org/apache/maven/plugin/nar/Linker.java | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'src/main/java/org/apache/maven/plugin/nar/Linker.java') 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 ) { -- cgit v1.2.3