overhauled how artifacts are stored in build/

* added `LinkType` and `BuildLinkType`
* tried to use `MUUK_TOML_FILE` more
* changed `external/tests` to be in line w/ changes
* got rid of `PackageType`

Author: evanwporter

.github/workflows/build.yaml

@@ -220,7 +220,7 @@ jobs:
 
       - name: Run C++ tests (Windows)
         if: runner.os == 'Windows'
-        run: ./build/debug/test/test.exe
+        run: ./build/debug/test.exe
 
       # - name: Run C++ tests (Unix)
       #   if: runner.os != 'Windows'

.vscode/launch.json

@@ -8,7 +8,7 @@
       "name": "(Windows) Build",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/build/debug/bin/bin.exe",
+      "program": "${workspaceFolder}/build/debug/bin.exe",
       "args": [
         "build",
         "-c",
@@ -24,14 +24,14 @@
       "cwd": "${workspaceFolder}",
       "environment": [],
       "console": "integratedTerminal",
-      "symbolSearchPath": "${workspaceFolder}/build/debug/bin",
+      "symbolSearchPath": "${workspaceFolder}/build/debug",
       "preLaunchTask": "Build Debug (MSVC)"
     },
     {
       "name": "(Windows) Build Clang",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/build/debug/bin/bin.exe",
+      "program": "${workspaceFolder}/build/debug/bin.exe",
       "args": [
         "build",
         "-c",
@@ -47,7 +47,7 @@
       "cwd": "${workspaceFolder}",
       "environment": [],
       "console": "integratedTerminal",
-      "symbolSearchPath": "${workspaceFolder}/build/debug/bin",
+      "symbolSearchPath": "${workspaceFolder}/build/debug",
       "preLaunchTask": "Build Debug (MSVC)"
     },
     {
@@ -79,22 +79,22 @@
       "name": "(Windows) Install",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/build/debug/bin/bin.exe",
+      "program": "${workspaceFolder}/build/debug/bin.exe",
       "args": [
         "install"
       ],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}",
       "environment": [],
       "console": "integratedTerminal",
-      "symbolSearchPath": "${workspaceFolder}/build/debug/bin",
+      "symbolSearchPath": "${workspaceFolder}/build/debug",
       // "preLaunchTask": "Build Debug (MSVC)"
     },
     {
       "name": "(Windows) Add Package",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/build/debug/bin/bin.exe",
+      "program": "${workspaceFolder}/build/debug/bin.exe",
       "args": [
         "add",
         "Neargye/magic_enum"
@@ -104,14 +104,14 @@
       "cwd": "${workspaceFolder}",
       "environment": [],
       "console": "integratedTerminal",
-      "symbolSearchPath": "${workspaceFolder}/build/debug/bin",
+      "symbolSearchPath": "${workspaceFolder}/build/debug",
       "preLaunchTask": "Build Debug (MSVC)"
     },
     {
       "name": "(Windows) Remove Package",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/build/debug/bin/bin.exe",
+      "program": "${workspaceFolder}/build/debug/bin.exe",
       "args": [
         "remove",
         "magic_enum"
@@ -121,7 +121,7 @@
       "cwd": "${workspaceFolder}",
       "environment": [],
       "console": "integratedTerminal",
-      "symbolSearchPath": "${workspaceFolder}/build/debug/bin",
+      "symbolSearchPath": "${workspaceFolder}/build/debug",
     },
   ]
 }

deps/spdlog/3335c380a08c5e0f5117a66622df6afdb3d74959/muuk.toml

@@ -5,8 +5,6 @@ git = 'https://github.com/gabime/spdlog.git'
 
 [dependencies.fmt]
 git = 'https://github.com/fmtlib/fmt.git'
-muuk_path = 'deps/fmt/muuk.toml'
-revision = '577fd3be883accf8629423ed77fcca8a24bccee2'
 version = '577fd3be883accf8629423ed77fcca8a24bccee2'
 
 [library]

include/compiler.hpp

@@ -78,6 +78,23 @@ namespace muuk {
     private:
         Year year_;
     };
+
+    enum class LinkType {
+        STATIC,
+        SHARED,
+        NO_LINK
+    };
+
+    enum class BuildLinkType {
+        BINARY,
+        STATIC,
+        SHARED
+    };
+
+    std::string to_string(BuildLinkType type);
+
+    std::string to_string(LinkType type);
+
 } // namespace muuk
 
 #endif

