coder137 · coder137 · Mar 17, 2022 · Feb 22, 2022 · Feb 22, 2022 · Feb 22, 2022
diff --git a/bootstrap/src/build_buildcc.cpp b/bootstrap/src/build_buildcc.cpp
@@ -63,6 +63,7 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,
   // TOOLCHAIN
   target.GlobSources("lib/toolchain/src/api");
   target.GlobSources("lib/toolchain/src/common");
+  target.GlobSources("lib/toolchain/src/toolchain");
   target.AddIncludeDir("lib/toolchain/include");
   target.GlobHeaders("lib/toolchain/include/toolchain");
   target.GlobHeaders("lib/toolchain/include/toolchain/api");
@@ -72,6 +73,7 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,
   target.GlobSources("lib/target/src/common");
   target.GlobSources("lib/target/src/generator");
   target.GlobSources("lib/target/src/api");
+  target.GlobSources("lib/target/src/target_info");
   target.GlobSources("lib/target/src/target");
   target.GlobSources("lib/target/src/target/friend");
 

diff --git a/buildcc/lib/args/test/test_persistent_storage.cpp b/buildcc/lib/args/test/test_persistent_storage.cpp
@@ -16,8 +16,8 @@ TEST_GROUP(PersistentStorageTestGroup)
 };
 // clang-format on
 
