Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

Gitflow 7/16/21 - O3DE

Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake

@@ -9,4 +9,6 @@
 set(FILES
     Python_linux.cpp
     ProjectBuilderWorker_linux.cpp
+    ProjectUtils_linux.cpp
+    ProjectManagerDefs_linux.cpp
 )

Code/Tools/ProjectManager/Platform/Linux/ProjectManagerDefs_linux.cpp

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <ProjectManagerDefs.h>
+
+
+namespace O3DE::ProjectManager
+{
+    const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/linux";
+
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <ProjectUtils.h>
+
+namespace O3DE::ProjectManager
+{
+    namespace ProjectUtils
+    {
+        AZ::Outcome<void, QString> FindSupportedCompilerForPlatform()
+        {
+            // Compiler detection not supported on platform
+            return AZ::Success();
+        }
+        
+    } // namespace ProjectUtils
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake

@@ -9,4 +9,6 @@
 set(FILES
     Python_mac.cpp
     ProjectBuilderWorker_mac.cpp
+    ProjectUtils_mac.cpp
+    ProjectManagerDefs_mac.cpp
 )

Code/Tools/ProjectManager/Platform/Mac/ProjectManagerDefs_mac.cpp

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <ProjectManagerDefs.h>
+
+
+namespace O3DE::ProjectManager
+{
+    const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/mac_xcode";
+
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <ProjectUtils.h>
+
+namespace O3DE::ProjectManager
+{
+    namespace ProjectUtils
+    {
+        AZ::Outcome<void, QString> FindSupportedCompilerForPlatform()
+        {
+            // Compiler detection not supported on platform
+            return AZ::Success();
+        }
+        
+    } // namespace ProjectUtils
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake

@@ -9,4 +9,6 @@
 set(FILES
     Python_windows.cpp
     ProjectBuilderWorker_windows.cpp
+    ProjectUtils_windows.cpp
+    ProjectManagerDefs_windows.cpp
 )

Code/Tools/ProjectManager/Platform/Windows/ProjectBuilderWorker_windows.cpp

@@ -76,8 +76,17 @@ namespace O3DE::ProjectManager
 
         m_configProjectProcess->start(
             "cmake",
-            QStringList{ "-B", QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix), "-S", m_projectInfo.m_path, "-G",
-                         "Visual Studio 16", "-DLY_3RDPARTY_PATH=" + engineInfo.m_thirdPartyPath });
+            QStringList
+            {
+                "-B",
+                QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix),
+                "-S",
+                m_projectInfo.m_path,
+                "-G",
+                "Visual Studio 16",
+                "-DLY_3RDPARTY_PATH=" + engineInfo.m_thirdPartyPath,
+                "-DLY_UNITY_BUILD=1"
+            });
 
         if (!m_configProjectProcess->waitForStarted())
         {
@@ -125,8 +134,16 @@ namespace O3DE::ProjectManager
 
         m_buildProjectProcess->start(
             "cmake",
-            QStringList{ "--build", QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix), "--target",
-                         m_projectInfo.m_projectName + ".GameLauncher", "Editor", "--config", "profile" });
+            QStringList
+            {
+                "--build",
+                QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix),
+                "--target",
+                m_projectInfo.m_projectName + ".GameLauncher",
+                "Editor",
+                "--config",
+                "profile"
+            });
 
         if (!m_buildProjectProcess->waitForStarted())
         {

Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <ProjectManagerDefs.h>
+
+namespace O3DE::ProjectManager
+{
+    const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/windows_vs2019";
+
+} // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <ProjectUtils.h>
+
+#include <QDir>
+#include <QFileInfo>
+#include <QProcess>
+#include <QProcessEnvironment>
+
+namespace O3DE::ProjectManager
+{
+    namespace ProjectUtils
+    {
+        AZ::Outcome<void, QString> FindSupportedCompilerForPlatform()
+        {
+            QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+            QString programFilesPath = environment.value("ProgramFiles(x86)");
+            QString vsWherePath = QDir(programFilesPath).filePath("Microsoft Visual Studio/Installer/vswhere.exe");
+
+            QFileInfo vsWhereFile(vsWherePath);
+            if (vsWhereFile.exists() && vsWhereFile.isFile())
+            {
+                QProcess vsWhereProcess;
+                vsWhereProcess.setProcessChannelMode(QProcess::MergedChannels);
+
+                vsWhereProcess.start(
+                    vsWherePath,
+                    QStringList{
+                        "-version",
+                        "16.0",
+                        "-latest",
+                        "-requires",
+                        "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+                        "-property",
+                        "isComplete"
+                    });
+
+                if (vsWhereProcess.waitForStarted() && vsWhereProcess.waitForFinished())
+                {
+                    QString vsWhereOutput(vsWhereProcess.readAllStandardOutput());
+                    if (vsWhereOutput.startsWith("1"))
+                    {
+                        return AZ::Success();
+                    }
+                }
+            }
+
+            return AZ::Failure(QObject::tr("Visual Studio 2019 not found.\n\n"
+                "Visual Studio 2019 is required to build this project."
+                " Install any edition of <a href='https://visualstudio.microsoft.com/downloads/'>Visual Studio 2019</a>"
+                " before proceeding to the next step."));
+        }
+        
+    } // namespace ProjectUtils
+} // namespace O3DE::ProjectManager