coder137 · coder137 · Jan 20, 2022 · Jan 16, 2022 · Jan 16, 2022 · Jan 17, 2022
diff --git a/TODO.md b/TODO.md
@@ -26,7 +26,6 @@ Contains the following working features
 
 - Serialization Interface
 - Namespace changes
-  - Remove ``buildcc::base``
   - Remove ``buildcc::env``
   - We should only have 3 namespaces ``buildcc``, ``buildcc::plugin`` and ``buildcc::internal``
 - Environment updates

diff --git a/buildcc/lib/args/include/args/register.h b/buildcc/lib/args/include/args/register.h
@@ -107,8 +107,8 @@ class Register {
    *
    * Target runs after dependency is built
    */
-  void Dep(const base::BuilderInterface &target,
-           const base::BuilderInterface &dependency);
+  void Dep(const internal::BuilderInterface &target,
+           const internal::BuilderInterface &dependency);
 
   /**
    * @brief Register the Target to be run

diff --git a/buildcc/lib/args/mock/tasks.cpp b/buildcc/lib/args/mock/tasks.cpp
@@ -4,12 +4,12 @@
 
 namespace buildcc {
 
-tf::Task Register::BuildTargetTask(base::Target &target) {
+tf::Task Register::BuildTargetTask(BaseTarget &target) {
   mock().actualCall(fmt::format("BuildTask_{}", target.GetName()).c_str());
   return build_tf_.placeholder().name(target.GetUniqueId());
 }
 
-tf::Task Register::BuildGeneratorTask(base::Generator &generator) {
+tf::Task Register::BuildGeneratorTask(BaseGenerator &generator) {
   mock().actualCall(
       fmt::format("BuildGeneratorTask_{}", generator.GetName()).c_str());
   return build_tf_.placeholder().name(generator.GetUniqueId());

diff --git a/buildcc/lib/args/src/args.cpp b/buildcc/lib/args/src/args.cpp
@@ -75,15 +75,14 @@ const std::unordered_map<const char *, buildcc::env::LogLevel> kLogLevelMap{
     {"critical", buildcc::env::LogLevel::Critical},
 };
 
-const std::unordered_map<const char *, buildcc::base::Toolchain::Id>
-    kToolchainIdMap{
-        {"gcc", buildcc::ToolchainId::Gcc},
-        {"msvc", buildcc::ToolchainId::Msvc},
-        {"mingw", buildcc::ToolchainId::MinGW},
-        {"clang", buildcc::ToolchainId::Clang},
-        {"custom", buildcc::ToolchainId::Custom},
-        {"undefined", buildcc::ToolchainId::Undefined},
-    };
+const std::unordered_map<const char *, buildcc::Toolchain::Id> kToolchainIdMap{
+    {"gcc", buildcc::ToolchainId::Gcc},
+    {"msvc", buildcc::ToolchainId::Msvc},
+    {"mingw", buildcc::ToolchainId::MinGW},
+    {"clang", buildcc::ToolchainId::Clang},
+    {"custom", buildcc::ToolchainId::Custom},
+    {"undefined", buildcc::ToolchainId::Undefined},
+};
 
 } // namespace
 

diff --git a/buildcc/lib/args/src/register.cpp b/buildcc/lib/args/src/register.cpp
@@ -66,8 +66,8 @@ void Register::Clean(const std::function<void(void)> &clean_cb) {
   }
 }
 
-void Register::Dep(const base::BuilderInterface &target,
-                   const base::BuilderInterface &dependency) {
+void Register::Dep(const internal::BuilderInterface &target,
+                   const internal::BuilderInterface &dependency) {
   const auto target_iter = build_.find(target.GetUniqueId());
   const auto dep_iter = build_.find(dependency.GetUniqueId());
   env::assert_fatal(!(target_iter == build_.end() || dep_iter == build_.end()),
@@ -88,7 +88,7 @@ void Register::Dep(const base::BuilderInterface &target,
 }
 
 void Register::Test(const ArgToolchainState &toolchain_state,
-                    const std::string &command, const base::Target &target,
+                    const std::string &command, const BaseTarget &target,
                     const TestConfig &config) {
   if (!(toolchain_state.build && toolchain_state.test)) {
     return;

diff --git a/buildcc/lib/args/src/tasks.cpp b/buildcc/lib/args/src/tasks.cpp
@@ -20,11 +20,11 @@
 
 namespace buildcc {
 
-tf::Task Register::BuildTargetTask(base::Target &target) {
+tf::Task Register::BuildTargetTask(BaseTarget &target) {
   return build_tf_.composed_of(target.GetTaskflow()).name(target.GetUniqueId());
 }
 
-tf::Task Register::BuildGeneratorTask(base::Generator &generator) {
+tf::Task Register::BuildGeneratorTask(BaseGenerator &generator) {
   return build_tf_.composed_of(generator.GetTaskflow())
       .name(generator.GetUniqueId());
 }

diff --git a/buildcc/lib/args/test/test_args.cpp b/buildcc/lib/args/test/test_args.cpp
@@ -66,7 +66,7 @@ TEST(ArgsTestGroup, Args_CustomToolchain) {
   // Toolchain
   CHECK_TRUE(gcc_toolchain.state.build);
   CHECK_FALSE(gcc_toolchain.state.test);
-  CHECK(gcc_toolchain.id == buildcc::base::Toolchain::Id::Gcc);
+  CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);
   STRCMP_EQUAL(gcc_toolchain.name.c_str(), "gcc");
   STRCMP_EQUAL(gcc_toolchain.asm_compiler.c_str(), "as");
   STRCMP_EQUAL(gcc_toolchain.c_compiler.c_str(), "gcc");
@@ -104,7 +104,7 @@ TEST(ArgsTestGroup, Args_MultipleCustomToolchain) {
   // GCC
   CHECK_TRUE(gcc_toolchain.state.build);
   CHECK_FALSE(gcc_toolchain.state.test);
-  CHECK(gcc_toolchain.id == buildcc::base::Toolchain::Id::Gcc);
+  CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);
   STRCMP_EQUAL(gcc_toolchain.name.c_str(), "gcc");
   STRCMP_EQUAL(gcc_toolchain.asm_compiler.c_str(), "as");
   STRCMP_EQUAL(gcc_toolchain.c_compiler.c_str(), "gcc");
@@ -115,7 +115,7 @@ TEST(ArgsTestGroup, Args_MultipleCustomToolchain) {
   // MSVC
   CHECK_TRUE(msvc_toolchain.state.build);
   CHECK_TRUE(msvc_toolchain.state.test);
-  CHECK(msvc_toolchain.id == buildcc::base::Toolchain::Id::Msvc);
+  CHECK(msvc_toolchain.id == buildcc::Toolchain::Id::Msvc);
   STRCMP_EQUAL(msvc_toolchain.name.c_str(), "msvc");
   STRCMP_EQUAL(msvc_toolchain.asm_compiler.c_str(), "cl");
   STRCMP_EQUAL(msvc_toolchain.c_compiler.c_str(), "cl");
@@ -165,7 +165,7 @@ TEST(ArgsTestGroup, Args_CustomTarget) {
   // Toolchain
   CHECK_TRUE(gcc_toolchain.state.build);
   CHECK_FALSE(gcc_toolchain.state.test);
-  CHECK(gcc_toolchain.id == buildcc::base::Toolchain::Id::Gcc);
+  CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);
   STRCMP_EQUAL(gcc_toolchain.name.c_str(), "gcc");
   STRCMP_EQUAL(gcc_toolchain.asm_compiler.c_str(), "as");
   STRCMP_EQUAL(gcc_toolchain.c_compiler.c_str(), "gcc");
@@ -219,7 +219,7 @@ TEST(ArgsTestGroup, Args_MultipleCustomTarget) {
   // Toolchain
   CHECK_TRUE(gcc_toolchain.state.build);
   CHECK_FALSE(gcc_toolchain.state.test);
-  CHECK(gcc_toolchain.id == buildcc::base::Toolchain::Id::Gcc);
+  CHECK(gcc_toolchain.id == buildcc::Toolchain::Id::Gcc);
   STRCMP_EQUAL(gcc_toolchain.name.c_str(), "gcc");
   STRCMP_EQUAL(gcc_toolchain.asm_compiler.c_str(), "as");
   STRCMP_EQUAL(gcc_toolchain.c_compiler.c_str(), "gcc");
@@ -240,7 +240,7 @@ TEST(ArgsTestGroup, Args_MultipleCustomTarget) {
   // Toolchain
   CHECK_TRUE(msvc_toolchain.state.build);
   CHECK_TRUE(msvc_toolchain.state.test);
-  CHECK(msvc_toolchain.id == buildcc::base::Toolchain::Id::Msvc);
+  CHECK(msvc_toolchain.id == buildcc::Toolchain::Id::Msvc);
   STRCMP_EQUAL(msvc_toolchain.name.c_str(), "msvc");
   STRCMP_EQUAL(msvc_toolchain.asm_compiler.c_str(), "cl");
   STRCMP_EQUAL(msvc_toolchain.c_compiler.c_str(), "cl");