-buildcc::BaseToolchain gcc(buildcc::ToolchainId::Gcc, "gcc", "as", "gcc", "g++",
-                           "ar", "ld");
+static buildcc::BaseToolchain gcc(buildcc::ToolchainId::Gcc, "gcc", "as", "gcc",
+                                  "g++", "ar", "ld");
 
 TEST(PersistentStorageTestGroup, BasicUsage) {
   buildcc::PersistentStorage persistent;

diff --git a/buildcc/lib/target/cmake/common_target_src.cmake b/buildcc/lib/target/cmake/common_target_src.cmake
@@ -23,7 +23,6 @@ set(COMMON_TARGET_SRCS
     include/target/api/include_api.h
     include/target/api/lib_api.h
     include/target/api/pch_api.h
-    include/target/api/flag_api.h
     include/target/api/deps_api.h
 
     src/api/sync_api.cpp
@@ -38,6 +37,10 @@ set(COMMON_TARGET_SRCS
     src/generator/generator.cpp
     include/target/generator.h
 
+    # Target Info
+    src/target_info/target_info.cpp
+    include/target/target_info.h
+
     # Target friend
     src/target/friend/compile_pch.cpp
     src/target/friend/compile_object.cpp
@@ -49,6 +52,5 @@ set(COMMON_TARGET_SRCS
     # Target
     src/target/target.cpp
     src/target/build.cpp
-    include/target/target_info.h
     include/target/target.h
 )
diff --git a/buildcc/lib/target/include/target/api/deps_api.h b/buildcc/lib/target/include/target/api/deps_api.h
@@ -25,7 +25,6 @@ namespace buildcc::internal {
 
 // Requires
 // - TargetStorer
-// - TargetState
 // - TargetEnv
 template <typename T> class DepsApi {
 public:

diff --git a/buildcc/lib/target/include/target/api/include_api.h b/buildcc/lib/target/include/target/api/include_api.h
@@ -25,7 +25,6 @@ namespace buildcc::internal {
 
 // Requires
 // - TargetStorer
-// - TargetState
 // - TargetConfig
 // - TargetEnv
 template <typename T> class IncludeApi {

diff --git a/buildcc/lib/target/include/target/api/lib_api.h b/buildcc/lib/target/include/target/api/lib_api.h
@@ -32,7 +32,6 @@ namespace buildcc::internal {
 
 // Requires
 // - TargetStorer
-// - TargetState
 // - TargetEnv
 // T::GetTargetPath
 template <typename T> class LibApi {

diff --git a/buildcc/lib/target/include/target/api/pch_api.h b/buildcc/lib/target/include/target/api/pch_api.h
@@ -25,7 +25,6 @@ namespace buildcc::internal {
 
 // Requires
 // - TargetStorer
-// - TargetState
 // - TargetConfig
 // - TargetEnv
 template <typename T> class PchApi {

diff --git a/buildcc/lib/target/include/target/api/source_api.h b/buildcc/lib/target/include/target/api/source_api.h
@@ -25,7 +25,6 @@ namespace buildcc::internal {
 
 // Requires
 // - TargetStorer
-// - TargetState
 // - TargetConfig
 // - TargetEnv
 template <typename T> class SourceApi {

diff --git a/buildcc/lib/target/include/target/api/sync_api.h b/buildcc/lib/target/include/target/api/sync_api.h
@@ -43,7 +43,6 @@ enum class SyncOption {
 
 // Requires
 // - TargetStorer
-// - TargetState
 template <typename T> class SyncApi {
 public:
   /**

diff --git a/buildcc/lib/target/include/target/api/target_getter.h b/buildcc/lib/target/include/target/api/target_getter.h
@@ -24,6 +24,8 @@
 
 #include "toolchain/toolchain.h"
 
+#include "target/common/target_state.h"
+
 #include "taskflow/taskflow.hpp"
 
 namespace fs = std::filesystem;
@@ -32,6 +34,11 @@ namespace buildcc::internal {
 
 template <typename T> class TargetGetter {
 public:
+  // Target State
+  const TargetState &GetState() const;
+  bool IsBuilt() const;
+  bool IsLocked() const;
+
   const std::string &GetName() const;
   const Toolchain &GetToolchain() const;
   TargetType GetType() const;

diff --git a/buildcc/lib/target/include/target/api/target_info_getter.h b/buildcc/lib/target/include/target/api/target_info_getter.h
@@ -26,16 +26,10 @@ namespace buildcc::internal {
 
 // Requires
 // - TargetStorer
-// - TargetState
 // - TargetEnv
 // - TargetConfig
 template <typename T> class TargetInfoGetter {
 public:
-  // Target State
-  const TargetState &GetState() const;
-  bool IsBuilt() const;
-  bool IsLocked() const;
-
   // Target Env
   const fs::path &GetTargetRootDir() const;
   const fs::path &GetTargetBuildDir() const;
@@ -51,14 +45,7 @@ template <typename T> class TargetInfoGetter {
   const std::vector<std::string> &GetExternalLibDeps() const;
   const fs_unordered_set &GetIncludeDirs() const;
   const fs_unordered_set &GetLibDirs() const;
-  const std::unordered_set<std::string> &GetPreprocessorFlags() const;
-  const std::unordered_set<std::string> &GetCommonCompileFlags() const;
-  const std::unordered_set<std::string> &GetPchCompileFlags() const;
-  const std::unordered_set<std::string> &GetPchObjectFlags() const;
-  const std::unordered_set<std::string> &GetAsmCompileFlags() const;
-  const std::unordered_set<std::string> &GetCCompileFlags() const;
-  const std::unordered_set<std::string> &GetCppCompileFlags() const;
-  const std::unordered_set<std::string> &GetLinkFlags() const;
+
   const fs_unordered_set &GetCompileDependencies() const;
   const fs_unordered_set &GetLinkDependencies() const;
 };

diff --git a/buildcc/lib/target/include/target/generator.h b/buildcc/lib/target/include/target/generator.h
@@ -39,6 +39,7 @@
 
 namespace buildcc {
 
+// TODO, Make this private
 struct UserGeneratorSchema : public internal::GeneratorSchema {
   fs_unordered_set inputs;
 };

diff --git a/buildcc/lib/target/include/target/target.h b/buildcc/lib/target/include/target/target.h
@@ -140,22 +140,20 @@ class Target : public internal::BuilderInterface,
   std::string name_;
   TargetType type_;
   internal::TargetSerialization serialization_;
-
-  // Friend classes
   internal::CompilePch compile_pch_;
   internal::CompileObject compile_object_;
   internal::LinkTarget link_target_;
 
+  //
+  TargetState state_;
+  env::Command command_;
+  tf::Taskflow tf_;
+
   // Task states
   tf::Task target_start_task_;
   tf::Task target_end_task_;
-
   std::mutex task_state_mutex_;
   env::TaskState task_state_{env::TaskState::SUCCESS};
-
-  //
-  env::Command command_;
-  tf::Taskflow tf_;
 };
 
 typedef Target BaseTarget;

diff --git a/buildcc/lib/target/include/target/target_info.h b/buildcc/lib/target/include/target/target_info.h
@@ -21,13 +21,10 @@
 
 #include "toolchain/toolchain.h"
 
-#include "target/common/function_lock.h"
 #include "target/common/target_config.h"
 #include "target/common/target_env.h"
-#include "target/common/target_state.h"
 
 #include "target/api/deps_api.h"
-#include "target/api/flag_api.h"
 #include "target/api/include_api.h"
 #include "target/api/lib_api.h"
 #include "target/api/pch_api.h"
@@ -39,6 +36,7 @@
 
 namespace buildcc {
 
+// TODO, Make this private
 struct UserTargetSchema : public internal::TargetSchema {
   fs_unordered_set sources;
   fs_unordered_set headers;
@@ -65,7 +63,9 @@ class TargetInfo : public internal::SourceApi<TargetInfo>,
 public:
   TargetInfo(const BaseToolchain &toolchain, const TargetEnv &env,
              const TargetConfig &config = TargetConfig())
-      : toolchain_(toolchain), env_(env), config_(config) {}
+      : toolchain_(toolchain), env_(env), config_(config) {
+    Initialize();
+  }
 
 private:
   // Inputs
@@ -87,10 +87,12 @@ class TargetInfo : public internal::SourceApi<TargetInfo>,
   TargetEnv env_;
   TargetConfig config_;
 
+  //
   UserTargetSchema user_;
-
   FunctionLock lock_;
-  TargetState state_;
+
+private:
+  void Initialize();
 };
 
 typedef TargetInfo BaseTargetInfo;

diff --git a/buildcc/lib/target/src/api/flag_api.cpp b/buildcc/lib/target/src/api/flag_api.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "target/api/flag_api.h"
+#include "toolchain/api/flag_api.h"
 
 #include "target/target_info.h"
 
@@ -76,6 +76,50 @@ template <typename T> void FlagApi<T>::AddLinkFlag(const std::string &flag) {
   t.user_.link_flags.insert(flag);
 }
 
+template <typename T>
+const std::unordered_set<std::string> &
+FlagApi<T>::GetPreprocessorFlags() const {
+  const T &t = static_cast<const T &>(*this);
+  return t.user_.preprocessor_flags;
+}
+template <typename T>
+const std::unordered_set<std::string> &
+FlagApi<T>::GetCommonCompileFlags() const {
+  const T &t = static_cast<const T &>(*this);
+  return t.user_.common_compile_flags;
+}
+template <typename T>
+const std::unordered_set<std::string> &FlagApi<T>::GetPchCompileFlags() const {
+  const T &t = static_cast<const T &>(*this);
+  return t.user_.pch_compile_flags;
+}
+template <typename T>
+const std::unordered_set<std::string> &FlagApi<T>::GetPchObjectFlags() const {
+  const T &t = static_cast<const T &>(*this);
+  return t.user_.pch_object_flags;
+}
+template <typename T>
+const std::unordered_set<std::string> &FlagApi<T>::GetAsmCompileFlags() const {
+  const T &t = static_cast<const T &>(*this);
+  return t.user_.asm_compile_flags;
+}
+template <typename T>
+const std::unordered_set<std::string> &FlagApi<T>::GetCCompileFlags() const {
+  const T &t = static_cast<const T &>(*this);
+  return t.user_.c_compile_flags;
+}
+template <typename T>
+const std::unordered_set<std::string> &FlagApi<T>::GetCppCompileFlags() const {
+  const T &t = static_cast<const T &>(*this);
+  return t.user_.cpp_compile_flags;
+}
+template <typename T>
+const std::unordered_set<std::string> &FlagApi<T>::GetLinkFlags() const {
+  const T &t = static_cast<const T &>(*this);
+  return t.user_.link_flags;
+}
+
 template class FlagApi<TargetInfo>;
+template class FlagApi<Toolchain>;
 
 } // namespace buildcc::internal
diff --git a/buildcc/lib/target/src/api/target_getter.cpp b/buildcc/lib/target/src/api/target_getter.cpp
@@ -20,6 +20,25 @@
 
 namespace buildcc::internal {
 
+// Target State
+template <typename T> const TargetState &TargetGetter<T>::GetState() const {
+  const T &t = static_cast<const T &>(*this);
+
+  return t.state_;
+}
+
+template <typename T> bool TargetGetter<T>::IsBuilt() const {
+  const T &t = static_cast<const T &>(*this);
+
+  return t.state_.IsBuilt();
+}
+
+template <typename T> bool TargetGetter<T>::IsLocked() const {
+  const T &t = static_cast<const T &>(*this);
+
+  return t.lock_.IsLocked();
+}
+
 template <typename T> const fs::path &TargetGetter<T>::GetBinaryPath() const {
   const T &t = static_cast<const T &>(*this);