#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"
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())
{
continue;
overlay_files.insert(*k);
}
- files.push_back(*j / *k);
+ FS::Path fn = *j / *k;
+ if(!FS::is_dir(fn))
+ files.push_back(fn);
}
}
}