Build: Express absolute include paths as relative to project dir

Author: Pagghiu

Libraries/Build/Build.cpp

@@ -249,14 +249,24 @@ SC::Result SC::Build::DefinitionCompiler::fillPathsList(StringView path, const V
 // Collects root paths to build a stat map
 SC::Result SC::Build::DefinitionCompiler::collectUniqueRootPaths(VectorMap<String, VectorSet<Project::File>>& paths)
 {
-    String buffer;
+    String                      buffer;
+    SmallVector<StringView, 16> components;
     for (const Workspace& workspace : definition.workspaces)
     {
         for (const Project& project : workspace.projects)
         {
             for (const Project::File& file : project.files)
             {
                 SC_TRY(buffer.assign(project.rootDirectory.view()));
+                if (Path::isAbsolute(file.base.view(), Path::Type::AsNative))
+                {
+                    Project::File absFile;
+                    absFile.operation = file.operation;
+                    SC_TRY(Path::normalize(file.base.view(), components, &absFile.base, Path::Type::AsPosix));
+                    SC_TRY(absFile.mask.assign(file.mask.view()));
+                    SC_TRY(paths.getOrCreate(absFile.base.view())->insert(absFile));
+                    continue;
+                }
                 if (file.base.view().isEmpty())
                 {
                     if (not file.mask.isEmpty())

Libraries/Build/Internal/BuildWriter.h

@@ -99,15 +99,28 @@ struct SC::Build::WriterInternal
         return true;
     }
 
-    [[nodiscard]] static bool getPathsRelativeTo(StringView                referenceDirectory,
-                                                 const DefinitionCompiler& definitionCompiler, const Project& project,
-                                                 Vector<RenderItem>& outputFiles)
+    [[nodiscard]] static Result getPathsRelativeTo(StringView                referenceDirectory,
+                                                   const DefinitionCompiler& definitionCompiler, const Project& project,
+                                                   Vector<RenderItem>& outputFiles)
     {
-        String renderedFile;
+        String             renderedFile;
+        Vector<StringView> components;
         for (const auto& file : project.files)
         {
-            SC_TRY(Path::join(renderedFile, {project.rootDirectory.view(), file.base.view(), file.mask.view()},
-                              Path::Posix::SeparatorStringView(), true)); // skipEmpty == true
+            if (Path::isAbsolute(file.base.view(), Path::AsNative))
+            {
+                SC_TRY(Path::normalize(file.base.view(), components, &renderedFile, Path::AsPosix));
+                SC_TRY(Path::append(renderedFile, {file.mask.view()}, Path::AsPosix));
+            }
+            else
+            {
+                StringView paths[3];
+                paths[0] = project.rootDirectory.view();
+                paths[1] = file.base.view();
+                paths[2] = file.mask.view();
+                SC_TRY(
+                    Path::join(renderedFile, {paths}, Path::Posix::SeparatorStringView(), true)); // skipEmpty == true
+            }
             const auto* res = definitionCompiler.resolvedPaths.get(renderedFile.view());
             if (res)
             {
@@ -156,12 +169,12 @@ struct SC::Build::WriterInternal
             }
             else
             {
-                return false;
+                return Result::Error("BuildWriter::getPathsRelativeTo - Cannot find path");
             }
         }
         Algorithms::bubbleSort(outputFiles.begin(), outputFiles.end(),
                                [](const RenderItem& a1, const RenderItem& a2)
                                { return a1.path.view().compare(a2.path.view()) == StringView::Comparison::Smaller; });
-        return true;
+        return Result(true);
     }
 };

Libraries/Build/Internal/BuildWriterMakefile.inl

@@ -203,9 +203,12 @@ endif
             for (auto& it : *includesArray)
             {
                 SC_TRY(builder.append(" \"-I"));
-                if (Path::isAbsolute(it.view(), Path::AsPosix))
+                if (Path::isAbsolute(it.view(), Path::AsNative))
                 {
-                    builder.append(it.view());
+                    String relative;
+                    SC_TRY(Path::relativeFromTo(directories.projectsDirectory.view(), it.view(), relative,
+                                                Path::AsNative));
+                    builder.append("$(CURDIR)/{}", relative);
                 }
                 else
                 {

Libraries/Build/Internal/BuildWriterVisualStudio.inl

@@ -437,18 +437,18 @@ struct SC::Build::ProjectWriter::WriterVisualStudio
         return true;
     }
 
-    [[nodiscard]] bool prepare(const Project& project, Renderer& renderer)
+    [[nodiscard]] Result prepare(const Project& project, Renderer& renderer)
     {
         renderer.renderItems.clear();
         SC_TRY(fillVisualStudioFiles(directories.projectsDirectory.view(), project, renderer.renderItems));
-        return true;
+        return Result(true);
     }
 
-    [[nodiscard]] bool fillVisualStudioFiles(StringView projectDirectory, const Project& project,
-                                             Vector<RenderItem>& outputFiles)
+    [[nodiscard]] Result fillVisualStudioFiles(StringView projectDirectory, const Project& project,
+                                               Vector<RenderItem>& outputFiles)
     {
         SC_TRY(WriterInternal::getPathsRelativeTo(projectDirectory, definitionCompiler, project, outputFiles));
-        return true;
+        return Result(true);
     }
 
     // Project
@@ -688,11 +688,19 @@ struct SC::Build::ProjectWriter::WriterVisualStudio
 
     [[nodiscard]] bool appendProjectRelative(StringBuilder& builder, StringView text)
     {
-        if (not Path::isAbsolute(text, Path::AsWindows) and not text.startsWith("$(PROJECT_DIR)"))
+        if (Path::isAbsolute(text, Path::AsNative))
+        {
+            String relative;
+            SC_TRY(Path::relativeFromTo(directories.projectsDirectory.view(), text, relative, Path::AsNative,
+                                        Path::AsWindows));
+            SC_TRY(builder.append("$(ProjectDir){}\\", relative));
+            return true;
+        }
+        else
         {
             SC_TRY(builder.append("$(ProjectDir){}\\", relativeDirectories.relativeProjectsToProjectRoot));
+            return appendVariable(builder, text);
         }
-        return appendVariable(builder, text);
     }
 
     [[nodiscard]] bool appendVariable(StringBuilder& builder, StringView text)

Libraries/Build/Internal/BuildWriterXCode.inl

@@ -424,9 +424,12 @@ struct SC::Build::ProjectWriter::WriterXCode
             for (auto it : *includes)
             {
                 // TODO: Escape double quotes for include paths
-                if (Path::isAbsolute(it.view(), Path::AsPosix))
+                if (Path::isAbsolute(it.view(), Path::AsNative))
                 {
-                    SC_TRY(builder.append("\n                       \"{}\",", it.view()));
+                    String relative;
+                    SC_TRY(Path::relativeFromTo(directories.projectsDirectory.view(), it.view(), relative,
+                                                Path::AsNative));
+                    SC_TRY(builder.append("\n                       \"$(PROJECT_DIR)/{}\",", relative));
                 }
                 else
                 {