Toolchain ID (#63)

coder137 · web-flow · commit a9a61942ac00 · 2021-06-16T22:07:04.000-07:00
Added Toolchain Id to identify Toolchain family
diff --git a/buildcc/lib/target/test/target/test_base_target.cpp b/buildcc/lib/target/test/target/test_base_target.cpp
@@ -15,7 +15,8 @@ TEST_GROUP(TargetBaseTestGroup)
 {
 };
 // clang-format on
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
 
 TEST(TargetBaseTestGroup, InvalidTargetType) {
diff --git a/buildcc/lib/target/test/target/test_target_c_compile_flags.cpp b/buildcc/lib/target/test/target/test_target_c_compile_flags.cpp
@@ -27,8 +27,10 @@ TEST_GROUP(TargetTestCCompileFlagsGroup)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path target_source_intermediate_path =
     fs::path(BUILD_TARGET_C_COMPILE_INTERMEDIATE_DIR) / gcc.GetName();
 
diff --git a/buildcc/lib/target/test/target/test_target_cpp_compile_flags.cpp b/buildcc/lib/target/test/target/test_target_cpp_compile_flags.cpp
@@ -27,8 +27,10 @@ TEST_GROUP(TargetTestCppCompileFlagsGroup)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path target_source_intermediate_path =
     fs::path(BUILD_TARGET_CPP_COMPILE_INTERMEDIATE_DIR) / gcc.GetName();
 
diff --git a/buildcc/lib/target/test/target/test_target_external_lib.cpp b/buildcc/lib/target/test/target/test_target_external_lib.cpp
@@ -28,8 +28,10 @@ TEST_GROUP(TargetTestExternalLib)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path intermediate_path =
     fs::path(BUILD_TARGET_EXTERNAL_LIB_INTERMEDIATE_DIR) / gcc.GetName();
 
diff --git a/buildcc/lib/target/test/target/test_target_include_dir.cpp b/buildcc/lib/target/test/target/test_target_include_dir.cpp
@@ -24,8 +24,10 @@ TEST_GROUP(TargetTestIncludeDirGroup)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path target_include_dir_intermediate_path =
     fs::path(BUILD_TARGET_INCLUDE_DIR_INTERMEDIATE_DIR) / gcc.GetName();
 
diff --git a/buildcc/lib/target/test/target/test_target_lib_dep.cpp b/buildcc/lib/target/test/target/test_target_lib_dep.cpp
@@ -29,8 +29,10 @@ TEST_GROUP(TargetTestLibDep)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path intermediate_path =
     fs::path(BUILD_TARGET_LIB_DEP_INTERMEDIATE_DIR) / gcc.GetName();
 
diff --git a/buildcc/lib/target/test/target/test_target_link_flags.cpp b/buildcc/lib/target/test/target/test_target_link_flags.cpp
@@ -27,8 +27,10 @@ TEST_GROUP(TargetTestLinkFlagsGroup)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path target_source_intermediate_path =
     fs::path(BUILD_TARGET_LINK_INTERMEDIATE_DIR) / gcc.GetName();
 
diff --git a/buildcc/lib/target/test/target/test_target_preprocessor_flags.cpp b/buildcc/lib/target/test/target/test_target_preprocessor_flags.cpp
@@ -27,8 +27,10 @@ TEST_GROUP(TargetTestPreprocessorFlagGroup)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path target_source_intermediate_path =
     fs::path(BUILD_TARGET_PREPROCESSOR_INTERMEDIATE_DIR) / gcc.GetName();
 
diff --git a/buildcc/lib/target/test/target/test_target_source.cpp b/buildcc/lib/target/test/target/test_target_source.cpp
@@ -24,8 +24,10 @@ TEST_GROUP(TargetTestSourceGroup)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path target_source_intermediate_path =
     fs::path(BUILD_TARGET_SOURCE_INTERMEDIATE_DIR) / gcc.GetName();
 
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
@@ -25,8 +25,10 @@ TEST_GROUP(TargetTestSourceOutOfRootGroup)
 };
 // clang-format on
 
-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",
+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,
+                                          "gcc", "as", "gcc", "g++", "ar",
                                           "ld");
+
 static const fs::path target_source_intermediate_path =
     fs::path(BUILD_TARGET_SOURCE_OUT_OF_ROOT_INTERMEDIATE_DIR) / gcc.GetName();
 
diff --git a/buildcc/lib/toolchain/CMakeLists.txt b/buildcc/lib/toolchain/CMakeLists.txt
@@ -1,15 +1,12 @@
 # Toolchain lib
 m_clangtidy("toolchain")
