Skip to content

Added support for subfolders by walking the paths backwards. #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
num3ric wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for subfolders by walking the paths backwards. #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/runtime/Factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,26 @@ void* Factory::allocate( size_t size, const std::type_index &typeIndex )
return ::operator new( size );
}

bool extractIncludePath( const fs::path &path, const std::vector<fs::path> &includes, std::string *pathString )
{
fs::path parentPath = path.parent_path();
fs::path diffPath;
//Walk path backwards, stop if we hit the root folder
while( !fs::equivalent( parentPath, parentPath.root_directory() ) ) {
for( auto& include : includes ) {
if( fs::equivalent( parentPath, include ) ) {
*pathString = ( diffPath / path.filename() ).generic_string();
return true;
}
}
// Accumulate the parent folder names, if the header file is in subfolder(s)
diffPath = parentPath.stem() / diffPath;
parentPath = parentPath.parent_path();
}
CI_LOG_E( "Failed to extract valid include path for " + path.string() );
return false;
}

void Factory::watchImpl( const std::type_index &typeIndex, void* address, const std::string &name, const std::vector<fs::path> &filePaths, rt::BuildSettings settings, const TypeFormat &format )
{
// initalize module and source watching
Expand Down Expand Up @@ -110,7 +130,10 @@ void Factory::watchImpl( const std::type_index &typeIndex, void* address, const
auto codeGenOptions = rt::CodeGeneration::Options().newOperator( name ).placementNewOperator( name );
for( const auto &path : filePaths ) {
if( path.extension() == ".h" || path.extension() == ".hpp" ) {
codeGenOptions.include( path.filename().string() ); // TODO: better handling of include path (ex. #include "folder/file.h" would not work)
std::string includeStr;
if( extractIncludePath( path, settings.getIncludes(), &includeStr ) ) {
codeGenOptions.include( includeStr );
}
}
}
settings.preBuildStep( make_shared<rt::CodeGeneration>( codeGenOptions ) );
Expand All @@ -120,7 +143,10 @@ void Factory::watchImpl( const std::type_index &typeIndex, void* address, const
auto pchOptions = rt::PrecompiledHeader::Options();
for( const auto &path : filePaths ) {
if( path.extension() == ".h" || path.extension() == ".hpp" ) {
pchOptions.ignore( path.filename().string() );// TODO: better handling of include path (ex. #include "folder/file.h" would not work)
std::string includeStr;
if( extractIncludePath( path, settings.getIncludes(), &includeStr ) ) {
pchOptions.ignore( includeStr );
}
pchOptions.parseSource( path );
}
else if( path.extension() == ".cpp" ) {
Expand Down