From 50e4ced174e22c7a9c0b3b0aeea9fe7da9684824 Mon Sep 17 00:00:00 2001 From: Sandwich <299465+dskvr@users.noreply.github.com> Date: Sat, 25 Jul 2020 13:25:55 +0200 Subject: [PATCH 1/7] conditional -game arg on binary call using --notgame flag --- ue4cli/UnrealManagerBase.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ue4cli/UnrealManagerBase.py b/ue4cli/UnrealManagerBase.py index d2bcbb5..673b8d6 100644 --- a/ue4cli/UnrealManagerBase.py +++ b/ue4cli/UnrealManagerBase.py @@ -445,7 +445,7 @@ def packageDescriptor(self, dir=os.getcwd(), args=[]): else: self.packagePlugin(dir, args) - def runAutomationCommands(self, projectFile, commands, extraArgs, capture=False, enableRHI=False): + def runAutomationCommands(self, projectFile, commands, extraArgs, capture=False, enableRHI=False, disableGameArg=False): ''' Invokes the Automation Test commandlet for the specified project with the supplied automation test commands ''' @@ -461,7 +461,9 @@ def runAutomationCommands(self, projectFile, commands, extraArgs, capture=False, # preventing them from executing correctly. command = '{} {}'.format(Utility.escapePathForShell(self.getEditorBinary(True)), Utility.escapePathForShell(projectFile)) - command += ' -game -buildmachine -stdout -fullstdoutlogoutput -forcelogflush -unattended -nopause -nosplash' + if disableGameArg == False: + command += ' -game' + command += ' -buildmachine -stdout -fullstdoutlogoutput -forcelogflush -unattended -nopause -nosplash' if enableRHI == False: command += ' -nullrhi' command += ' -ExecCmds="automation {};quit" '.format(';'.join(commands)) @@ -504,6 +506,10 @@ def automationTests(self, dir=os.getcwd(), args=[]): enableRHI = len(Utility.findArgs(args, ['--withrhi'])) > 0 args = Utility.stripArgs(args, ['--withrhi']) + # Determine if tests should be run as a game + disableGameArg = len(Utility.findArgs(args, ['--notgame'])) > 0 + args = Utility.stripArgs(args, ['--withrhi']) + # Verify that at least one argument was supplied if len(args) == 0: raise RuntimeError('at least one test name must be specified') @@ -546,7 +552,7 @@ def automationTests(self, dir=os.getcwd(), args=[]): # Attempt to run the automation tests Utility.printStderr('Running automation tests...') - logOutput = self.runAutomationCommands(projectFile, command, extraArgs, capture=True, enableRHI=enableRHI) + logOutput = self.runAutomationCommands(projectFile, command, extraArgs, capture=True, enableRHI=enableRHI, disableGameArg=disableGameArg) # Propagate the log output print(logOutput.stdout) From 6c38d95604dd999d43116287f5e3813c139e9042 Mon Sep 17 00:00:00 2001 From: Sandwich <299465+dskvr@users.noreply.github.com> Date: Sat, 25 Jul 2020 13:41:49 +0200 Subject: [PATCH 2/7] fixed mistake when stripping --not-game from args --- ue4cli/UnrealManagerBase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ue4cli/UnrealManagerBase.py b/ue4cli/UnrealManagerBase.py index 673b8d6..e26bd62 100644 --- a/ue4cli/UnrealManagerBase.py +++ b/ue4cli/UnrealManagerBase.py @@ -508,7 +508,7 @@ def automationTests(self, dir=os.getcwd(), args=[]): # Determine if tests should be run as a game disableGameArg = len(Utility.findArgs(args, ['--notgame'])) > 0 - args = Utility.stripArgs(args, ['--withrhi']) + args = Utility.stripArgs(args, ['--notgame']) # Verify that at least one argument was supplied if len(args) == 0: From 860b3d1ae6ddb158dc650d9332816e4c24a4bbe7 Mon Sep 17 00:00:00 2001 From: Sandwich <299465+dskvr@users.noreply.github.com> Date: Mon, 27 Jul 2020 13:26:10 +0200 Subject: [PATCH 3/7] convert spaces-indent to tab-indent to match source --- ue4cli/UnrealManagerBase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ue4cli/UnrealManagerBase.py b/ue4cli/UnrealManagerBase.py index e26bd62..9259253 100644 --- a/ue4cli/UnrealManagerBase.py +++ b/ue4cli/UnrealManagerBase.py @@ -462,7 +462,7 @@ def runAutomationCommands(self, projectFile, commands, extraArgs, capture=False, command = '{} {}'.format(Utility.escapePathForShell(self.getEditorBinary(True)), Utility.escapePathForShell(projectFile)) if disableGameArg == False: - command += ' -game' + command += ' -game' command += ' -buildmachine -stdout -fullstdoutlogoutput -forcelogflush -unattended -nopause -nosplash' if enableRHI == False: command += ' -nullrhi' From e0223525623859f1842212c9099701c718ec95c4 Mon Sep 17 00:00:00 2001 From: Adam Rehn Date: Tue, 15 Dec 2020 18:19:25 +1000 Subject: [PATCH 4/7] Bump version to 0.0.50 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 672c604..920336a 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name='ue4cli', - version='0.0.49', + version='0.0.50', description='Command-line interface for Unreal Engine 4', long_description=__readme__, long_description_content_type='text/markdown', From 170c89407dfe54ed72711687362ee0a358f5d604 Mon Sep 17 00:00:00 2001 From: Adam Rehn Date: Fri, 29 Jan 2021 17:14:11 +1000 Subject: [PATCH 5/7] Print specified path in setroot to make errors easier to spot --- ue4cli/UnrealManagerBase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ue4cli/UnrealManagerBase.py b/ue4cli/UnrealManagerBase.py index 7aa4d83..c7b10e4 100644 --- a/ue4cli/UnrealManagerBase.py +++ b/ue4cli/UnrealManagerBase.py @@ -36,7 +36,9 @@ def setEngineRootOverride(self, rootDir): """ # Set the new root directory - ConfigurationManager.setConfigKey('rootDirOverride', os.path.abspath(rootDir)) + rootDir = os.path.abspath(rootDir) + ConfigurationManager.setConfigKey('rootDirOverride', rootDir) + print('Set engine root path override: {}'.format(rootDir)) # Check that the specified directory is valid and warn the user if it is not try: From bf7b2c390e40898f371d6e8a9460eae8d232f548 Mon Sep 17 00:00:00 2001 From: Adam Rehn Date: Fri, 29 Jan 2021 17:14:36 +1000 Subject: [PATCH 6/7] Bump version to 0.0.51 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 920336a..66529d3 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name='ue4cli', - version='0.0.50', + version='0.0.51', description='Command-line interface for Unreal Engine 4', long_description=__readme__, long_description_content_type='text/markdown', From f14211150256f617e4726347808165989f39aa13 Mon Sep 17 00:00:00 2001 From: "dskvr@noreply.github.com" <299465+dskvr@users.noreply.github.com> Date: Tue, 2 Feb 2021 00:38:05 +0100 Subject: [PATCH 7/7] space --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cc4eead..e8735fe 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,4 @@ Resources: ## Legal -Copyright © 2017-2018, Adam Rehn. Licensed under the MIT License, see the file [LICENSE](https://github.com/adamrehn/ue4cli/blob/master/LICENSE) for details. +Copyright © 2017-2018, Adam Rehn. Licensed under the MIT License, see the file [LICENSE](https://github.com/adamrehn/ue4cli/blob/master/LICENSE) for details.