Review improvements

CMakeLists.txt

@@ -58,12 +58,9 @@ generate_documentation()
 
 # Target: cmkr
 set(cmkr_SOURCES
-	"src/arguments.cpp"
+	cmake.toml
-	"src/build.cpp"
+	"cmake/cmkr.cmake"
-	"src/cmake_generator.cpp"
+	"cmake/version.hpp.in"
-	"src/help.cpp"
-	"src/main.cpp"
-	"src/project_parser.cpp"
 	"include/arguments.hpp"
 	"include/build.hpp"
 	"include/cmake_generator.hpp"
@@ -71,9 +68,12 @@ set(cmkr_SOURCES
 	"include/help.hpp"
 	"include/literals.hpp"
 	"include/project_parser.hpp"
-	"cmake/cmkr.cmake"
+	"src/arguments.cpp"
-	"cmake/version.hpp.in"
+	"src/build.cpp"
-	cmake.toml
+	"src/cmake_generator.cpp"
+	"src/help.cpp"
+	"src/main.cpp"
+	"src/project_parser.cpp"
 )
 
 add_executable(cmkr)

docs/examples/globbing.md

@@ -20,7 +20,7 @@ description = "Globbing sources"
 [target.mylib]
 type = "static"
 alias = "mylib::mylib"
-sources = ["mylib/**.hpp", "mylib/**.cpp", "mylib/**.gen.cxx"]
+sources = ["mylib/**.hpp", "mylib/**.cpp"]
 include-directories = ["mylib/include"]
 
 # Single-folder glob in example/src/

src/cmake_generator.cpp

@@ -54,64 +54,85 @@ static std::string format(const char *format, const tsl::ordered_map<std::string
     return s;
 }
 
-static std::vector<std::string> expand_cmake_path(const fs::path &name, const fs::path &toml_dir, bool is_root_project) {
+static std::vector<fs::path> expand_cmake_path(const fs::path &source_path, const fs::path &toml_dir, bool is_root_project) {
-
+    auto is_subdir = [](fs::path p, const fs::path &root) {
-    auto const extract_suffix = [](const fs::path &base, const fs::path &full) {
+        while (true) {
-        auto fullpath = full.string();
+            if (p == root) {
-        auto base_len = base.string().length();
+                return true;
-        return fullpath.substr(base_len + 1, fullpath.length() - base_len);
+            }
+            auto parent = p.parent_path();
+            if (parent == p) {
+                break;
+            }
+            p = parent;
+        }
+        return false;
     };
-    auto const extract_path_parts = [](const fs::path &file_path) -> std::pair<std::string, std::string> {
+    if (!is_subdir(fs::absolute(toml_dir / source_path), toml_dir)) {
-        const auto path_as_string = file_path.string();
+        throw std::runtime_error("Path traversal is not allowed: " + source_path.string());
-        auto const dot_position = path_as_string.find('.');
+    }
+
+    // Split the path at the first period (since fs::path::stem() and fs::path::extension() split at the last period)
+    std::string stem, extension;
+    auto filename = source_path.filename().string();
+    auto dot_position = filename.find('.');
     if (dot_position != std::string::npos) {
-            return {path_as_string.substr(0, dot_position), path_as_string.substr(dot_position)};
+        stem = filename.substr(0, dot_position);
+        extension = filename.substr(dot_position);
+    } else {
+        stem = filename;
     }
-        return {path_as_string, {}};
-    };
-    auto const path_parts = extract_path_parts(name.filename());
-    auto const &stem = path_parts.first;
-    auto const &extension = path_parts.second;
 
-    if (is_root_project && stem == "**" && name == name.filename()) {
+    if (is_root_project && stem == "**" && !source_path.has_parent_path()) {
-        throw std::runtime_error("Recursive globbing not allowed in project root: " + name.string());
+        throw std::runtime_error("Recursive globbing not allowed in project root: " + source_path.string());
     }
 
-    std::vector<std::string> temp;
+    auto has_extension = [](const fs::path &file_path, const std::string &extension) {
+        auto path = file_path.string();
+        return path.rfind(extension) == path.length() - extension.length();
+    };
+
+    std::vector<fs::path> paths;
     if (stem == "*") {
-        for (const auto &f : fs::directory_iterator(toml_dir / name.parent_path(), fs::directory_options::follow_directory_symlink)) {
+        for (const auto &f : fs::directory_iterator(toml_dir / source_path.parent_path(), fs::directory_options::follow_directory_symlink)) {
-            if (!f.is_directory() && extract_path_parts(f.path().filename()).second == extension) {
+            if (!f.is_directory() && has_extension(f.path(), extension)) {
-                temp.push_back(extract_suffix(toml_dir, f));
+                paths.push_back(fs::relative(f, toml_dir));
             }
         }
     } else if (stem == "**") {
-        for (const auto &f : fs::recursive_directory_iterator(toml_dir / name.parent_path(), fs::directory_options::follow_directory_symlink)) {
+        for (const auto &f :
-            if (!f.is_directory() && extract_path_parts(f.path().filename()).second == extension) {
+             fs::recursive_directory_iterator(toml_dir / source_path.parent_path(), fs::directory_options::follow_directory_symlink)) {
-                temp.push_back(extract_suffix(toml_dir, f.path()));
+            if (!f.is_directory() && has_extension(f.path(), extension)) {
+                paths.push_back(fs::relative(f, toml_dir));
             }
         }
     } else {
-        temp.push_back(name.string());
+        paths.push_back(source_path);
     }
-    // Normalize all paths to work with CMake (it needs a / on Windows as well)
+
-    for (auto &path : temp) {
+    return paths;
-        std::replace(path.begin(), path.end(), '\\', '/');
-    }
-    // Sort paths alphabetically for consistent cross-OS generation
-    std::sort(temp.begin(), temp.end());
-    return temp;
 }
 
 static std::vector<std::string> expand_cmake_paths(const std::vector<std::string> &sources, const fs::path &toml_dir, bool is_root_project) {
-    // TODO: add duplicate checking
+    std::vector<std::string> paths;
-    std::vector<std::string> result;
     for (const auto &src : sources) {
         auto expanded = expand_cmake_path(src, toml_dir, is_root_project);
         for (const auto &f : expanded) {
-            result.push_back(f);
+            paths.push_back(f.string());
         }
     }
-    return result;
+
+    // Normalize all paths to work with CMake (it needs a / on Windows as well)
+    for (auto &path : paths) {
+        std::replace(path.begin(), path.end(), '\\', '/');
+    }
+
+    // Sort paths alphabetically for consistent cross-OS generation
+    std::sort(paths.begin(), paths.end());
+
+    // TODO: remove duplicates
+
+    return paths;
 }
 
 static void create_file(const fs::path &path, const std::string &contents) {
@@ -681,7 +702,7 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
 
     parser::Project project(parent_project, path, false);
 
-    for (auto const &lang : project.project_languages) {
+    for (const auto &lang : project.project_languages) {
         if (known_languages.find(lang) == known_languages.end()) {
             if (project.project_allow_unknown_languages) {
                 printf("[warning] Unknown language '%s' specified\n", lang.c_str());

tests/globbing/cmake.toml

@@ -6,7 +6,7 @@ description = "Globbing sources"
 [target.mylib]
 type = "static"
 alias = "mylib::mylib"
-sources = ["mylib/**.hpp", "mylib/**.cpp", "mylib/**.gen.cxx"]
+sources = ["mylib/**.hpp", "mylib/**.cpp"]
 include-directories = ["mylib/include"]
 
 # Single-folder glob in example/src/

tests/globbing/mylib/include/mylib/mylib.hpp

@@ -4,5 +4,4 @@
 
 namespace mylib {
 std::string message();
-std::string message2();
+} // namespace mylib
-}

tests/globbing/mylib/src/mylib/mylib.cxx

@@ -1 +0,0 @@
-#error This file should not be included in the sources

tests/globbing/mylib/src/mylib/mylib.gen.cxx

@@ -1,5 +0,0 @@
-#include <mylib/mylib.hpp>
-
-std::string mylib::message2() {
-    return "cmkr is awesome2!";
-}