X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=46e9294d039abb2a4cc9ee33c0180acd595239c1;hb=92ea7eac95040f2f4fce0bbcd799800e7701118e;hp=2bfa736e14ea2dc7663fcae75b5f6f8c3329395a;hpb=e3407687a61bce56912b89818a9d9f006e9da41f;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 2bfa736..46e9294 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -2,8 +2,7 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
 #include "sourcepackage.h"
@@ -102,8 +101,8 @@ Component::SourceList Component::collect_source_files() const
 			for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
 			{
 				package.get_builder().get_logger().log("files", format("Traversing %s", *j));
-				list<string> sfiles = list_files(*j);
-				for(list<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
+				vector<string> sfiles = list_files(*j);
+				for(vector<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
 				{
 					if(j!=dirs.begin())
 					{
@@ -111,7 +110,9 @@ Component::SourceList Component::collect_source_files() const
 							continue;
 						overlay_files.insert(*k);
 					}
-					files.push_back(*j / *k);
+					FS::Path fn = *j / *k;
+					if(!FS::is_dir(fn))
+						files.push_back(fn);
 				}
 			}
 		}