-add_library(toolchain
-    toolchain.cpp
+add_library(toolchain INTERFACE
     toolchain.h
 )
-target_include_directories(toolchain PUBLIC
+target_include_directories(toolchain INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>  
     $<INSTALL_INTERFACE:${BUILDCC_INSTALL_HEADER_PREFIX}>
 )
-target_compile_options(toolchain PRIVATE ${BUILD_COMPILE_FLAGS})
-target_link_options(toolchain PRIVATE ${BUILD_LINK_FLAGS})
 
 # TODO, Add Mocks here if required
 
diff --git a/buildcc/lib/toolchain/toolchain.cpp b/buildcc/lib/toolchain/toolchain.cpp
diff --git a/buildcc/lib/toolchain/toolchain.h b/buildcc/lib/toolchain/toolchain.h
@@ -26,11 +26,20 @@ namespace buildcc::base {
 // Base toolchain class
 class Toolchain {
 public:
-  explicit Toolchain(std::string_view name, std::string_view asm_compiler,
-                     std::string_view c_compiler, std::string_view cpp_compiler,
-                     std::string_view archiver, std::string_view linker)
-      : name_(name), asm_compiler_(asm_compiler), c_compiler_(c_compiler),
-        cpp_compiler_(cpp_compiler), archiver_(archiver), linker_(linker) {}
+  enum class Id {
+    Gcc = 0,
+    Msvc,
+    Clang,
+  };
+
+public:
+  explicit Toolchain(Id id, std::string_view name,
+                     std::string_view asm_compiler, std::string_view c_compiler,
+                     std::string_view cpp_compiler, std::string_view archiver,
+                     std::string_view linker)
+      : id_(id), name_(name), asm_compiler_(asm_compiler),
+        c_compiler_(c_compiler), cpp_compiler_(cpp_compiler),
+        archiver_(archiver), linker_(linker) {}
 
   Toolchain(const Toolchain &toolchain) = delete;
 
@@ -43,6 +52,7 @@ class Toolchain {
   const std::string &GetLinker() const { return linker_; }
 
 private:
+  Id id_;
   std::string name_;
   std::string asm_compiler_;
   std::string c_compiler_;
diff --git a/buildcc/toolchains/toolchain_gcc.h b/buildcc/toolchains/toolchain_gcc.h
@@ -23,7 +23,8 @@ namespace buildcc {
 
 class Toolchain_gcc : public base::Toolchain {
 public:
-  Toolchain_gcc() : Toolchain("gcc", "as", "gcc", "g++", "ar", "ld") {}
+  Toolchain_gcc()
+      : Toolchain(Toolchain::Id::Gcc, "gcc", "as", "gcc", "g++", "ar", "ld") {}
   Toolchain_gcc(const Toolchain_gcc &gcc) = delete;
 };
 
diff --git a/buildcc/toolchains/toolchain_msvc.h b/buildcc/toolchains/toolchain_msvc.h
@@ -23,7 +23,9 @@ namespace buildcc {
 
 class Toolchain_msvc : public base::Toolchain {
 public:
-  Toolchain_msvc() : Toolchain("msvc", "cl", "cl", "cl", "lib", "link") {}
+  Toolchain_msvc()
+      : Toolchain(Toolchain::Id::Msvc, "msvc", "cl", "cl", "cl", "lib",
+                  "link") {}
   Toolchain_msvc(const Toolchain_msvc &gcc) = delete;
 };
 
diff --git a/example/gcc/AfterInstall/build.cpp b/example/gcc/AfterInstall/build.cpp
@@ -16,7 +16,8 @@ int main(void) {
   env::set_log_level(env::LogLevel::Trace);
 
   // Stored as a const & in target
-  base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar", "ld");
+  base::Toolchain gcc(base::Toolchain::Id::Gcc, "gcc", "as", "gcc", "g++", "ar",
+                      "ld");
 
   // CppTarget
   ExecutableTarget_gcc cpptarget("CppFlags.exe", gcc, "files");
diff --git a/example/gcc/DynamicLib/build.cpp b/example/gcc/DynamicLib/build.cpp
@@ -24,7 +24,8 @@ int main(void) {
   env::init(BUILD_ROOT, BUILD_INTERMEDIATE_DIR);
   env::set_log_level(env::LogLevel::Trace);
 
-  base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar", "ld");
+  base::Toolchain gcc(base::Toolchain::Id::Gcc, "gcc", "as", "gcc", "g++", "ar",
+                      "ld");
 
 // Linux GCC
 #if OS == LINUX
diff --git a/example/gcc/Flags/build.cpp b/example/gcc/Flags/build.cpp
@@ -16,7 +16,8 @@ int main(void) {
   env::set_log_level(env::LogLevel::Trace);
 
   // Stored as a const & in target
-  base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar", "ld");
+  base::Toolchain gcc(base::Toolchain::Id::Gcc, "gcc", "as", "gcc", "g++", "ar",
+                      "ld");
 
   // CppTarget
   ExecutableTarget_gcc cpptarget("CppFlags.exe", gcc, "files");
diff --git a/example/gcc/IncludeDir/build.cpp b/example/gcc/IncludeDir/build.cpp
@@ -16,7 +16,8 @@ int main(void) {
   env::set_log_level(env::LogLevel::Trace);
 
   // Stored as const & in target
-  base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar", "ld");
+  base::Toolchain gcc(base::Toolchain::Id::Gcc, "gcc", "as", "gcc", "g++", "ar",
+                      "ld");
 
   ExecutableTarget_gcc target("IncludeDir.exe", gcc, "files");
   target.AddSource("main.cpp", "src");
diff --git a/example/gcc/Plugins/build.cpp b/example/gcc/Plugins/build.cpp
@@ -18,7 +18,8 @@ int main(void) {
   env::set_log_level(env::LogLevel::Trace);
 
   // CppTarget
-  base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar", "ld");
+  base::Toolchain gcc(base::Toolchain::Id::Gcc, "gcc", "as", "gcc", "g++", "ar",
+                      "ld");
   ExecutableTarget_gcc cppflags("CppFlags.exe", gcc, "files");
 
   cppflags.AddSource("main.cpp", "src");
diff --git a/example/gcc/Simple/build.cpp b/example/gcc/Simple/build.cpp
@@ -16,7 +16,8 @@ int main(void) {
   env::set_log_level(env::LogLevel::Trace);
 
   // Stored as const & in target
-  base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar", "ld");
+  base::Toolchain gcc(base::Toolchain::Id::Gcc, "gcc", "as", "gcc", "g++", "ar",
+                      "ld");
 
   ExecutableTarget_gcc target("Simple.exe", gcc, "");
   target.AddSource("main.cpp");
diff --git a/example/gcc/StaticLib/build.cpp b/example/gcc/StaticLib/build.cpp
@@ -15,7 +15,8 @@ int main(void) {
   env::init(BUILD_ROOT, BUILD_INTERMEDIATE_DIR);
   env::set_log_level(env::LogLevel::Trace);
 
-  base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar", "ld");
+  base::Toolchain gcc(base::Toolchain::Id::Gcc, "gcc", "as", "gcc", "g++", "ar",
+                      "ld");
 
   StaticTarget_gcc randomLib("libran.a", gcc, "files");
   randomLib.AddSource("src/random.cpp");
diff --git a/example/hybrid/custom_target/build.main.cpp b/example/hybrid/custom_target/build.main.cpp
@@ -85,8 +85,8 @@ int main(int argc, char **argv) {
   reg.Build(args.GetMsvcToolchain(), m_foolib, mfoolib_build_cb);
 
   // * NOTE, This is how we add our custom toolchain
-  base::Toolchain clang("clang_gnu", "llvm-as", "clang", "clang++", "llvm-ar",
-                        "ld");
+  base::Toolchain clang(base::Toolchain::Id::Clang, "clang_gnu", "llvm-as",
+                        "clang", "clang++", "llvm-ar", "ld");
   // * NOTE, Custom clang target added above
   ExecutableTarget_clang c_foolib("CFoolib.exe", clang, "");
   reg.Build(clang_gnu, c_foolib, cfoolib_build_cb);
diff --git a/example/msvc/DynamicLib/build.cpp b/example/msvc/DynamicLib/build.cpp
@@ -17,7 +17,6 @@ int main(void) {
   env::init(BUILD_SCRIPT_SOURCE, BUILD_SCRIPT_FOLDER);
   env::set_log_level(env::LogLevel::Debug);
 
-  // base::Toolchain msvc("msvc", "cl", "cl", "cl", "lib", "link");
   Toolchain_msvc msvc;
 
   DynamicTarget_msvc dynamictarget("librandom.lib", msvc, "");
diff --git a/example/msvc/Executable/build.cpp b/example/msvc/Executable/build.cpp
@@ -17,7 +17,6 @@ int main(void) {
   env::init(BUILD_SCRIPT_SOURCE, BUILD_SCRIPT_FOLDER);
   env::set_log_level(env::LogLevel::Trace);
 
-  // base::Toolchain msvc("msvc", "cl", "cl", "cl", "lib", "link");
   Toolchain_msvc msvc;
 
   ExecutableTarget_msvc target_msvc("Simple.exe", msvc, "");
diff --git a/example/msvc/StaticLib/build.cpp b/example/msvc/StaticLib/build.cpp
@@ -17,7 +17,6 @@ int main(void) {
   env::init(BUILD_SCRIPT_SOURCE, BUILD_SCRIPT_FOLDER);
   env::set_log_level(env::LogLevel::Trace);
 
-  // base::Toolchain msvc("msvc", "cl", "cl", "cl", "lib", "link");
   Toolchain_msvc msvc;
 
   StaticTarget_msvc statictarget_msvc("librandom.lib", msvc, "");

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ TEST_GROUP(TargetBaseTestGroup)`
`15`	`15`	`{`
`16`	`16`	`};`
`17`	`17`	`// clang-format on`
`18`		`-static const buildcc::base::Toolchain gcc("gcc", "as", "gcc", "g++", "ar",`
	`18`	`+static const buildcc::base::Toolchain gcc(buildcc::base::Toolchain::Id::Gcc,`
	`19`	`+ "gcc", "as", "gcc", "g++", "ar",`
`19`	`20`	`"ld");`
`20`	`21`
`21`	`22`	`TEST(TargetBaseTestGroup, InvalidTargetType) {`