[Tidy] Shift Command to its own lib directory

buildcc/CMakeLists.txt

@@ -34,6 +34,9 @@ endif()
 # Environment
 add_subdirectory(lib/env)
 
+# 
+add_subdirectory(lib/command)
+
 # Toolchain
 add_subdirectory(lib/toolchain)
 add_subdirectory(toolchains)

buildcc/lib/command/CMakeLists.txt

@@ -0,0 +1,65 @@
+if (${TESTING})
+    add_library(mock_command
+        mock/execute.cpp
+        src/command.cpp
+    )
+    target_include_directories(mock_command PUBLIC 
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/mock
+    )
+    target_link_libraries(mock_command PUBLIC
+        fmt::fmt-header-only
+        mock_env
+        CppUTest
+        CppUTestExt
+        gcov
+    )
+    target_compile_options(mock_command PUBLIC ${TEST_COMPILE_FLAGS} ${BUILD_COMPILE_FLAGS})
+    target_link_options(mock_command PUBLIC ${TEST_LINK_FLAGS} ${BUILD_LINK_FLAGS})
+endif()
+
+set(COMMAND_SRCS
+    src/execute.cpp
+    src/command.cpp
+    include/command/command.h
+)
+
+if(${BUILDCC_BUILD_AS_SINGLE_LIB})
+    target_sources(buildcc PRIVATE
+        ${COMMAND_SRCS}
+    )
+    target_include_directories(buildcc PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:${BUILDCC_INSTALL_HEADER_PREFIX}>
+    )
+endif()
+
+if(${BUILDCC_BUILD_AS_INTERFACE})
+    m_clangtidy("command")
+    add_library(command
+        ${COMMAND_SRCS}
+    )
+    target_include_directories(command PUBLIC 
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:${BUILDCC_INSTALL_HEADER_PREFIX}>
+    )
+    target_link_libraries(command PRIVATE 
+        fmt::fmt-header-only
+        tiny-process-library::tiny-process-library
+
+        env
+    )
+    target_compile_options(command PRIVATE ${BUILD_COMPILE_FLAGS})
+    target_link_options(command PRIVATE ${BUILD_LINK_FLAGS})
+
+
+    # Command install
+    if (${BUILDCC_INSTALL})
+        install(TARGETS command DESTINATION lib EXPORT commandConfig)
+        install(EXPORT commandConfig DESTINATION "${BUILDCC_INSTALL_LIB_PREFIX}/command")
+    endif()
+endif()
+
+if (${BUILDCC_INSTALL})
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION "${BUILDCC_INSTALL_HEADER_PREFIX}")
+endif()

buildcc/lib/target/include/target/command.h → buildcc/lib/command/include/command/command.h

@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef TARGET_COMMAND_H_
-#define TARGET_COMMAND_H_
+#ifndef COMMAND_COMMAND_H_
+#define COMMAND_COMMAND_H_
 
+#include <string>
+#include <string_view>
 #include <unordered_map>
 