include/lockgen/config/base.hpp

@@ -13,11 +13,6 @@
 #include "toml_ext.hpp"
 #include "util.hpp"
 
-enum class LinkType {
-    STATIC,
-    SHARED
-};
-
 struct Feature {
     std::unordered_set<std::string> defines;
     std::unordered_set<std::string> undefines;
@@ -42,6 +37,15 @@ inline void force_oneline(toml::value& v) {
     if constexpr (Derived::enable_##enable_macro) \
     maybe_set(out, #field_name, field_name)
 
+/// Serializes and globs a vector of source files to a TOML array.
+#define SERIALIZE_GLOB_SOURCES(field)                    \
+    if constexpr (Derived::enable_##field) {             \
+        toml::array arr;                                 \
+        for (const auto& s : expand_glob_sources(field)) \
+            arr.push_back(s.serialize());                \
+        maybe_set(out, #field, arr);                     \
+    }
+
 struct Dependency {
     std::string name;
     std::string git_url;
@@ -125,18 +129,8 @@ struct BaseFields {
     }
 
     void serialize(toml::value& out) const {
-        if constexpr (Derived::enable_modules) {
-            toml::array module_array;
-            for (const auto& s : expand_glob_sources(modules))
-                module_array.push_back(s.serialize());
-            maybe_set(out, "modules", module_array);
-        }
-        if constexpr (Derived::enable_sources) {
-            toml::array src_array;
-            for (const auto& s : expand_glob_sources(sources))
-                src_array.push_back(s.serialize());
-            maybe_set(out, "sources", src_array);
-        }
+        SERIALIZE_GLOB_SOURCES(modules);
+        SERIALIZE_GLOB_SOURCES(sources);
 
         MAYBE_SET_FIELD(include, include);
         MAYBE_SET_FIELD(defines, defines);
@@ -171,7 +165,7 @@ struct BaseFields {
         merge(libs, other.libs);
     }
 
-    std::vector<source_file> parse_sources(const toml::value& section, const std::string& base_path, const std::string& key = "sources") {
+    static std::vector<source_file> parse_sources(const toml::value& section, const std::string& base_path, const std::string& key = "sources") {
         std::vector<source_file> temp_sources;
         if (!section.contains(key))
             return temp_sources;
@@ -195,7 +189,10 @@ struct BaseFields {
                 file_path = source_entry;
             }
 
-            std::filesystem::path full_path = std::filesystem::path(base_path) / file_path;
+            std::filesystem::path full_path = std::filesystem::path(file_path);
+            if (!full_path.is_absolute())
+                full_path = std::filesystem::path(base_path) / full_path;
+
             temp_sources.emplace_back(
                 util::file_system::to_linux_path(full_path.lexically_normal().string()),
                 extracted_cflags);
@@ -210,9 +207,9 @@ struct BaseFields {
         for (const auto& s : input_sources) {
             try {
                 std::vector<std::filesystem::path> globbed_paths = glob::glob(s.path);
-                for (const auto& path : globbed_paths) {
+                for (const auto& path : globbed_paths)
                     expanded.emplace_back(util::file_system::to_linux_path(path.string()), s.cflags);
-                }
+
             } catch (const std::exception& e) {
                 muuk::logger::warn("Error while globbing '{}': {}", s.path, e.what());
             }
@@ -302,28 +299,4 @@ struct ProfileConfig : BaseConfig<ProfileConfig> {
         const std::string& base_path);
 
     void serialize(toml::value& out) const;
-};
-
-struct Library : BaseConfig<Library> {
-    std::string name;
-    std::string version;
-    std::unordered_set<std::string> profiles;
-
-    static constexpr bool enable_compilers = false;
-    static constexpr bool enable_platforms = false;
-    static constexpr bool enable_dependencies = false;
-
-    struct External {
-        std::string type, path;
-        std::vector<std::string> args;
-        std::vector<std::string> outputs;
-
-        void load(const toml::value& v);
-        void serialize(toml::value& out) const;
-    };
-
-    External external;
-
-    void load(const std::string& name_, const std::string& version_, const std::string& base_path_, const toml::value& v);
-    void serialize(toml::value& out, Platforms platforms, Compilers compilers) const;
-};
+};

include/lockgen/config/build.hpp

@@ -7,6 +7,7 @@
 #include <glob/glob.hpp>
 #include <toml.hpp>
 
+#include "compiler.hpp"
 #include "lockgen/config/base.hpp"
 #include "lockgen/config/package.hpp"
 
@@ -17,6 +18,8 @@ struct Build : BaseConfig<Build> {
     static constexpr bool enable_compilers = false;
     static constexpr bool enable_platforms = false;
 
+    muuk::BuildLinkType link_type = muuk::BuildLinkType::BINARY;
+
     void merge(const Package& package);
     Result<void> serialize(toml::value& out) const;
     void load(const toml::value& v, const std::string& base_path);

include/lockgen/config/library.hpp

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <string>
+#include <unordered_set>
+
+#include <glob/glob.hpp>
+#include <toml.hpp>
+
+#include "compiler.hpp"
+#include "lockgen/config/base.hpp"
+
+struct Library : BaseConfig<Library> {
+    std::string name;
+    std::string version;
+    std::unordered_set<std::string> profiles;
+
+    muuk::LinkType link_type = muuk::LinkType::STATIC;
+
+    static constexpr bool enable_compilers = false;
+    static constexpr bool enable_platforms = false;
+    static constexpr bool enable_dependencies = false;
+
+    struct External {
+        std::string type, path;
+        std::vector<std::string> args;
+        std::vector<std::string> outputs;
+
+        void load(const toml::value& v);
+        void serialize(toml::value& out) const;
+    };
+
+    External external;
+
+    void load(const std::string& name_, const std::string& version_, const std::string& base_path_, const toml::value& v);
+    void serialize(toml::value& out, Platforms platforms, Compilers compilers) const;
+};

include/lockgen/config/package.hpp

@@ -7,39 +7,17 @@
 #include <glob/glob.hpp>
 #include <toml.hpp>
 
+#include "compiler.hpp"
 #include "lockgen/config/base.hpp"
+#include "lockgen/config/library.hpp"
 #include "muuk.hpp"
 
-class PackageType {
-public:
-    enum class Type {
-        LIBRARY,
-        BUILD
-    };
-
-    static const PackageType LIBRARY;
-    static const PackageType BUILD;
-
-    explicit PackageType(Type type);
-
-    static std::string to_string(Type type);
-    std::string to_string() const;
-    static PackageType from_string(const std::string& typeStr);
-
-    bool operator==(const PackageType& other) const;
-    bool operator!=(const PackageType& other) const;
-
-private:
-    Type type_;
-};
-
 class Package {
 public:
     Package(
         const std::string& name,
         const std::string& version,
-        const std::string& base_path,
-        const PackageType package_type);
+        const std::string& base_path);
 
     void merge(const Package& child_pkg);
 
@@ -49,7 +27,6 @@ class Package {
     std::string name;
     std::string version;
     std::string base_path;
-    PackageType package_type; // "library" or "build"
 
     /// Git URL or local path
     std::string source;
@@ -66,7 +43,7 @@ class Package {
     std::unordered_map<std::string, Feature> features;
 
     /// Preferred link type for the package.
-    LinkType link_type = LinkType::STATIC;
+    muuk::LinkType link_type = muuk::LinkType::STATIC;
 
     /// Compiler-specific settings parsed from `[compiler]`.
     Compilers compilers_config;

include/lockgen/muuklockgen.hpp

@@ -38,8 +38,6 @@ class MuukLockGenerator {
 
     DependencyMap resolved_packages;
 
-    // TODO: Address why I there are two maps for builds
-    std::unordered_map<std::string, std::shared_ptr<Package>> builds;
     std::unordered_map<std::string, std::shared_ptr<Build>> builds_;
 
     std::shared_ptr<Package> base_package_;

include/muuk_schema.hpp

@@ -116,6 +116,7 @@ namespace muuk {
                 {"include", {false, TomlArray{TomlType::String}}},
                 {"cflags", {false, TomlArray{TomlType::String}}},
                 {"system_include", {false, TomlArray{TomlType::String}}},
+                {"link", {false, TomlType::String}},
                 {"dependencies", {false, TomlType::Table, {}}
             }}}
         }}}},