Target generic (#68)

coder137 · web-flow · commit 8bb1a8d8e412 · 2021-06-22T13:28:21.000-07:00
diff --git a/.github/workflows/linux_gcc_cmake_build.yml b/.github/workflows/linux_gcc_cmake_build.yml
@@ -64,6 +64,14 @@ jobs:
         run: |
           sudo cmake --install .
 
+      - name: AfterInstall Example
+        working-directory: ${{github.workspace}}/example/gcc/AfterInstall
+        run: |
+          cmake -B build -G Ninja
+          cmake --build build --parallel 2
+          cd build
+          ./build
+
       - name: Hybrid Simple Example
         working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER}}
         run: |
@@ -84,10 +92,7 @@ jobs:
         run: |
           cmake --build . --target run_hybrid_customtarget_example_linux
 
-      - name: AfterInstall Example
-        working-directory: ${{github.workspace}}/example/gcc/AfterInstall
+      - name: Hybrid Generic Target Example
+        working-directory: ${{github.workspace}}/${{env.BUILD_FOLDER}}
         run: |
-          cmake -B build -G Ninja
-          cmake --build build --parallel 2
-          cd build
-          ./build
+          cmake --build . --target run_hybrid_generic_example
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -124,4 +124,5 @@ if (${BUILDCC_EXAMPLES})
     add_subdirectory(example/hybrid/foolib)
     add_subdirectory(example/hybrid/external_lib)
     add_subdirectory(example/hybrid/custom_target)
+    add_subdirectory(example/hybrid/generic)
 endif()
diff --git a/buildcc/include/buildcc.h b/buildcc/include/buildcc.h
@@ -36,9 +36,13 @@
 // Specialized Targets
 #include "target_gcc.h"
 #include "target_msvc.h"
+#include "target_generic.h"
 
 // TODO, Add more specialized targets here
 
+// Plugins
+#include "clang_compile_commands.h"
+
 // BuildCC Modules
 #include "args.h"
 #include "register.h"
