Build: support including src/ (#1152)

Makefile

@@ -35,7 +35,7 @@ DEFINES := -DCABIN_CABIN_PKG_VERSION='"$(VERSION)"' \
   -DCABIN_CABIN_COMMIT_HASH='"$(COMMIT_HASH)"' \
   -DCABIN_CABIN_COMMIT_SHORT_HASH='"$(COMMIT_SHORT_HASH)"' \
   -DCABIN_CABIN_COMMIT_DATE='"$(COMMIT_DATE)"'
-INCLUDES := -isystem $(O)/DEPS/toml11/include \
+INCLUDES := -Isrc -isystem $(O)/DEPS/toml11/include \
   -isystem $(O)/DEPS/mitama-cpp-result/include \
   $(shell pkg-config --cflags '$(LIBGIT2_VERREQ)') \
   $(shell pkg-config --cflags '$(LIBCURL_VERREQ)') \

src/Builder/Compiler.cc

@@ -1,8 +1,8 @@
 #include "Compiler.hpp"
 
-#include "../Algos.hpp"
-#include "../Command.hpp"
-#include "../Rustify/Result.hpp"
+#include "Algos.hpp"
+#include "Command.hpp"
+#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <sstream>

src/Builder/Compiler.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../Command.hpp"
-#include "../Rustify/Result.hpp"
-#include "../VersionReq.hpp"
+#include "Command.hpp"
+#include "Rustify/Result.hpp"
+#include "VersionReq.hpp"
 
 #include <filesystem>
 #include <fmt/format.h>

src/Builder/Project.cc

@@ -1,10 +1,10 @@
 #include "Project.hpp"
 
-#include "../Algos.hpp"
-#include "../Git2.hpp"
-#include "../Rustify/Result.hpp"
-#include "../TermColor.hpp"
+#include "Algos.hpp"
 #include "BuildProfile.hpp"
+#include "Git2.hpp"
+#include "Rustify/Result.hpp"
+#include "TermColor.hpp"
 
 #include <filesystem>
 #include <spdlog/spdlog.h>
@@ -15,25 +15,28 @@
 
 namespace cabin {
 
+void
+Project::includeIfExist(const fs::path& path, bool isSystem) {
+  if (fs::exists(path)) {
+    compiler.opts.cFlags.includeDirs.emplace_back(path, isSystem);
+  }
+}
+
 Result<Project>
 Project::init(const fs::path& rootDir) {
   Manifest manifest = Try(Manifest::tryParse(rootDir / Manifest::FILE_NAME));
   Compiler compiler = Try(Compiler::init());
-
-  fs::path projectIncludePath = rootDir / "include";
-  if (fs::exists(projectIncludePath)) {
-    compiler.opts.cFlags.includeDirs.emplace_back(
-        std::move(projectIncludePath), /*isSystem=*/false
-    );
-  }
   compiler.opts.cFlags.others.emplace_back(
       "-std=c++" + manifest.package.edition.str
   );
   if (shouldColorStderr()) {
     compiler.opts.cFlags.others.emplace_back("-fdiagnostics-color");
   }
 
-  return Ok(Project(std::move(manifest), std::move(compiler)));
+  Project project(std::move(manifest), std::move(compiler));
+  project.includeIfExist(rootDir / "src", /*isSystem=*/false);
+  project.includeIfExist(rootDir / "include", /*isSystem=*/false);
+  return Ok(std::move(project));
 }
 
 // Generally split the string by space character, but it will properly interpret
@@ -186,7 +189,7 @@ Project::setBuildProfile(const BuildProfile& buildProfile) {
 
 #ifdef CABIN_TEST
 
-#  include "../Rustify/Tests.hpp"
+#  include "Rustify/Tests.hpp"
 
 namespace tests {
 

src/Builder/Project.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
 #include "BuildProfile.hpp"
 #include "Compiler.hpp"
+#include "Manifest.hpp"
+#include "Rustify/Result.hpp"
 
 #include <filesystem>
 #include <utility>
@@ -16,6 +16,8 @@ class Project {
   Project(Manifest manifest, Compiler compiler)
       : manifest(std::move(manifest)), compiler(std::move(compiler)) {};
 
+  void includeIfExist(const fs::path& path, bool isSystem = false);
+
 public:
   const Manifest manifest;
   Compiler compiler;

src/Cmd/Add.cc

@@ -1,9 +1,9 @@
 #include "Add.hpp"
 
-#include "../Cli.hpp"
-#include "../Diag.hpp"
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
+#include "Cli.hpp"
+#include "Diag.hpp"
+#include "Manifest.hpp"
+#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <fmt/std.h>

src/Cmd/Add.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {
 

src/Cmd/Build.cc

@@ -1,14 +1,14 @@
 #include "Build.hpp"
 
-#include "../Algos.hpp"
-#include "../BuildConfig.hpp"
-#include "../Builder/BuildProfile.hpp"
-#include "../Cli.hpp"
-#include "../Command.hpp"
-#include "../Diag.hpp"
-#include "../Manifest.hpp"
-#include "../Parallelism.hpp"
+#include "Algos.hpp"
+#include "BuildConfig.hpp"
+#include "Builder/BuildProfile.hpp"
+#include "Cli.hpp"
+#include "Command.hpp"
 #include "Common.hpp"
+#include "Diag.hpp"
+#include "Manifest.hpp"
+#include "Parallelism.hpp"
 
 #include <charconv>
 #include <chrono>

src/Cmd/Build.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../Builder/BuildProfile.hpp"
-#include "../Cli.hpp"
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
+#include "Builder/BuildProfile.hpp"
+#include "Cli.hpp"
+#include "Manifest.hpp"
+#include "Rustify/Result.hpp"
 
 #include <string>
 

src/Cmd/Clean.cc

@@ -1,9 +1,9 @@
 #include "Clean.hpp"
 
-#include "../Cli.hpp"
-#include "../Diag.hpp"
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
+#include "Cli.hpp"
+#include "Diag.hpp"
+#include "Manifest.hpp"
+#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <string>

src/Cmd/Clean.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {
 

src/Cmd/Common.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../Cli.hpp"
-#include "../Parallelism.hpp"
+#include "Cli.hpp"
+#include "Parallelism.hpp"
 
 namespace cabin {
 

src/Cmd/Fmt.cc

@@ -1,13 +1,13 @@
 #include "Fmt.hpp"
 
-#include "../Algos.hpp"
-#include "../BuildConfig.hpp"
-#include "../Cli.hpp"
-#include "../Diag.hpp"
-#include "../Git2/Exception.hpp"
-#include "../Git2/Repository.hpp"
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
+#include "Algos.hpp"
+#include "BuildConfig.hpp"
+#include "Cli.hpp"
+#include "Diag.hpp"
+#include "Git2/Exception.hpp"
+#include "Git2/Repository.hpp"
+#include "Manifest.hpp"
+#include "Rustify/Result.hpp"
 
 #include <algorithm>
 #include <cstdlib>

src/Cmd/Fmt.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {
 

src/Cmd/Help.cc

@@ -1,6 +1,6 @@
 #include "Help.hpp"
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {
 

src/Cmd/Help.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {
 

src/Cmd/Init.cc

@@ -1,11 +1,11 @@
 #include "Init.hpp"
 
-#include "../Cli.hpp"
-#include "../Diag.hpp"
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
+#include "Cli.hpp"
 #include "Common.hpp"
+#include "Diag.hpp"
+#include "Manifest.hpp"
 #include "New.hpp"
+#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <fstream>

src/Cmd/Init.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {
 

src/Cmd/Lint.cc

@@ -1,11 +1,11 @@
 #include "Lint.hpp"
 
-#include "../Algos.hpp"
-#include "../Cli.hpp"
-#include "../Command.hpp"
-#include "../Diag.hpp"
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
+#include "Algos.hpp"
+#include "Cli.hpp"
+#include "Command.hpp"
+#include "Diag.hpp"
+#include "Manifest.hpp"
+#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <filesystem>

src/Cmd/Lint.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {
 

src/Cmd/New.cc

@@ -1,12 +1,12 @@
 #include "New.hpp"
 
-#include "../Algos.hpp"
-#include "../Cli.hpp"
-#include "../Diag.hpp"
-#include "../Git2.hpp"
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
+#include "Algos.hpp"
+#include "Cli.hpp"
 #include "Common.hpp"
+#include "Diag.hpp"
+#include "Git2.hpp"
+#include "Manifest.hpp"
+#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <fstream>

src/Cmd/New.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 #include <string>
 #include <string_view>

src/Cmd/Remove.cc

@@ -1,9 +1,9 @@
 #include "Remove.hpp"
 
-#include "../Cli.hpp"
-#include "../Diag.hpp"
-#include "../Manifest.hpp"
-#include "../Rustify/Result.hpp"
+#include "Cli.hpp"
+#include "Diag.hpp"
+#include "Manifest.hpp"
+#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <fmt/ranges.h>

src/Cmd/Remove.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {
 

src/Cmd/Run.cc

@@ -1,15 +1,15 @@
 #include "Run.hpp"
 
-#include "../Algos.hpp"
-#include "../Builder/BuildProfile.hpp"
-#include "../Cli.hpp"
-#include "../Command.hpp"
-#include "../Diag.hpp"
-#include "../Manifest.hpp"
-#include "../Parallelism.hpp"
-#include "../Rustify/Result.hpp"
+#include "Algos.hpp"
 #include "Build.hpp"
+#include "Builder/BuildProfile.hpp"
+#include "Cli.hpp"
+#include "Command.hpp"
 #include "Common.hpp"
+#include "Diag.hpp"
+#include "Manifest.hpp"
+#include "Parallelism.hpp"
+#include "Rustify/Result.hpp"
 
 #include <charconv>
 #include <cstdint>

src/Cmd/Run.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Cli.hpp"
+#include "Cli.hpp"
 
 namespace cabin {