-#include "target/path.h"
-
-#include "toolchain/toolchain.h"
-
-namespace buildcc::internal {
+namespace buildcc {
 
 class Command {
 public:
@@ -45,6 +43,6 @@ class Command {
   std::unordered_map<const char *, std::string> default_values_;
 };
 
-} // namespace buildcc::internal
+} // namespace buildcc
 
 #endif

buildcc/lib/target/mock/util/execute.cpp → buildcc/lib/command/mock/execute.cpp

@@ -1,8 +1,8 @@
-#include "target/command.h"
+#include "command/command.h"
 
 #include "CppUTestExt/MockSupport.h"
 
-namespace buildcc::internal {
+namespace buildcc {
 
 static constexpr const char *const EXECUTE_FUNCTION = "execute";
 
@@ -20,4 +20,4 @@ void CommandExpect_Execute(unsigned int calls, bool expectation) {
 
 } // namespace m
 
-} // namespace buildcc::internal
+} // namespace buildcc

buildcc/lib/command/mock/expect_command.h

@@ -0,0 +1,10 @@
+#ifndef COMMAND_MOCK_EXPECT_COMMAND_H_
+#define COMMAND_MOCK_EXPECT_COMMAND_H_
+
+namespace buildcc::m {
+
+void CommandExpect_Execute(unsigned int calls, bool expectation);
+
+} // namespace buildcc::m
+
+#endif

buildcc/lib/target/src/util/command.cpp → buildcc/lib/command/src/command.cpp

@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-#include "target/command.h"
+#include "command/command.h"
 
 #include <algorithm>
 
-#include "env/logging.h"
 #include "fmt/format.h"
 
-namespace buildcc::internal {
+#include "env/assert_fatal.h"
+#include "env/logging.h"
+
+namespace buildcc {
 
 void Command::AddDefaultArguments(
     const std::unordered_map<const char *, std::string> &arguments) {
@@ -61,4 +63,4 @@ bool Command::ConstructAndExecute(
   return Execute(constructed_command);
 }
 
-} // namespace buildcc::internal
+} // namespace buildcc

buildcc/lib/target/src/util/execute.cpp → buildcc/lib/command/src/execute.cpp

@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-#include "target/command.h"
+#include "command/command.h"
 
+#include "fmt/format.h"
+
+#include "env/assert_fatal.h"
 #include "env/logging.h"
 
 #include "process.hpp"
 
 namespace tpl = TinyProcessLib;
 
-namespace buildcc::internal {
+namespace buildcc {
 
 bool Command::Execute(const std::string &command) {
   env::assert_fatal(!command.empty(),
@@ -33,4 +36,4 @@ bool Command::Execute(const std::string &command) {
   return process.get_exit_status() == 0;
 }
 
-} // namespace buildcc::internal
+} // namespace buildcc

buildcc/lib/env/CMakeLists.txt

@@ -10,6 +10,8 @@ if (${TESTING})
     target_link_libraries(mock_env PUBLIC
         fmt::fmt-header-only
     )
+    target_compile_options(mock_env PUBLIC ${TEST_COMPILE_FLAGS} ${BUILD_COMPILE_FLAGS})
+    target_link_options(mock_env PUBLIC ${TEST_LINK_FLAGS} ${BUILD_LINK_FLAGS})
 endif()
 
 set(ENV_SRCS

buildcc/lib/target/cmake/mock_target.cmake

@@ -12,8 +12,6 @@ add_library(mock_target STATIC
     src/fbs/fbs_storer.cpp
 
     src/util/util.cpp
-    src/util/command.cpp
-    mock/util/execute.cpp
 )
 target_include_directories(mock_target PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -28,6 +26,7 @@ target_link_libraries(mock_target PUBLIC
     Taskflow
 
     mock_env
+    mock_command
     toolchain
 
     CppUTest

buildcc/lib/target/cmake/target.cmake

@@ -13,14 +13,11 @@ set(TARGET_SRCS
     src/fbs/fbs_storer.cpp
 
     src/util/util.cpp
-    src/util/command.cpp
-    src/util/execute.cpp
 
     include/target/target.h
     include/target/fbs_loader.h
     include/target/path.h
     include/target/util.h
-    include/target/command.h
 )
 
 if(${BUILDCC_BUILD_AS_SINGLE_LIB})
@@ -48,13 +45,11 @@ if(${BUILDCC_BUILD_AS_INTERFACE})
     )
     target_link_libraries(target PUBLIC 
         env
+        command
         toolchain
         flatbuffers_header_only
         Taskflow
     )
-    target_link_libraries(target PRIVATE
-        tiny-process-library::tiny-process-library
-    )
 
     target_include_directories(target PRIVATE
         ${SCHEMA_BUILD_DIR}

buildcc/lib/target/include/target/target.h

@@ -27,14 +27,12 @@
 #include <vector>
 
 // Internal
-#include "target/command.h"
 #include "target/fbs_loader.h"
 #include "target/path.h"
 
-#include "toolchain/toolchain.h"
-
-// Env
+#include "command/command.h"
 #include "env/env.h"
+#include "toolchain/toolchain.h"
 
 // Third Party
 #include "taskflow/taskflow.hpp"
@@ -313,7 +311,7 @@ class Target {
   // TODO, Add more internal variables
 
   internal::FbsLoader loader_;
-  internal::Command command_;
+  Command command_;
 
   // Build states
   bool dirty_ = false;

buildcc/lib/target/mock/expect_target.h

@@ -5,12 +5,6 @@
 
 namespace buildcc {
 
-namespace internal::m {
-
-void CommandExpect_Execute(unsigned int calls, bool expectation);
-
-} // namespace internal::m
-
 namespace base::m {
 
 void TargetExpect_SourceRemoved(unsigned int calls, Target *target);

buildcc/lib/target/src/target/source.cpp

@@ -162,8 +162,7 @@ void Target::RecompileSources(std::vector<fs::path> &compile_sources,
 }
 
 void Target::CompileSource(const fs::path &current_source) const {
-  const bool success =
-      internal::Command::Execute(CompileCommand(current_source));
+  const bool success = Command::Execute(CompileCommand(current_source));
   env::assert_fatal(success, fmt::format("Compilation failed for: {}",
                                          current_source.string()));
 }

buildcc/lib/target/test/target/test_target_c_compile_flags.cpp

@@ -1,6 +1,8 @@
 #include "constants.h"
 
+#include "expect_command.h"
 #include "expect_target.h"
+
 #include "target/target.h"
 
 #include "env/env.h"
@@ -48,8 +50,8 @@ TEST(TargetTestCCompileFlagsGroup, Target_AddCompileFlag) {
   simple.AddSource(DUMMY_MAIN);
   simple.AddCCompileFlag("-std=c11");
 
-  buildcc::internal::m::CommandExpect_Execute(1, true);
-  buildcc::internal::m::CommandExpect_Execute(1, true);
+  buildcc::m::CommandExpect_Execute(1, true);
+  buildcc::m::CommandExpect_Execute(1, true);
   simple.Build();
 
   mock().checkExpectations();
@@ -78,8 +80,8 @@ TEST(TargetTestCCompileFlagsGroup, Target_ChangedCompileFlag) {
     simple.AddSource(DUMMY_MAIN);
     simple.AddCCompileFlag("-std=c11");
 
-    buildcc::internal::m::CommandExpect_Execute(1, true);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
     simple.Build();
   }
   {
@@ -88,8 +90,8 @@ TEST(TargetTestCCompileFlagsGroup, Target_ChangedCompileFlag) {
                                  gcc, "data");
     simple.AddSource(DUMMY_MAIN);
     buildcc::base::m::TargetExpect_FlagChanged(1, &simple);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
     simple.Build();
   }
 
@@ -100,8 +102,8 @@ TEST(TargetTestCCompileFlagsGroup, Target_ChangedCompileFlag) {
     simple.AddSource(DUMMY_MAIN);
     simple.AddCCompileFlag("-std=c11");
     buildcc::base::m::TargetExpect_FlagChanged(1, &simple);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
     simple.Build();
   }
 

buildcc/lib/target/test/target/test_target_cpp_compile_flags.cpp

@@ -1,6 +1,8 @@
 #include "constants.h"
 
+#include "expect_command.h"
 #include "expect_target.h"
+
 #include "target/target.h"
 
 #include "env/env.h"
@@ -48,8 +50,8 @@ TEST(TargetTestCppCompileFlagsGroup, Target_AddCompileFlag) {
   simple.AddSource(DUMMY_MAIN);
   simple.AddCppCompileFlag("-std=c++17");
 
-  buildcc::internal::m::CommandExpect_Execute(1, true);
-  buildcc::internal::m::CommandExpect_Execute(1, true);
+  buildcc::m::CommandExpect_Execute(1, true);
+  buildcc::m::CommandExpect_Execute(1, true);
   simple.Build();
 
   mock().checkExpectations();
@@ -78,8 +80,8 @@ TEST(TargetTestCppCompileFlagsGroup, Target_ChangedCompileFlag) {
     simple.AddSource(DUMMY_MAIN);
     simple.AddCCompileFlag("-std=c++17");
 
-    buildcc::internal::m::CommandExpect_Execute(1, true);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
     simple.Build();
   }
   {
@@ -88,8 +90,8 @@ TEST(TargetTestCppCompileFlagsGroup, Target_ChangedCompileFlag) {
                                  gcc, "data");
     simple.AddSource(DUMMY_MAIN);
     buildcc::base::m::TargetExpect_FlagChanged(1, &simple);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
     simple.Build();
   }
 
@@ -100,8 +102,8 @@ TEST(TargetTestCppCompileFlagsGroup, Target_ChangedCompileFlag) {
     simple.AddSource(DUMMY_MAIN);
     simple.AddCCompileFlag("-std=c++17");
     buildcc::base::m::TargetExpect_FlagChanged(1, &simple);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
-    buildcc::internal::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
+    buildcc::m::CommandExpect_Execute(1, true);
     simple.Build();
   }