diff --git a/buildcc/lib/target/include/target/api/target_info_getter.h b/buildcc/lib/target/include/target/api/target_info_getter.h index 6e3b6b52..e26db49e 100644 --- a/buildcc/lib/target/include/target/api/target_info_getter.h +++ b/buildcc/lib/target/include/target/api/target_info_getter.h @@ -44,23 +44,23 @@ template class TargetInfoGetter { const TargetConfig &GetConfig() const; // Target Storer - const internal::fs_unordered_set &GetCurrentSourceFiles() const; - const internal::fs_unordered_set &GetCurrentHeaderFiles() const; - const internal::fs_unordered_set &GetCurrentPchFiles() const; - const std::vector &GetTargetLibDeps() const; - const std::vector &GetCurrentExternalLibDeps() const; - const internal::fs_unordered_set &GetCurrentIncludeDirs() const; - const internal::fs_unordered_set &GetCurrentLibDirs() const; - const std::unordered_set &GetCurrentPreprocessorFlags() const; - const std::unordered_set &GetCurrentCommonCompileFlags() const; - const std::unordered_set &GetCurrentPchCompileFlags() const; - const std::unordered_set &GetCurrentPchObjectFlags() const; - const std::unordered_set &GetCurrentAsmCompileFlags() const; - const std::unordered_set &GetCurrentCCompileFlags() const; - const std::unordered_set &GetCurrentCppCompileFlags() const; - const std::unordered_set &GetCurrentLinkFlags() const; - const internal::fs_unordered_set &GetCurrentCompileDependencies() const; - const internal::fs_unordered_set &GetCurrentLinkDependencies() const; + const fs_unordered_set &GetSourceFiles() const; + const fs_unordered_set &GetHeaderFiles() const; + const fs_unordered_set &GetPchFiles() const; + const std::vector &GetLibDeps() const; + const std::vector &GetExternalLibDeps() const; + const fs_unordered_set &GetIncludeDirs() const; + const fs_unordered_set &GetLibDirs() const; + const std::unordered_set &GetPreprocessorFlags() const; + const std::unordered_set &GetCommonCompileFlags() const; + const std::unordered_set &GetPchCompileFlags() const; + const std::unordered_set &GetPchObjectFlags() const; + const std::unordered_set &GetAsmCompileFlags() const; + const std::unordered_set &GetCCompileFlags() const; + const std::unordered_set &GetCppCompileFlags() const; + const std::unordered_set &GetLinkFlags() const; + const fs_unordered_set &GetCompileDependencies() const; + const fs_unordered_set &GetLinkDependencies() const; }; } // namespace buildcc::base diff --git a/buildcc/lib/target/include/target/base/generator_loader.h b/buildcc/lib/target/include/target/base/generator_loader.h index bc9b22ee..da8c5463 100644 --- a/buildcc/lib/target/include/target/base/generator_loader.h +++ b/buildcc/lib/target/include/target/base/generator_loader.h @@ -45,7 +45,7 @@ class GeneratorLoader : public LoaderInterface { return loaded_input_files_; } - const internal::fs_unordered_set &GetLoadedOutputFiles() const noexcept { + const fs_unordered_set &GetLoadedOutputFiles() const noexcept { return loaded_output_files_; } @@ -58,7 +58,7 @@ class GeneratorLoader : public LoaderInterface { fs::path path_; internal::path_unordered_set loaded_input_files_; - internal::fs_unordered_set loaded_output_files_; + fs_unordered_set loaded_output_files_; std::vector loaded_commands_; }; diff --git a/buildcc/lib/target/include/target/base/target_storer.h b/buildcc/lib/target/include/target/base/target_storer.h index b12f5dde..c750e9ca 100644 --- a/buildcc/lib/target/include/target/base/target_storer.h +++ b/buildcc/lib/target/include/target/base/target_storer.h @@ -32,8 +32,8 @@ struct TargetStorer { std::vector current_user_lib_deps; internal::path_unordered_set current_internal_lib_deps; - internal::fs_unordered_set current_include_dirs; - internal::fs_unordered_set current_lib_dirs; + fs_unordered_set current_include_dirs; + fs_unordered_set current_lib_dirs; // NOTE, Order matters (user takes care of the order here) std::vector current_user_external_lib_deps; diff --git a/buildcc/lib/target/include/target/common/path.h b/buildcc/lib/target/include/target/common/path.h index 638c531a..f520d3f6 100644 --- a/buildcc/lib/target/include/target/common/path.h +++ b/buildcc/lib/target/include/target/common/path.h @@ -194,6 +194,8 @@ inline std::string path_as_string(const fs::path &p) { return internal::Path::CreateNewPath(p).GetPathAsString(); } +typedef internal::fs_unordered_set fs_unordered_set; + } // namespace buildcc // FMT specialization diff --git a/buildcc/lib/target/include/target/common/util.h b/buildcc/lib/target/include/target/common/util.h index fe414ed8..67d543f3 100644 --- a/buildcc/lib/target/include/target/common/util.h +++ b/buildcc/lib/target/include/target/common/util.h @@ -29,7 +29,7 @@ template std::string aggregate(const T &list) { return fmt::format("{}", fmt::join(list, " ")); } -std::string aggregate(const buildcc::internal::fs_unordered_set &paths); +std::string aggregate(const buildcc::fs_unordered_set &paths); std::string aggregate_with_prefix(const std::string &prefix, const fs_unordered_set &dirs); diff --git a/buildcc/lib/target/include/target/friend/compile_object.h b/buildcc/lib/target/include/target/friend/compile_object.h index fd760e2f..3bc165b3 100644 --- a/buildcc/lib/target/include/target/friend/compile_object.h +++ b/buildcc/lib/target/include/target/friend/compile_object.h @@ -54,7 +54,7 @@ class CompileObject { GetObjectDataMap() const { return object_files_; } - internal::fs_unordered_set GetCompiledSources() const; + fs_unordered_set GetCompiledSources() const; tf::Task &GetTask() { return compile_task_; } private: diff --git a/buildcc/lib/target/include/target/generator.h b/buildcc/lib/target/include/target/generator.h index 349c34b5..96976ef6 100644 --- a/buildcc/lib/target/include/target/generator.h +++ b/buildcc/lib/target/include/target/generator.h @@ -132,7 +132,7 @@ class Generator : public BuilderInterface { // Serialization internal::RelationalPathFiles current_input_files_; - internal::fs_unordered_set current_output_files_; + fs_unordered_set current_output_files_; std::vector current_commands_; bool parallel_{false}; diff --git a/buildcc/lib/target/include/target/private/schema_util.h b/buildcc/lib/target/include/target/private/schema_util.h index 112b04b7..83d3d000 100644 --- a/buildcc/lib/target/include/target/private/schema_util.h +++ b/buildcc/lib/target/include/target/private/schema_util.h @@ -113,7 +113,7 @@ create_fbs_vector_string(flatbuffers::FlatBufferBuilder &builder, inline std::vector> create_fbs_vector_string(flatbuffers::FlatBufferBuilder &builder, - const buildcc::internal::fs_unordered_set &fslist) { + const buildcc::fs_unordered_set &fslist) { std::vector> strs; std::transform( fslist.begin(), fslist.end(), std::back_inserter(strs), diff --git a/buildcc/lib/target/include/target/target.h b/buildcc/lib/target/include/target/target.h index 2dc6c4f5..344deb38 100644 --- a/buildcc/lib/target/include/target/target.h +++ b/buildcc/lib/target/include/target/target.h @@ -105,8 +105,8 @@ class Target : public BuilderInterface, // Recompilation checks void RecheckPaths(const internal::path_unordered_set &previous_path, const internal::path_unordered_set ¤t_path); - void RecheckDirs(const internal::fs_unordered_set &previous_dirs, - const internal::fs_unordered_set ¤t_dirs); + void RecheckDirs(const fs_unordered_set &previous_dirs, + const fs_unordered_set ¤t_dirs); void RecheckFlags(const std::unordered_set &previous_flags, const std::unordered_set ¤t_flags); void RecheckExternalLib( diff --git a/buildcc/lib/target/src/api/target_info_getter.cpp b/buildcc/lib/target/src/api/target_info_getter.cpp index 4383401b..d9171169 100644 --- a/buildcc/lib/target/src/api/target_info_getter.cpp +++ b/buildcc/lib/target/src/api/target_info_getter.cpp @@ -64,31 +64,28 @@ const TargetConfig &TargetInfoGetter::GetConfig() const { // Target Storer template -const internal::fs_unordered_set & -TargetInfoGetter::GetCurrentSourceFiles() const { +const fs_unordered_set &TargetInfoGetter::GetSourceFiles() const { const T &t = static_cast(*this); return t.storer_.current_source_files.user; } template -const internal::fs_unordered_set & -TargetInfoGetter::GetCurrentHeaderFiles() const { +const fs_unordered_set &TargetInfoGetter::GetHeaderFiles() const { const T &t = static_cast(*this); return t.storer_.current_header_files.user; } template -const internal::fs_unordered_set & -TargetInfoGetter::GetCurrentPchFiles() const { +const fs_unordered_set &TargetInfoGetter::GetPchFiles() const { const T &t = static_cast(*this); return t.storer_.current_pch_files.user; } template -const std::vector &TargetInfoGetter::GetTargetLibDeps() const { +const std::vector &TargetInfoGetter::GetLibDeps() const { const T &t = static_cast(*this); return t.storer_.current_user_lib_deps; @@ -96,23 +93,21 @@ const std::vector &TargetInfoGetter::GetTargetLibDeps() const { template const std::vector & -TargetInfoGetter::GetCurrentExternalLibDeps() const { +TargetInfoGetter::GetExternalLibDeps() const { const T &t = static_cast(*this); return t.storer_.current_user_external_lib_deps; } template -const internal::fs_unordered_set & -TargetInfoGetter::GetCurrentIncludeDirs() const { +const fs_unordered_set &TargetInfoGetter::GetIncludeDirs() const { const T &t = static_cast(*this); return t.storer_.current_include_dirs; } template -const internal::fs_unordered_set & -TargetInfoGetter::GetCurrentLibDirs() const { +const fs_unordered_set &TargetInfoGetter::GetLibDirs() const { const T &t = static_cast(*this); return t.storer_.current_lib_dirs; @@ -120,7 +115,7 @@ TargetInfoGetter::GetCurrentLibDirs() const { template const std::unordered_set & -TargetInfoGetter::GetCurrentPreprocessorFlags() const { +TargetInfoGetter::GetPreprocessorFlags() const { const T &t = static_cast(*this); return t.storer_.current_preprocessor_flags; @@ -128,7 +123,7 @@ TargetInfoGetter::GetCurrentPreprocessorFlags() const { template const std::unordered_set & -TargetInfoGetter::GetCurrentCommonCompileFlags() const { +TargetInfoGetter::GetCommonCompileFlags() const { const T &t = static_cast(*this); return t.storer_.current_common_compile_flags; @@ -136,7 +131,7 @@ TargetInfoGetter::GetCurrentCommonCompileFlags() const { template const std::unordered_set & -TargetInfoGetter::GetCurrentPchCompileFlags() const { +TargetInfoGetter::GetPchCompileFlags() const { const T &t = static_cast(*this); return t.storer_.current_pch_compile_flags; @@ -144,7 +139,7 @@ TargetInfoGetter::GetCurrentPchCompileFlags() const { template const std::unordered_set & -TargetInfoGetter::GetCurrentPchObjectFlags() const { +TargetInfoGetter::GetPchObjectFlags() const { const T &t = static_cast(*this); return t.storer_.current_pch_object_flags; @@ -152,7 +147,7 @@ TargetInfoGetter::GetCurrentPchObjectFlags() const { template const std::unordered_set & -TargetInfoGetter::GetCurrentAsmCompileFlags() const { +TargetInfoGetter::GetAsmCompileFlags() const { const T &t = static_cast(*this); return t.storer_.current_asm_compile_flags; @@ -160,7 +155,7 @@ TargetInfoGetter::GetCurrentAsmCompileFlags() const { template const std::unordered_set & -TargetInfoGetter::GetCurrentCCompileFlags() const { +TargetInfoGetter::GetCCompileFlags() const { const T &t = static_cast(*this); return t.storer_.current_c_compile_flags; @@ -168,7 +163,7 @@ TargetInfoGetter::GetCurrentCCompileFlags() const { template const std::unordered_set & -TargetInfoGetter::GetCurrentCppCompileFlags() const { +TargetInfoGetter::GetCppCompileFlags() const { const T &t = static_cast(*this); return t.storer_.current_cpp_compile_flags; @@ -176,23 +171,21 @@ TargetInfoGetter::GetCurrentCppCompileFlags() const { template const std::unordered_set & -TargetInfoGetter::GetCurrentLinkFlags() const { +TargetInfoGetter::GetLinkFlags() const { const T &t = static_cast(*this); return t.storer_.current_link_flags; } template -const internal::fs_unordered_set & -TargetInfoGetter::GetCurrentCompileDependencies() const { +const fs_unordered_set &TargetInfoGetter::GetCompileDependencies() const { const T &t = static_cast(*this); return t.storer_.current_compile_dependencies.user; } template -const internal::fs_unordered_set & -TargetInfoGetter::GetCurrentLinkDependencies() const { +const fs_unordered_set &TargetInfoGetter::GetLinkDependencies() const { const T &t = static_cast(*this); return t.storer_.current_link_dependencies.user; diff --git a/buildcc/lib/target/src/common/util.cpp b/buildcc/lib/target/src/common/util.cpp index 68e5b312..17772657 100644 --- a/buildcc/lib/target/src/common/util.cpp +++ b/buildcc/lib/target/src/common/util.cpp @@ -25,7 +25,7 @@ namespace buildcc::internal { // Aggregates -std::string aggregate(const buildcc::internal::fs_unordered_set &paths) { +std::string aggregate(const buildcc::fs_unordered_set &paths) { std::vector agg; std::transform( paths.begin(), paths.end(), std::back_inserter(agg), diff --git a/buildcc/lib/target/src/target/build.cpp b/buildcc/lib/target/src/target/build.cpp index b9d35f2d..6fea12c9 100644 --- a/buildcc/lib/target/src/target/build.cpp +++ b/buildcc/lib/target/src/target/build.cpp @@ -75,16 +75,15 @@ void Target::Build() { // Target default arguments command_.AddDefaultArguments({ {kIncludeDirs, internal::aggregate_with_prefix(config_.prefix_include_dir, - GetCurrentIncludeDirs())}, - {kLibDirs, internal::aggregate_with_prefix(config_.prefix_lib_dir, - GetCurrentLibDirs())}, + GetIncludeDirs())}, + {kLibDirs, + internal::aggregate_with_prefix(config_.prefix_lib_dir, GetLibDirs())}, - {kPreprocessorFlags, internal::aggregate(GetCurrentPreprocessorFlags())}, - {kCommonCompileFlags, - internal::aggregate(GetCurrentCommonCompileFlags())}, + {kPreprocessorFlags, internal::aggregate(GetPreprocessorFlags())}, + {kCommonCompileFlags, internal::aggregate(GetCommonCompileFlags())}, // TODO, Cache more flags here // ASM, C and CPP flags - {kLinkFlags, internal::aggregate(GetCurrentLinkFlags())}, + {kLinkFlags, internal::aggregate(GetLinkFlags())}, // Toolchain executables here {kAsmCompiler, toolchain_.GetAsmCompiler()}, @@ -104,8 +103,8 @@ void Target::Build() { // PCH Compile if (state_.ContainsPch()) { command_.AddDefaultArguments({ - {kPchCompileFlags, internal::aggregate(GetCurrentPchCompileFlags())}, - {kPchObjectFlags, internal::aggregate(GetCurrentPchObjectFlags())}, + {kPchCompileFlags, internal::aggregate(GetPchCompileFlags())}, + {kPchObjectFlags, internal::aggregate(GetPchObjectFlags())}, {kPchObjectOutput, fmt::format("{}", compile_pch_.GetObjectPath())}, }); diff --git a/buildcc/lib/target/src/target/friend/compile_object.cpp b/buildcc/lib/target/src/target/friend/compile_object.cpp index caefb93c..2f001993 100644 --- a/buildcc/lib/target/src/target/friend/compile_object.cpp +++ b/buildcc/lib/target/src/target/friend/compile_object.cpp @@ -62,8 +62,8 @@ void CompileObject::CacheCompileCommands() { } } -internal::fs_unordered_set CompileObject::GetCompiledSources() const { - internal::fs_unordered_set compiled_sources; +fs_unordered_set CompileObject::GetCompiledSources() const { + fs_unordered_set compiled_sources; for (const auto &p : object_files_) { compiled_sources.insert(p.second.output); } @@ -145,19 +145,19 @@ void CompileObject::BuildObjectCompile( target_.dirty_ = true; } else { target_.RecheckFlags(loader.GetLoadedPreprocessorFlags(), - target_.GetCurrentPreprocessorFlags()); + target_.GetPreprocessorFlags()); target_.RecheckFlags(loader.GetLoadedCommonCompileFlags(), - target_.GetCurrentCommonCompileFlags()); + target_.GetCommonCompileFlags()); target_.RecheckFlags(loader.GetLoadedPchObjectFlags(), - target_.GetCurrentPchObjectFlags()); + target_.GetPchObjectFlags()); target_.RecheckFlags(loader.GetLoadedAsmCompileFlags(), - target_.GetCurrentAsmCompileFlags()); + target_.GetAsmCompileFlags()); target_.RecheckFlags(loader.GetLoadedCCompileFlags(), - target_.GetCurrentCCompileFlags()); + target_.GetCCompileFlags()); target_.RecheckFlags(loader.GetLoadedCppCompileFlags(), - target_.GetCurrentCppCompileFlags()); + target_.GetCppCompileFlags()); target_.RecheckDirs(loader.GetLoadedIncludeDirs(), - target_.GetCurrentIncludeDirs()); + target_.GetIncludeDirs()); target_.RecheckPaths(loader.GetLoadedHeaders(), storer.current_header_files.internal); target_.RecheckPaths(loader.GetLoadedCompileDependencies(), diff --git a/buildcc/lib/target/src/target/friend/compile_pch.cpp b/buildcc/lib/target/src/target/friend/compile_pch.cpp index 82f35444..4914e856 100644 --- a/buildcc/lib/target/src/target/friend/compile_pch.cpp +++ b/buildcc/lib/target/src/target/friend/compile_pch.cpp @@ -40,7 +40,7 @@ constexpr const char *const kFormat = R"(// Generated by BuildCC )"; void AggregateToFile(const fs::path &filename, - const buildcc::internal::fs_unordered_set &header_files) { + const buildcc::fs_unordered_set &header_files) { std::string aggregated_includes; for (const auto &hf : header_files) { std::string temp = fmt::format("#include \"{}\"\r\n", hf); @@ -79,20 +79,20 @@ void CompilePch::BuildCompile() { target_.dirty_ = true; } else { target_.RecheckFlags(loader.GetLoadedPreprocessorFlags(), - target_.GetCurrentPreprocessorFlags()); + target_.GetPreprocessorFlags()); target_.RecheckFlags(loader.GetLoadedCommonCompileFlags(), - target_.GetCurrentCommonCompileFlags()); + target_.GetCommonCompileFlags()); target_.RecheckFlags(loader.GetLoadedCCompileFlags(), - target_.GetCurrentCCompileFlags()); + target_.GetCCompileFlags()); target_.RecheckFlags(loader.GetLoadedCppCompileFlags(), - target_.GetCurrentCppCompileFlags()); + target_.GetCppCompileFlags()); target_.RecheckDirs(loader.GetLoadedIncludeDirs(), - target_.GetCurrentIncludeDirs()); + target_.GetIncludeDirs()); target_.RecheckPaths(loader.GetLoadedHeaders(), target_.storer_.current_header_files.internal); target_.RecheckFlags(loader.GetLoadedPchCompileFlags(), - target_.GetCurrentPchCompileFlags()); + target_.GetPchCompileFlags()); target_.RecheckPaths(loader.GetLoadedPchs(), target_.storer_.current_pch_files.internal); if (!loader.GetLoadedPchCompiled()) { @@ -101,7 +101,7 @@ void CompilePch::BuildCompile() { } if (target_.dirty_) { - AggregateToFile(header_path_, target_.GetCurrentPchFiles()); + AggregateToFile(header_path_, target_.GetPchFiles()); if (!fs::exists(source_path_)) { const std::string p = fmt::format("{}", source_path_); const bool save = diff --git a/buildcc/lib/target/src/target/friend/link_target.cpp b/buildcc/lib/target/src/target/friend/link_target.cpp index d3f7908c..f88aa723 100644 --- a/buildcc/lib/target/src/target/friend/link_target.cpp +++ b/buildcc/lib/target/src/target/friend/link_target.cpp @@ -83,9 +83,8 @@ void LinkTarget::BuildLink() { if (!loader.IsLoaded()) { target_.dirty_ = true; } else { - target_.RecheckFlags(loader.GetLoadedLinkFlags(), - target_.GetCurrentLinkFlags()); - target_.RecheckDirs(loader.GetLoadedLibDirs(), target_.GetCurrentLibDirs()); + target_.RecheckFlags(loader.GetLoadedLinkFlags(), target_.GetLinkFlags()); + target_.RecheckDirs(loader.GetLoadedLibDirs(), target_.GetLibDirs()); target_.RecheckExternalLib(loader.GetLoadedExternalLibDeps(), storer.current_internal_external_lib_deps); target_.RecheckPaths(loader.GetLoadedLinkDependencies(), diff --git a/buildcc/lib/target/src/target/target.cpp b/buildcc/lib/target/src/target/target.cpp index 807b1bfb..d6dab01f 100644 --- a/buildcc/lib/target/src/target/target.cpp +++ b/buildcc/lib/target/src/target/target.cpp @@ -69,8 +69,8 @@ void Target::RecheckPaths(const internal::path_unordered_set &previous_path, [&]() { PathAdded(); }, [&]() { PathUpdated(); }); } -void Target::RecheckDirs(const internal::fs_unordered_set &previous_dirs, - const internal::fs_unordered_set ¤t_dirs) { +void Target::RecheckDirs(const fs_unordered_set &previous_dirs, + const fs_unordered_set ¤t_dirs) { RecheckChanged(previous_dirs, current_dirs, std::bind(&Target::DirChanged, this)); } @@ -92,13 +92,13 @@ void Target::RecheckExternalLib( std::optional Target::SelectCompileFlags(TargetFileExt ext) const { switch (ext) { case TargetFileExt::Asm: - return internal::aggregate(GetCurrentAsmCompileFlags()); + return internal::aggregate(GetAsmCompileFlags()); break; case TargetFileExt::C: - return internal::aggregate(GetCurrentCCompileFlags()); + return internal::aggregate(GetCCompileFlags()); break; case TargetFileExt::Cpp: - return internal::aggregate(GetCurrentCppCompileFlags()); + return internal::aggregate(GetCppCompileFlags()); break; default: break; diff --git a/buildcc/lib/target/src/target/tasks.cpp b/buildcc/lib/target/src/target/tasks.cpp index bf779e77..cd305195 100644 --- a/buildcc/lib/target/src/target/tasks.cpp +++ b/buildcc/lib/target/src/target/tasks.cpp @@ -81,7 +81,7 @@ void CompilePch::Task() { } // For Graph generation - for (const auto &p : target_.GetCurrentPchFiles()) { + for (const auto &p : target_.GetPchFiles()) { std::string name = fmt::format("{}", p.lexically_relative(env::get_project_root_dir())); subflow.placeholder().name(name); diff --git a/buildcc/lib/target/test/target/test_target_include_dir.cpp b/buildcc/lib/target/test/target/test_target_include_dir.cpp index 19086cd4..93838ff3 100644 --- a/buildcc/lib/target/test/target/test_target_include_dir.cpp +++ b/buildcc/lib/target/test/target/test_target_include_dir.cpp @@ -42,7 +42,7 @@ TEST(TargetTestIncludeDirGroup, Target_HeaderTypes) { simple.AddHeader("fileext/header_file1.h"); simple.AddHeader("fileext/header_file2.hpp"); - CHECK_EQUAL(simple.GetCurrentHeaderFiles().size(), 2); + CHECK_EQUAL(simple.GetHeaderFiles().size(), 2); CHECK_THROWS(std::exception, simple.AddHeader("fileext/c_file.c")); CHECK_THROWS(std::exception, simple.AddHeader("fileext/cpp_file1.cpp")); @@ -65,7 +65,7 @@ TEST(TargetTestIncludeDirGroup, TargetGlobHeader) { gcc, "data"); globHeader.GlobHeaders("include"); globHeader.GlobHeaders(""); - CHECK_EQUAL(globHeader.GetCurrentHeaderFiles().size(), 1); + CHECK_EQUAL(globHeader.GetHeaderFiles().size(), 1); } TEST(TargetTestIncludeDirGroup, TargetGlobThroughIncludeDir) { @@ -78,7 +78,7 @@ TEST(TargetTestIncludeDirGroup, TargetGlobThroughIncludeDir) { NAME, buildcc::base::TargetType::Executable, gcc, "data"); globIncludeDir.AddIncludeDir("include", true); globIncludeDir.AddIncludeDir("", true); - CHECK_EQUAL(globIncludeDir.GetCurrentHeaderFiles().size(), 1); + CHECK_EQUAL(globIncludeDir.GetHeaderFiles().size(), 1); } TEST(TargetTestIncludeDirGroup, TargetBuildIncludeDir) { diff --git a/buildcc/lib/target/test/target/test_target_pch.cpp b/buildcc/lib/target/test/target/test_target_pch.cpp index fca98eeb..351404d3 100644 --- a/buildcc/lib/target/test/target/test_target_pch.cpp +++ b/buildcc/lib/target/test/target/test_target_pch.cpp @@ -262,7 +262,7 @@ TEST(TargetPchTestGroup, Target_AddPchCompileFlag_Build) { buildcc::base::m::TargetRunner(target); bool exists = fs::exists(target.GetPchHeaderPath()); CHECK_TRUE(exists); - CHECK_EQUAL(target.GetCurrentPchCompileFlags().size(), 1); + CHECK_EQUAL(target.GetPchCompileFlags().size(), 1); mock().checkExpectations(); } @@ -282,7 +282,7 @@ TEST(TargetPchTestGroup, Target_AddPchObjectFlag_Build) { buildcc::base::m::TargetRunner(target); bool exists = fs::exists(target.GetPchHeaderPath()); CHECK_TRUE(exists); - CHECK_EQUAL(target.GetCurrentPchObjectFlags().size(), 1); + CHECK_EQUAL(target.GetPchObjectFlags().size(), 1); mock().checkExpectations(); } diff --git a/buildcc/lib/target/test/target/test_target_source.cpp b/buildcc/lib/target/test/target/test_target_source.cpp index 05cae41a..a1963e41 100644 --- a/buildcc/lib/target/test/target/test_target_source.cpp +++ b/buildcc/lib/target/test/target/test_target_source.cpp @@ -49,7 +49,7 @@ TEST(TargetTestSourceGroup, Target_SourceTypes) { simple.AddSource("fileext/asm_file2.S"); simple.AddSource("fileext/asm_file3.asm"); - CHECK_EQUAL(simple.GetCurrentSourceFiles().size(), 7); + CHECK_EQUAL(simple.GetSourceFiles().size(), 7); CHECK_THROWS(std::exception, simple.AddSource("fileext/header_file1.h")); CHECK_THROWS(std::exception, simple.AddSource("fileext/header_file2.hpp")); CHECK_THROWS(std::exception, @@ -81,7 +81,7 @@ TEST(TargetTestSourceGroup, Target_GlobSource) { buildcc::base::Target simple(NAME, buildcc::base::TargetType::Executable, gcc, "data"); simple.GlobSources(""); - CHECK_EQUAL(simple.GetCurrentSourceFiles().size(), 6); + CHECK_EQUAL(simple.GetSourceFiles().size(), 6); } TEST(TargetTestSourceGroup, Target_Build_SourceCompile) { diff --git a/buildcc/lib/target/test/target/test_target_source_out_of_root.cpp b/buildcc/lib/target/test/target/test_target_source_out_of_root.cpp index e37cefb2..e6ac37a1 100644 --- a/buildcc/lib/target/test/target/test_target_source_out_of_root.cpp +++ b/buildcc/lib/target/test/target/test_target_source_out_of_root.cpp @@ -57,7 +57,7 @@ TEST(TargetTestSourceOutOfRootGroup, Glob_OutOfRootSource) { buildcc::base::Target simple( OUTOFROOT, buildcc::base::TargetType::Executable, gcc, ""); simple.GlobSources(".."); // 6 files detected - CHECK_EQUAL(6, simple.GetCurrentSourceFiles().size()); + CHECK_EQUAL(6, simple.GetSourceFiles().size()); buildcc::env::m::CommandExpect_Execute(6, true); buildcc::env::m::CommandExpect_Execute(1, true); diff --git a/buildcc/lib/target/test/target/test_target_sync.cpp b/buildcc/lib/target/test/target/test_target_sync.cpp index 8d9391a3..ad92680a 100644 --- a/buildcc/lib/target/test/target/test_target_sync.cpp +++ b/buildcc/lib/target/test/target/test_target_sync.cpp @@ -66,27 +66,27 @@ TEST(TargetTestSyncGroup, CopyByConstRef) { buildcc::base::SyncOption::LinkDependencies, }); - CHECK_EQUAL(destTarget.GetCurrentSourceFiles().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentHeaderFiles().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchFiles().size(), 1); - - CHECK_EQUAL(destTarget.GetTargetLibDeps().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentExternalLibDeps().size(), 1); - - CHECK_EQUAL(destTarget.GetCurrentIncludeDirs().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLibDirs().size(), 1); - - CHECK_EQUAL(destTarget.GetCurrentPreprocessorFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCommonCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchObjectFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentAsmCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCppCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLinkFlags().size(), 1); - - CHECK_EQUAL(destTarget.GetCurrentCompileDependencies().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLinkDependencies().size(), 1); + CHECK_EQUAL(destTarget.GetSourceFiles().size(), 1); + CHECK_EQUAL(destTarget.GetHeaderFiles().size(), 1); + CHECK_EQUAL(destTarget.GetPchFiles().size(), 1); + + CHECK_EQUAL(destTarget.GetLibDeps().size(), 1); + CHECK_EQUAL(destTarget.GetExternalLibDeps().size(), 1); + + CHECK_EQUAL(destTarget.GetIncludeDirs().size(), 1); + CHECK_EQUAL(destTarget.GetLibDirs().size(), 1); + + CHECK_EQUAL(destTarget.GetPreprocessorFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCommonCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPchCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPchObjectFlags().size(), 1); + CHECK_EQUAL(destTarget.GetAsmCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCppCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetLinkFlags().size(), 1); + + CHECK_EQUAL(destTarget.GetCompileDependencies().size(), 1); + CHECK_EQUAL(destTarget.GetLinkDependencies().size(), 1); } TEST(TargetTestSyncGroup, CopyByMove) { @@ -134,27 +134,27 @@ TEST(TargetTestSyncGroup, CopyByMove) { buildcc::base::SyncOption::LinkDependencies, }); - CHECK_EQUAL(destTarget.GetCurrentSourceFiles().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentHeaderFiles().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchFiles().size(), 1); + CHECK_EQUAL(destTarget.GetSourceFiles().size(), 1); + CHECK_EQUAL(destTarget.GetHeaderFiles().size(), 1); + CHECK_EQUAL(destTarget.GetPchFiles().size(), 1); - CHECK_EQUAL(destTarget.GetTargetLibDeps().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentExternalLibDeps().size(), 1); + CHECK_EQUAL(destTarget.GetLibDeps().size(), 1); + CHECK_EQUAL(destTarget.GetExternalLibDeps().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentIncludeDirs().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLibDirs().size(), 1); + CHECK_EQUAL(destTarget.GetIncludeDirs().size(), 1); + CHECK_EQUAL(destTarget.GetLibDirs().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPreprocessorFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCommonCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchObjectFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentAsmCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCppCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLinkFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPreprocessorFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCommonCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPchCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPchObjectFlags().size(), 1); + CHECK_EQUAL(destTarget.GetAsmCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCppCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetLinkFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCompileDependencies().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLinkDependencies().size(), 1); + CHECK_EQUAL(destTarget.GetCompileDependencies().size(), 1); + CHECK_EQUAL(destTarget.GetLinkDependencies().size(), 1); } TEST(TargetTestSyncGroup, CopyCrash) { @@ -214,27 +214,27 @@ TEST(TargetTestSyncGroup, InsertByConstRef) { buildcc::base::SyncOption::LinkDependencies, }); - CHECK_EQUAL(destTarget.GetCurrentSourceFiles().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentHeaderFiles().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchFiles().size(), 1); + CHECK_EQUAL(destTarget.GetSourceFiles().size(), 1); + CHECK_EQUAL(destTarget.GetHeaderFiles().size(), 1); + CHECK_EQUAL(destTarget.GetPchFiles().size(), 1); - CHECK_EQUAL(destTarget.GetTargetLibDeps().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentExternalLibDeps().size(), 1); + CHECK_EQUAL(destTarget.GetLibDeps().size(), 1); + CHECK_EQUAL(destTarget.GetExternalLibDeps().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentIncludeDirs().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLibDirs().size(), 1); + CHECK_EQUAL(destTarget.GetIncludeDirs().size(), 1); + CHECK_EQUAL(destTarget.GetLibDirs().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPreprocessorFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCommonCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchObjectFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentAsmCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCppCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLinkFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPreprocessorFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCommonCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPchCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPchObjectFlags().size(), 1); + CHECK_EQUAL(destTarget.GetAsmCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCppCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetLinkFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCompileDependencies().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLinkDependencies().size(), 1); + CHECK_EQUAL(destTarget.GetCompileDependencies().size(), 1); + CHECK_EQUAL(destTarget.GetLinkDependencies().size(), 1); } TEST(TargetTestSyncGroup, InsertByMove) { @@ -282,27 +282,27 @@ TEST(TargetTestSyncGroup, InsertByMove) { buildcc::base::SyncOption::LinkDependencies, }); - CHECK_EQUAL(destTarget.GetCurrentSourceFiles().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentHeaderFiles().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchFiles().size(), 1); + CHECK_EQUAL(destTarget.GetSourceFiles().size(), 1); + CHECK_EQUAL(destTarget.GetHeaderFiles().size(), 1); + CHECK_EQUAL(destTarget.GetPchFiles().size(), 1); - CHECK_EQUAL(destTarget.GetTargetLibDeps().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentExternalLibDeps().size(), 1); + CHECK_EQUAL(destTarget.GetLibDeps().size(), 1); + CHECK_EQUAL(destTarget.GetExternalLibDeps().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentIncludeDirs().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLibDirs().size(), 1); + CHECK_EQUAL(destTarget.GetIncludeDirs().size(), 1); + CHECK_EQUAL(destTarget.GetLibDirs().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPreprocessorFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCommonCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentPchObjectFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentAsmCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCppCompileFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLinkFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPreprocessorFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCommonCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPchCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetPchObjectFlags().size(), 1); + CHECK_EQUAL(destTarget.GetAsmCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetCppCompileFlags().size(), 1); + CHECK_EQUAL(destTarget.GetLinkFlags().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentCompileDependencies().size(), 1); - CHECK_EQUAL(destTarget.GetCurrentLinkDependencies().size(), 1); + CHECK_EQUAL(destTarget.GetCompileDependencies().size(), 1); + CHECK_EQUAL(destTarget.GetLinkDependencies().size(), 1); } TEST(TargetTestSyncGroup, InsertCrash) { diff --git a/buildcc/plugins/src/clang_compile_commands.cpp b/buildcc/plugins/src/clang_compile_commands.cpp index 10e103fb..c34e2ebf 100644 --- a/buildcc/plugins/src/clang_compile_commands.cpp +++ b/buildcc/plugins/src/clang_compile_commands.cpp @@ -59,7 +59,7 @@ void ClangCompileCommands::Generate() { std::vector compile_command_list; for (const auto *t : targets_) { - const auto &source_files = t->GetCurrentSourceFiles(); + const auto &source_files = t->GetSourceFiles(); for (const auto &source : source_files) { // DONE, Get source list name // DONE, Get std::vector CompileCommand diff --git a/example/hybrid/generic/build.cpp b/example/hybrid/generic/build.cpp index 04aff896..bcf89acf 100644 --- a/example/hybrid/generic/build.cpp +++ b/example/hybrid/generic/build.cpp @@ -126,7 +126,7 @@ static void foolib_build_cb(BaseTarget &foolib_target) { static void generic_build_cb(BaseTarget &generic_target, BaseTarget &foolib_target) { - const auto &foolib_include_dirs = foolib_target.GetCurrentIncludeDirs(); + const auto &foolib_include_dirs = foolib_target.GetIncludeDirs(); std::for_each( foolib_include_dirs.cbegin(), foolib_include_dirs.cend(), [&](const fs::path &p) { generic_target.AddIncludeDir(p, true); });