coder137 · coder137 · Nov 18, 2021 · Nov 18, 2021 · Nov 18, 2021 · Nov 18, 2021
diff --git a/buildcc/lib/target/cmake/mock_target.cmake b/buildcc/lib/target/cmake/mock_target.cmake
@@ -7,14 +7,18 @@ add_library(mock_target STATIC
     src/common/target_state.cpp
 
     # API
-    src/api/copy_api.cpp
     src/api/source_api.cpp
     src/api/include_api.cpp
     src/api/lib_api.cpp
     src/api/pch_api.cpp
     src/api/flag_api.cpp
     src/api/deps_api.cpp
 
+    src/api/copy_api.cpp
+
+    src/api/target_info_getter.cpp
+
+
     # Generator
     src/generator/generator_loader.cpp
     src/generator/generator_storer.cpp

diff --git a/buildcc/lib/target/cmake/target.cmake b/buildcc/lib/target/cmake/target.cmake
@@ -18,21 +18,25 @@ set(TARGET_SRCS
     include/target/common/target_type.h
 
     # API
-    src/api/copy_api.cpp
     src/api/source_api.cpp
     src/api/include_api.cpp
     src/api/lib_api.cpp
     src/api/pch_api.cpp
     src/api/flag_api.cpp
     src/api/deps_api.cpp
-    include/target/api/copy_api.h
     include/target/api/source_api.h
     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/copy_api.cpp
+    include/target/api/copy_api.h
+
+    src/api/target_info_getter.cpp
+    include/target/api/target_info_getter.h
+
     # Generator
     src/generator/generator_loader.cpp
     src/generator/generator_storer.cpp

diff --git a/buildcc/lib/target/include/target/api/target_info_getter.h b/buildcc/lib/target/include/target/api/target_info_getter.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021 Niket Naidu. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef TARGET_API_TARGET_INFO_GETTER_H_
+#define TARGET_API_TARGET_INFO_GETTER_H_
+
+#include "target/path.h"
+
+#include "target/common/target_config.h"
+#include "target/common/target_state.h"
+
+namespace buildcc::base {
+
+// Requires
+// - TargetStorer
+// - TargetState
+// - TargetEnv
+// - TargetConfig
+template <typename T> class TargetInfoGetter {
+public:
+  // Target State
+  const TargetState &GetState() const;
+  bool GetBuildState() const;
+  bool GetLockState() const;
+
+  // Target Env
+  const fs::path &GetTargetRootDir() const;
+  const fs::path &GetTargetBuildDir() const;
+
+  // Target Config
+  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 internal::fs_unordered_set &GetTargetLibDeps() const;
+  const std::unordered_set<std::string> &GetCurrentExternalLibDeps() const;
+  const internal::fs_unordered_set &GetCurrentIncludeDirs() const;
+  const internal::fs_unordered_set &GetCurrentLibDirs() const;
+  const std::unordered_set<std::string> &GetCurrentPreprocessorFlags() const;
+  const std::unordered_set<std::string> &GetCurrentCommonCompileFlags() const;
+  const std::unordered_set<std::string> &GetCurrentPchCompileFlags() const;
+  const std::unordered_set<std::string> &GetCurrentPchObjectFlags() const;
+  const std::unordered_set<std::string> &GetCurrentAsmCompileFlags() const;
+  const std::unordered_set<std::string> &GetCurrentCCompileFlags() const;
+  const std::unordered_set<std::string> &GetCurrentCppCompileFlags() const;
+  const std::unordered_set<std::string> &GetCurrentLinkFlags() const;
+  const internal::fs_unordered_set &GetCurrentCompileDependencies() const;
+  const internal::fs_unordered_set &GetCurrentLinkDependencies() const;
+};
+
+} // namespace buildcc::base
+
+#endif
diff --git a/buildcc/lib/target/include/target/common/target_state.h b/buildcc/lib/target/include/target/common/target_state.h
@@ -21,21 +21,21 @@
 
 namespace buildcc::base {
 
+// TODO, Seperate TargetState into lock_ and other internal boolean variables
+// NOTE, This is because apart from lock_ every other parameter is updated
+// during `Target::Build`
+// TargetInfo does not have a `Build` method, it is only meant to hold
+// information
 struct TargetState {
   void SetSourceState(TargetFileExt file_extension);
   void SetPch();
   void SetLock();
 
   void ExpectsUnlock() const;
   void ExpectsLock() const;
+  // TODO, IsLocked
 
   bool ContainsPch() const { return contains_pch_; }
-  // TODO, ContainsAsm
-  // TODO, ContainsC
-  // TODO, ContainsCpp
-
-  // TODO, IsLocked
-  // TODO, IsBuilt
 
   // TODO, Make these private getters
   bool contains_asm{false};

diff --git a/buildcc/lib/target/include/target/target.h b/buildcc/lib/target/include/target/target.h
@@ -30,21 +30,12 @@
 // Interface
 #include "target/builder_interface.h"
 
+// API
+#include "target/target_info.h"
+
 // Common
-#include "target/common/target_config.h"
-#include "target/common/target_env.h"
-#include "target/common/target_state.h"
 #include "target/common/target_type.h"
 
-// API
-#include "target/api/copy_api.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"
-#include "target/api/source_api.h"
-
 // Friend
 #include "target/friend/compile_object.h"
 #include "target/friend/compile_pch.h"
@@ -70,52 +61,31 @@ namespace buildcc::base {
 // of the inheritance pattern
 // NOTE, base::Target is meant to be a blank slate which can be customized by
 // the specialized target-toolchain classes
-class Target : public BuilderInterface,
-               public CopyApi<Target>,
-               public SourceApi<Target>,
-               public IncludeApi<Target>,
-               public LibApi<Target>,
-               public PchApi<Target>,
-               public FlagApi<Target>,
-               public DepsApi<Target> {
+class Target : public BuilderInterface, public TargetInfo {
 
 public:
   explicit Target(const std::string &name, TargetType type,
                   const Toolchain &toolchain, const TargetEnv &env,
-                  const TargetConfig &config = {})
-      : name_(name), type_(type), toolchain_(toolchain), config_(config),
-        env_(env.GetTargetRootDir(),
-             env.GetTargetBuildDir() / toolchain.GetName() / name),
+                  const TargetConfig &config = TargetConfig())
+      : TargetInfo(
+            TargetEnv(env.GetTargetRootDir(),
+                      env.GetTargetBuildDir() / toolchain.GetName() / name),
+            config),
+        name_(name), type_(type), toolchain_(toolchain),
         loader_(name, env_.GetTargetBuildDir()), compile_pch_(*this),
         compile_object_(*this), link_target_(*this) {
     Initialize();
   }
   virtual ~Target() {}
-
   Target(const Target &target) = delete;
 
   // Builders
   void Build() override;
 
-  // TODO, Add more setters
-
-  //
-  std::optional<std::string> SelectCompileFlags(TargetFileExt ext) const;
-  std::optional<std::string> SelectCompiler(TargetFileExt ext) const;
-
   // Getters (GENERIC)
 
-  // Target state
-
-  // Set during first build or rebuild
-  // lock == true after Build is called
-  const TargetState &GetState() const { return state_; }
-  bool GetBuildState() const { return state_.build; }
-  bool GetLockState() const { return state_.lock; }
-
   // NOTE, We are constructing the path
   fs::path GetBinaryPath() const { return loader_.GetBinaryPath(); }
-
   const fs::path &GetTargetPath() const { return link_target_.GetOutput(); }
   const fs::path &GetPchHeaderPath() const {
     return compile_pch_.GetHeaderPath();
@@ -130,62 +100,8 @@ class Target : public BuilderInterface,
   const std::string &GetName() const { return name_; }
   const Toolchain &GetToolchain() const { return toolchain_; }
   TargetType GetType() const { return type_; }
-  const fs::path &GetTargetRootDir() const { return env_.GetTargetRootDir(); }
-  const fs::path &GetTargetBuildDir() const { return env_.GetTargetBuildDir(); }
-  const TargetConfig &GetConfig() const { return config_; }
 
   //
-  const internal::fs_unordered_set &GetCurrentSourceFiles() const {
-    return storer_.current_source_files.user;
-  }
-  const internal::fs_unordered_set &GetCurrentHeaderFiles() const {
-    return storer_.current_header_files.user;
-  }
-  const internal::fs_unordered_set &GetCurrentPchFiles() const {
-    return storer_.current_pch_files.user;
-  }
-  const internal::fs_unordered_set &GetTargetLibDeps() const {
-    return storer_.current_lib_deps.user;
-  }
-  const std::unordered_set<std::string> &GetCurrentExternalLibDeps() const {
-    return storer_.current_external_lib_deps;
-  }
-  const internal::fs_unordered_set &GetCurrentIncludeDirs() const {
-    return storer_.current_include_dirs;
-  }
-  const internal::fs_unordered_set &GetCurrentLibDirs() const {
-    return storer_.current_lib_dirs;
-  }
-  const std::unordered_set<std::string> &GetCurrentPreprocessorFlags() const {
-    return storer_.current_preprocessor_flags;
-  }
-  const std::unordered_set<std::string> &GetCurrentCommonCompileFlags() const {
-    return storer_.current_common_compile_flags;
-  }
-  const std::unordered_set<std::string> &GetCurrentPchCompileFlags() const {
-    return storer_.current_pch_compile_flags;
-  }
-  const std::unordered_set<std::string> &GetCurrentPchObjectFlags() const {
-    return storer_.current_pch_object_flags;
-  }
-  const std::unordered_set<std::string> &GetCurrentAsmCompileFlags() const {
-    return storer_.current_asm_compile_flags;
-  }
-  const std::unordered_set<std::string> &GetCurrentCCompileFlags() const {
-    return storer_.current_c_compile_flags;
-  }
-  const std::unordered_set<std::string> &GetCurrentCppCompileFlags() const {
-    return storer_.current_cpp_compile_flags;
-  }
-  const std::unordered_set<std::string> &GetCurrentLinkFlags() const {
-    return storer_.current_link_flags;
-  }
-  const internal::fs_unordered_set &GetCurrentCompileDependencies() const {
-    return storer_.current_compile_dependencies.user;
-  }
-  const internal::fs_unordered_set &GetCurrentLinkDependencies() const {
-    return storer_.current_link_dependencies.user;
-  }
 
   // Getters (state_.ExpectsLock)
 
@@ -221,6 +137,10 @@ class Target : public BuilderInterface,
 private:
   void Initialize();
 
+  //
+  std::optional<std::string> SelectCompileFlags(TargetFileExt ext) const;
+  std::optional<std::string> SelectCompiler(TargetFileExt ext) const;
+
   // Recompilation checks
   void RecheckPaths(const internal::path_unordered_set &previous_path,
                     const internal::path_unordered_set &current_path);
@@ -235,7 +155,10 @@ class Target : public BuilderInterface,
   // Fbs
   bool Store() override;
 
-  // Callbacks
+  // Tasks
+  void TaskDeps();
+
+  // Callbacks for unit tests
   void SourceRemoved();
   void SourceAdded();
   void SourceUpdated();
@@ -247,25 +170,18 @@ class Target : public BuilderInterface,
   void FlagChanged();
   void ExternalLibChanged();
 
-  void TaskDeps();
-
 private:
-  // Constructor defined
   std::string name_;
   TargetType type_;
   const Toolchain &toolchain_;
-  TargetConfig config_;
-  TargetEnv env_;
   internal::TargetLoader loader_;
 
-  // Friend
+  // Friend classes
   CompilePch compile_pch_;
   CompileObject compile_object_;
   LinkTarget link_target_;
 
-  // Used for serialization
-  internal::TargetStorer storer_;
-  TargetState state_;
+  //
   Command command_;
   tf::Taskflow tf_;
 };