diff --git a/buildcc/lib/target/src/util/execute.cpp b/buildcc/lib/target/src/util/execute.cpp
@@ -25,8 +25,10 @@ namespace tpl = TinyProcessLib;
 namespace buildcc::internal {
 
 bool Command::Execute(const std::string &command) {
-  // Run the process
+  env::assert_fatal(!command.empty(),
+                    fmt::format("Invalid command -> \"{}\"", command));
   buildcc::env::log_debug("system", command);
+
   tpl::Process process(command);
   return process.get_exit_status() == 0;
 }
diff --git a/buildcc/lib/toolchain/toolchain.h b/buildcc/lib/toolchain/toolchain.h
@@ -44,6 +44,7 @@ class Toolchain {
   Toolchain(const Toolchain &toolchain) = delete;
 
   // Getters
+  Id GetId() const { return id_; }
   const std::string &GetName() const { return name_; }
   const std::string &GetAsmCompiler() const { return asm_compiler_; }
   const std::string &GetCCompiler() const { return c_compiler_; }
diff --git a/buildcc/targets/CMakeLists.txt b/buildcc/targets/CMakeLists.txt
@@ -1,8 +1,10 @@
 # Target_specialized lib
 m_clangtidy("target_specialized")
 add_library(target_specialized INTERFACE
+    target_constants.h
     target_gcc.h
     target_msvc.h
+    target_generic.h
 )
 target_include_directories(target_specialized INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> 
@@ -18,8 +20,10 @@ target_link_libraries(target_specialized INTERFACE
 if (${BUILDCC_INSTALL})
     install(TARGETS target_specialized DESTINATION lib EXPORT target_specializedConfig)
     install(FILES  
+        ${CMAKE_CURRENT_SOURCE_DIR}/target_constants.h
         ${CMAKE_CURRENT_SOURCE_DIR}/target_gcc.h
         ${CMAKE_CURRENT_SOURCE_DIR}/target_msvc.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/target_generic.h
         DESTINATION "${BUILDCC_INSTALL_HEADER_PREFIX}"
     )
     install(EXPORT target_specializedConfig DESTINATION "${BUILDCC_INSTALL_LIB_PREFIX}/target_specialized")
diff --git a/buildcc/targets/target_constants.h b/buildcc/targets/target_constants.h
@@ -0,0 +1,59 @@
+/*
+ * 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 TARGETS_TARGET_CONSTANTS_H_
+#define TARGETS_TARGET_CONSTANTS_H_
+
+#include <string_view>
+
+namespace buildcc {
+
+// GCC
+constexpr std::string_view kGccPrefixIncludeDir = "-I";
+constexpr std::string_view kGccPrefixLibDir = "-L";
+constexpr std::string_view kGccGenericCompileCommand =
+    "{compiler} {preprocessor_flags} {include_dirs} {compile_flags} -o "
+    "{output} -c {input}";
+constexpr std::string_view kGccExecutableLinkCommand =
+    "{cpp_compiler} {link_flags} {compiled_sources} -o {output} "
+    "{lib_dirs} {lib_deps}";
+constexpr std::string_view kGccStaticLibLinkCommand =
+    "{archiver} rcs {output} {compiled_sources}";
+constexpr std::string_view kGccDynamicLibCompileCommand =
+    "{compiler} {preprocessor_flags} {include_dirs} {compile_flags} "
+    "-fpic -o {output} -c {input}";
+constexpr std::string_view kGccDynamicLibLinkCommand =
+    "{cpp_compiler} -shared {link_flags} {compiled_sources} -o {output}";
+
+// MSVC
+constexpr std::string_view kMsvcPrefixIncludeDir = "/I";
+constexpr std::string_view kMsvcPrefixLibDir = "/LIBPATH:";
+// TODO, Split this into individual CompileCommands if any differences occur
+constexpr std::string_view kMsvcCompileCommand =
+    "{compiler} {preprocessor_flags} {include_dirs} {compile_flags} "
+    "/Fo{output} /c {input}";
+constexpr std::string_view kMsvcExecutableLinkCommand =
+    "{linker} {link_flags} {lib_dirs} /OUT:{output} {lib_deps} "
+    "{compiled_sources}";
+constexpr std::string_view kMsvcStaticLibLinkCommand =
+    "{archiver} {link_flags} /OUT:{output} {compiled_sources}";
+constexpr std::string_view kMsvcDynamicLibLinkCommand =
+    "{linker} /DLL {link_flags} /OUT:{output}.dll /IMPLIB:{output} "
+    "{compiled_sources}";
+
+} // namespace buildcc
+
+#endif
diff --git a/buildcc/targets/target_gcc.h b/buildcc/targets/target_gcc.h
@@ -19,6 +19,9 @@
 
 #include "target.h"
 
+#include "target_constants.h"
+
+// TODO, Combine all of these into Target_gcc
 namespace buildcc {
 
 class ExecutableTarget_gcc : public base::Target {
@@ -38,9 +41,7 @@ class StaticTarget_gcc : public base::Target {
                target_path_relative_to_root) {}
 
 private:
-  std::string_view Link() const override {
-    return "{archiver} rcs {output} {compiled_sources}";
-  }
+  std::string_view Link() const override { return kGccStaticLibLinkCommand; }
 };
 
 class DynamicTarget_gcc : public base::Target {
@@ -52,12 +53,9 @@ class DynamicTarget_gcc : public base::Target {
 
 private:
   std::string_view CompileCommand() const override {
-    return "{compiler} {preprocessor_flags} {include_dirs} {compile_flags} "
-           "-fpic -o {output} -c {input}";
-  }
-  std::string_view Link() const override {
-    return "{cpp_compiler} -shared {link_flags} {compiled_sources} -o {output}";
+    return kGccDynamicLibCompileCommand;
   }
+  std::string_view Link() const override { return kGccDynamicLibLinkCommand; }
 };
 
 } // namespace buildcc
diff --git a/buildcc/targets/target_generic.h b/buildcc/targets/target_generic.h
@@ -0,0 +1,145 @@
+/*
+ * 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 TARGETS_TARGET_GENERIC_H_
+#define TARGETS_TARGET_GENERIC_H_
+
+#include "target.h"
+
+#include "target_constants.h"
+
+namespace buildcc {
+
+class Target_generic : public base::Target {
+public:
+  Target_generic(const std::string &name, base::TargetType type,
+                 const base::Toolchain &toolchain,
+                 const std::filesystem::path &target_path_relative_to_root)
+      : Target(name, type, toolchain, target_path_relative_to_root) {
+    Initialize();
+  }
+
+private:
+  std::string_view CompileCommand() const override {
+    switch (GetToolchain().GetId()) {
+    case base::Toolchain::Id::Gcc:
+      return GccCompileCommand();
+      break;
+    case base::Toolchain::Id::Msvc:
+      return MsvcCompileCommand();
+      break;
+    default:
+      break;
+    }
+    return "";
+  }
+  std::string_view Link() const override {
+    switch (GetToolchain().GetId()) {
+    case base::Toolchain::Id::Gcc:
+      return GccLink();
+      break;
+    case base::Toolchain::Id::Msvc:
+      return MsvcLink();
+      break;
+    default:
+      break;
+    }
+    return "";
+  }
+
+  /**
+   * @brief Add Toolchain-Target specific global initialization parameters here
+   */
+  void Initialize() {
+    switch (GetToolchain().GetId()) {
+    case base::Toolchain::Id::Gcc:
+      GccInitialize();
+      break;
+    case base::Toolchain::Id::Msvc:
+      MsvcInitialize();
+      break;
+    default:
+      break;
+    }
+  }
+
+  void GccInitialize() {
+    prefix_include_dir_ = kGccPrefixIncludeDir;
+    prefix_lib_dir_ = kGccPrefixLibDir;
+  }
+  std::string_view GccCompileCommand() const {
+    switch (GetTargetType()) {
+    case base::TargetType::Executable:
+    case base::TargetType::StaticLibrary:
+      return kGccGenericCompileCommand;
+    case base::TargetType::DynamicLibrary:
+      return kGccDynamicLibCompileCommand;
+    default:
+      break;
+    }
+    return "";
+  }
+  std::string_view GccLink() const {
+    switch (GetTargetType()) {
+    case base::TargetType::Executable:
+      return kGccExecutableLinkCommand;
+    case base::TargetType::StaticLibrary:
+      return kGccStaticLibLinkCommand;
+    case base::TargetType::DynamicLibrary:
+      return kGccDynamicLibLinkCommand;
+    default:
+      break;
+    }
+    return "";
+  }
+
+  void MsvcInitialize() {
+    prefix_include_dir_ = kMsvcPrefixIncludeDir;
+    prefix_lib_dir_ = kMsvcPrefixLibDir;
+    AddCCompileFlag("/nologo");
+    AddCppCompileFlag("/nologo");
+    AddCppCompileFlag("/EHsc");
+    AddLinkFlag("/nologo");
+  }
+  std::string_view MsvcCompileCommand() const {
+    switch (GetTargetType()) {
+    case base::TargetType::Executable:
+    case base::TargetType::StaticLibrary:
+    case base::TargetType::DynamicLibrary:
+      return kMsvcCompileCommand;
+    default:
+      break;
+    }
+    return "";
+  }
+  std::string_view MsvcLink() const {
+    switch (GetTargetType()) {
+    case base::TargetType::Executable:
+      return kMsvcExecutableLinkCommand;
+    case base::TargetType::StaticLibrary:
+      return kMsvcStaticLibLinkCommand;
+    case base::TargetType::DynamicLibrary:
+      return kMsvcDynamicLibLinkCommand;
+    default:
+      break;
+    }
+    return "";
+  }
+};
+
+} // namespace buildcc
+
+#endif
diff --git a/buildcc/targets/target_msvc.h b/buildcc/targets/target_msvc.h
@@ -19,14 +19,10 @@
 
 #include "target.h"
 
-namespace buildcc {
+#include "target_constants.h"
 
-// TODO, Later shift this into a constants file
-constexpr const char *const kMsvcPrefixIncludeDir = "/I";
-constexpr const char *const kMsvcPrefixLibDir = "/LIBPATH:";
-constexpr const char *const kMsvcCompileCommand =
-    "{compiler} {preprocessor_flags} {include_dirs} {compile_flags} "
-    "/Fo{output} /c {input}";
+// TODO, Combine all of these into Target_msvc
+namespace buildcc {
 
 class ExecutableTarget_msvc : public base::Target {
 public:
@@ -43,10 +39,7 @@ class ExecutableTarget_msvc : public base::Target {
   std::string_view CompileCommand() const override {
     return kMsvcCompileCommand;
   }
-  std::string_view Link() const override {
-    return "{linker} {link_flags} {lib_dirs} /OUT:{output} {lib_deps} "
-           "{compiled_sources}";
-  }
+  std::string_view Link() const override { return kMsvcExecutableLinkCommand; }
 };
 
 class StaticTarget_msvc : public base::Target {
@@ -63,9 +56,7 @@ class StaticTarget_msvc : public base::Target {
   std::string_view CompileCommand() const override {
     return kMsvcCompileCommand;
   }
-  std::string_view Link() const override {
-    return "{archiver} {link_flags} /OUT:{output} {compiled_sources}";
-  }
+  std::string_view Link() const override { return kMsvcStaticLibLinkCommand; }
 };
 
 class DynamicTarget_msvc : public base::Target {
@@ -82,10 +73,7 @@ class DynamicTarget_msvc : public base::Target {
   std::string_view CompileCommand() const override {
     return kMsvcCompileCommand;
   }
-  std::string_view Link() const override {
-    return "{linker} /DLL {link_flags} /OUT:{output}.dll /IMPLIB:{output} "
-           "{compiled_sources}";
-  }
+  std::string_view Link() const override { return kMsvcDynamicLibLinkCommand; }
 };
 
 } // namespace buildcc
diff --git a/example/hybrid/generic/.gitignore b/example/hybrid/generic/.gitignore
@@ -0,0 +1,6 @@
+# File
+*.dot
+*.PNG
+
+# Folder
+*_internal_*
diff --git a/example/hybrid/generic/CMakeLists.txt b/example/hybrid/generic/CMakeLists.txt
diff --git a/example/hybrid/generic/build.cpp b/example/hybrid/generic/build.cpp
diff --git a/example/hybrid/generic/build_generic.toml b/example/hybrid/generic/build_generic.toml
diff --git a/example/hybrid/generic/src/main.cpp b/example/hybrid/generic/src/main.cpp

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +# File
 +*.dot
 +*.PNG
++
 +# Folder
 +*_internal_*