Target schema updates (#231)

Author: coder137

buildcc/lib/target/CMakeLists.txt

@@ -4,7 +4,6 @@ include(cmake/common_target_src.cmake)
 if (${TESTING})
     set(TARGET_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
     include(cmake/mock_target.cmake)
-    add_subdirectory(test/path)
     add_subdirectory(test/target)
 endif()
 

buildcc/lib/target/cmake/common_target_src.cmake

@@ -8,8 +8,6 @@ set(COMMON_TARGET_SRCS
     include/target/common/target_config.h
     include/target/common/target_state.h
     include/target/common/target_env.h
-
-    src/common/util.cpp
     include/target/common/util.h
 
     # API

buildcc/lib/target/include/target/api/deps_api.h

@@ -35,14 +35,14 @@ template <typename T> class DepsApi {
   // TODO, Rename AddObjectDependency
   // TODO, Rename AddTargetDependency
 
-  const fs_unordered_set &GetCompileDependencies() const {
+  std::vector<std::string> GetCompileDependencies() const {
     const auto &t = static_cast<const T &>(*this);
-    return t.user_.compile_dependencies;
+    return t.user_.compile_dependencies.GetPaths();
   }
 
-  const fs_unordered_set &GetLinkDependencies() const {
+  std::vector<std::string> GetLinkDependencies() const {
     const auto &t = static_cast<const T &>(*this);
-    return t.user_.link_dependencies;
+    return t.user_.link_dependencies.GetPaths();
   }
 
   /**
@@ -52,7 +52,7 @@ template <typename T> class DepsApi {
   void AddCompileDependencyAbsolute(const fs::path &absolute_path) {
     auto &t = static_cast<T &>(*this);
 
-    t.user_.compile_dependencies.insert(absolute_path);
+    t.user_.compile_dependencies.Emplace(absolute_path, "");
   }
 
   /**
@@ -73,7 +73,7 @@ template <typename T> class DepsApi {
   void AddLinkDependencyAbsolute(const fs::path &absolute_path) {
     auto &t = static_cast<T &>(*this);
 
-    t.user_.link_dependencies.insert(absolute_path);
+    t.user_.link_dependencies.Emplace(absolute_path, "");
   }
 
   /**

buildcc/lib/target/include/target/api/include_api.h

@@ -32,21 +32,21 @@ namespace buildcc::internal {
 // TargetEnv
 template <typename T> class IncludeApi {
 public:
-  const fs_unordered_set &GetHeaderFiles() const {
+  std::vector<std::string> GetHeaderFiles() const {
     const auto &t = static_cast<const T &>(*this);
-    return t.user_.headers;
+    return t.user_.headers.GetPaths();
   }
 
-  const fs_unordered_set &GetIncludeDirs() const {
+  const std::vector<std::string> &GetIncludeDirs() const {
     const auto &t = static_cast<const T &>(*this);
-    return t.user_.include_dirs;
+    return t.user_.include_dirs.GetPaths();
   }
 
   void AddHeaderAbsolute(const fs::path &absolute_filepath) {
     auto &t = static_cast<T &>(*this);
 
     t.toolchain_.GetConfig().ExpectsValidHeader(absolute_filepath);
-    t.user_.headers.insert(absolute_filepath);
+    t.user_.headers.Emplace(absolute_filepath, "");
   }
 
   void GlobHeadersAbsolute(const fs::path &absolute_path) {
@@ -63,7 +63,7 @@ template <typename T> class IncludeApi {
                              bool glob_headers = false) {
     auto &t = static_cast<T &>(*this);
 
-    t.user_.include_dirs.insert(absolute_include_dir);
+    t.user_.include_dirs.Emplace(absolute_include_dir);
 
     if (glob_headers) {
       GlobHeadersAbsolute(absolute_include_dir);

buildcc/lib/target/include/target/api/lib_api.h

@@ -41,24 +41,24 @@ namespace buildcc::internal {
 // Target::GetTargetPath
 template <typename T> class LibApi {
 public:
-  const std::vector<fs::path> &GetLibDeps() const {
+  std::vector<std::string> GetLibDeps() const {
     const auto &t = static_cast<const T &>(*this);
-    return t.user_.libs;
+    return t.user_.libs.GetPaths();
   }
 
   const std::vector<std::string> &GetExternalLibDeps() const {
     const auto &t = static_cast<const T &>(*this);
     return t.user_.external_libs;
   }
 
-  const fs_unordered_set &GetLibDirs() const {
+  const std::vector<std::string> &GetLibDirs() const {
     const auto &t = static_cast<const T &>(*this);
-    return t.user_.lib_dirs;
+    return t.user_.lib_dirs.GetPaths();
   }
 
   void AddLibDirAbsolute(const fs::path &absolute_lib_dir) {
     auto &t = static_cast<T &>(*this);
-    t.user_.lib_dirs.insert(absolute_lib_dir);
+    t.user_.lib_dirs.Emplace(absolute_lib_dir);
   }
 
   void AddLibDir(const fs::path &relative_lib_dir) {

buildcc/lib/target/include/target/api/pch_api.h

@@ -31,9 +31,9 @@ namespace buildcc::internal {
 // TargetEnv
 template <typename T> class PchApi {
 public:
-  const fs_unordered_set &GetPchFiles() const {
+  std::vector<std::string> GetPchFiles() const {
     const auto &t = static_cast<const T &>(*this);
-    return t.user_.pchs;
+    return t.user_.pchs.GetPaths();
   }
 
   void AddPchAbsolute(const fs::path &absolute_filepath) {
@@ -42,7 +42,7 @@ template <typename T> class PchApi {
     t.toolchain_.GetConfig().ExpectsValidHeader(absolute_filepath);
 
     const fs::path absolute_pch = fs::path(absolute_filepath).make_preferred();
-    t.user_.pchs.insert(absolute_pch);
+    t.user_.pchs.Emplace(absolute_pch, "");
   }
 
   void AddPch(const fs::path &relative_filename,

buildcc/lib/target/include/target/api/source_api.h

@@ -31,16 +31,16 @@ namespace buildcc::internal {
 // TargetEnv
 template <typename T> class SourceApi {
 public:
-  const fs_unordered_set &GetSourceFiles() const {
+  std::vector<std::string> GetSourceFiles() const {
     const auto &t = static_cast<const T &>(*this);
-    return t.user_.sources;
+    return t.user_.sources.GetPaths();
   }
 
   void AddSourceAbsolute(const fs::path &absolute_source) {
     auto &t = static_cast<T &>(*this);
 
     t.toolchain_.GetConfig().ExpectsValidSource(absolute_source);
-    t.user_.sources.emplace(fs::path(absolute_source).make_preferred());
+    t.user_.sources.Emplace(absolute_source, "");
   }
 
   void GlobSourcesAbsolute(const fs::path &absolute_source_dir) {

buildcc/lib/target/include/target/common/util.h

@@ -29,10 +29,15 @@ template <typename T> std::string aggregate(const T &list) {
   return fmt::format("{}", fmt::join(list, " "));
 }
 
-std::string aggregate(const buildcc::fs_unordered_set &paths);
-
-std::string aggregate_with_prefix(const std::string &prefix,
-                                  const fs_unordered_set &dirs);
+template <typename T>
+std::string aggregate_with_prefix(const std::string &prefix, const T &list) {
+  std::vector<std::string> agg_list;
+  for (const auto &l : list) {
+    auto formatted_output = fmt::format("{}{}", prefix, l);
+    agg_list.emplace_back(std::move(formatted_output));
+  }
+  return aggregate(agg_list);
+}
 
 } // namespace buildcc::internal
 

buildcc/lib/target/include/target/custom_generator/custom_generator_context.h

@@ -26,14 +26,14 @@ namespace buildcc {
 class CustomGeneratorContext {
 public:
   CustomGeneratorContext(const env::Command &c,
-                         const std::unordered_set<std::string> &i,
-                         const std::unordered_set<std::string> &o,
+                         const std::vector<std::string> &i,
+                         const std::vector<std::string> &o,
                          const std::vector<uint8_t> &ub)
       : command(c), inputs(i), outputs(o), userblob(ub) {}
 
   const env::Command &command;
-  const std::unordered_set<std::string> &inputs;
-  const std::unordered_set<std::string> &outputs;
+  const std::vector<std::string> &inputs;
+  const std::vector<std::string> &outputs;
   const std::vector<uint8_t> &userblob;
 };
 

buildcc/lib/target/include/target/friend/compile_object.h

@@ -54,29 +54,28 @@ class CompileObject {
   void Task();
 
   const ObjectData &GetObjectData(const fs::path &absolute_source) const;
-  const std::unordered_map<fs::path, ObjectData, internal::PathHash> &
-  GetObjectDataMap() const {
+  const std::unordered_map<std::string, ObjectData> &GetObjectDataMap() const {
     return object_files_;
   }
-  fs_unordered_set GetCompiledSources() const;
+  std::vector<fs::path> GetCompiledSources() const;
   tf::Task &GetTask() { return compile_task_; }
 
 private:
   fs::path ConstructObjectPath(const fs::path &absolute_source_file) const;
 
-  void BuildObjectCompile(std::vector<internal::Path> &source_files,
-                          std::vector<internal::Path> &dummy_source_files);
+  void BuildObjectCompile(std::vector<internal::PathInfo> &source_files,
+                          std::vector<internal::PathInfo> &dummy_source_files);
 
   void PreObjectCompile();
 
-  void CompileSources(std::vector<internal::Path> &source_files);
-  void RecompileSources(std::vector<internal::Path> &source_files,
-                        std::vector<internal::Path> &dummy_source_files);
+  void CompileSources(std::vector<internal::PathInfo> &source_files);
+  void RecompileSources(std::vector<internal::PathInfo> &source_files,
+                        std::vector<internal::PathInfo> &dummy_source_files);
 
 private:
   Target &target_;
 
-  std::unordered_map<fs::path, ObjectData, internal::PathHash> object_files_;
+  std::unordered_map<std::string, ObjectData> object_files_;
   tf::Task compile_task_;
 };