Restore defaults, clarify comment

Signed-off-by: sweeneys <sweeneys@amazon.com>
This commit is contained in:
sweeneys
2021-12-01 14:13:13 -08:00
parent a5cb5b7f80
commit fd45a37c7b
3 changed files with 25 additions and 5 deletions
@@ -177,7 +177,7 @@ class AndroidLauncher(Launcher):
if backupFiles:
self.backup_settings()
# Base setup defaults to None
# None reverts to function default
if launch_ap is None:
launch_ap = True
@@ -52,7 +52,7 @@ class LinuxLauncher(Launcher):
if backupFiles:
self.backup_settings()
# Base setup defaults to None
# None reverts to function default
if launch_ap is None:
launch_ap = True
@@ -192,9 +192,9 @@ class DedicatedLinuxLauncher(LinuxLauncher):
if backupFiles:
self.backup_settings()
# Base setup defaults to None
# None reverts to function default
if launch_ap is None:
launch_ap = True
launch_ap = False
super(DedicatedLinuxLauncher, self).setup(backupFiles, launch_ap, configure_settings)
@@ -52,7 +52,7 @@ class WinLauncher(Launcher):
if backupFiles:
self.backup_settings()
# Base setup defaults to None
# None reverts to function default
if launch_ap is None:
launch_ap = True
@@ -177,6 +177,26 @@ class WinLauncher(Launcher):
class DedicatedWinLauncher(WinLauncher):
def setup(self, backupFiles=True, launch_ap=False, configure_settings=True):
"""
Perform setup of this launcher, must be called before launching.
Subclasses should call its parent's setup() before calling its own code, unless it changes configuration files
:param backupFiles: Bool to backup setup files
:param launch_ap: Bool to launch the asset processor
:param configure_settings: Bool to update settings caches
:return: None
"""
# Backup
if backupFiles:
self.backup_settings()
# None reverts to function default
if launch_ap is None:
launch_ap = False
super(DedicatedWinLauncher, self).setup(backupFiles, launch_ap, configure_settings)
def binary_path(self):
"""
Return full path to the dedicated server launcher for the build directory.