From 51e3db55b3b0bed4541d34f208726b2f2a97b3ef Mon Sep 17 00:00:00 2001 From: goat Date: Sat, 29 Jun 2024 14:28:46 +0200 Subject: [PATCH] Revert "emit compiler generated files for docs builds" This reverts commit df4104d86885e0860819389676d230dcc520194a. --- .nuke/build.schema.json | 4 ---- build/DalamudBuild.cs | 29 +++++------------------------ 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 497f2b89a..c19388eea 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -43,10 +43,6 @@ "VSCode" ] }, - "IsDocsBuild": { - "type": "boolean", - "description": "Whether we are building for documentation - emits generated files" - }, "NoLogo": { "type": "boolean", "description": "Disables displaying the NUKE logo" diff --git a/build/DalamudBuild.cs b/build/DalamudBuild.cs index c16db3511..c8c118c31 100644 --- a/build/DalamudBuild.cs +++ b/build/DalamudBuild.cs @@ -7,7 +7,6 @@ using Nuke.Common.IO; using Nuke.Common.ProjectModel; using Nuke.Common.Tools.DotNet; using Nuke.Common.Tools.MSBuild; -using Serilog; [UnsetVisualStudioEnvironmentVariables] public class DalamudBuild : NukeBuild @@ -23,9 +22,6 @@ public class DalamudBuild : NukeBuild [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release; - [Parameter("Whether we are building for documentation - emits generated files")] - readonly bool IsDocsBuild = false; - [Solution] Solution Solution; [GitRepository] GitRepository GitRepository; @@ -59,30 +55,15 @@ public class DalamudBuild : NukeBuild DotNetTasks.DotNetRestore(s => s .SetProjectFile(Solution)); }); - + Target CompileDalamud => _ => _ .DependsOn(Restore) .Executes(() => { - DotNetTasks.DotNetBuild(s => - { - s = s - .SetProjectFile(DalamudProjectFile) - .SetConfiguration(Configuration) - .EnableNoRestore(); - - // We need to emit compiler generated files for the docs build, since docfx can't run generators directly - // TODO: This fails every build after this because of redefinitions... - if (IsDocsBuild) - { - Log.Warning("Building for documentation, emitting compiler generated files. This can cause issues on Windows due to path-length limitations"); - s = s - .SetProperty("EmitCompilerGeneratedFiles", "true") - .SetProperty("CompilerGeneratedFilesOutputPath", "Generated"); - } - - return s; - }); + DotNetTasks.DotNetBuild(s => s + .SetProjectFile(DalamudProjectFile) + .SetConfiguration(Configuration) + .EnableNoRestore()); }); Target CompileDalamudBoot => _ => _