From 8530e783cab7d461a900c1362e04bc3e99c3ec40 Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:23:51 -0500 Subject: [PATCH] Setting the build timeout for the ProjectBuilder CMake commands to -1 (#1583) This prevents Project build step from timing out Moving the project build directory to be under the /build/ folder to prevent two issues 1. The AssetProcessor from scanning that folder for assets. [Bb]uild is part of the excluded folders 2. To prevent git from seeing modified files in the build directory as the default .gitignore file ignores [Bb]uild --- Code/Tools/ProjectManager/Source/ProjectBuilder.cpp | 4 ++-- Code/Tools/ProjectManager/Source/ProjectManagerDefs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilder.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilder.cpp index a97499ab44..4dfe46b3bf 100644 --- a/Code/Tools/ProjectManager/Source/ProjectBuilder.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectBuilder.cpp @@ -24,8 +24,8 @@ namespace O3DE::ProjectManager { - // 10 Minutes - constexpr int MaxBuildTimeMSecs = 600000; + // QProcess::waitForFinished uses -1 to indicate that the process should not timeout + constexpr int MaxBuildTimeMSecs = -1; ProjectBuilderWorker::ProjectBuilderWorker(const ProjectInfo& projectInfo) : QObject() diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h b/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h index 1295e84281..1058dae68a 100644 --- a/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h +++ b/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h @@ -13,7 +13,7 @@ namespace O3DE::ProjectManager inline constexpr static int ProjectPreviewImageWidth = 210; inline constexpr static int ProjectPreviewImageHeight = 280; - static const QString ProjectBuildPathPostfix = "Windows_VS2019"; + static const QString ProjectBuildPathPostfix = "build/windows_vs2019"; static const QString ProjectBuildErrorLogPathPostfix = "CMakeFiles/CMakeProjectBuildError.log"; static const QString ProjectPreviewImagePath = "preview.png"; } // namespace O3DE::ProjectManager