Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What was the problem/requirement? (What/Why)
Add KeyShot 2024 support :)
What was the solution? (How)
The only code specific to KeyShot 2023 is in the installer. It was assuming that KeyShot installation is done as a user install to
C:\Users\<USER>\Documents\KeyShot 12
. However, this is not always the case. The more general solution is to use theKEYSHOT
/KEYSHOT12
env vars to retrieve the location of the KeyShot install.Note that we do not have Mac installers. Hence, I have removed the macOS installer code to avoid confusion.
What is the impact of this change?
This allows more flexibility for customers in the use of Deadline Cloud for KeyShot!
How was this change tested?
End to end test in KeyShot 2024
Running the installer
Ran the installer in three scenarios:
KEYSHOT
env var (from KeyShot 2024)KEYSHOT12
env var (from KeyShot 2023)In cases 1 and 2, the scripts directory was autofilled in the installer and I just had to confirm the location.
In case 3, I had to manually input the location. I also verified that if the location didn't exist, the installation was rejected.
Ran the installer via the CLI
Ran the installer with the
--mode unattended
argument and used thekeyshot-scripts-folder
command line argument$ DeadlineCloudSubmitter-windows-x64-installer.exe --enable-components deadline-cloud-for-keyshot --keyshot-scripts-directory C:\Users\test-user\Documents\KeyShot\Scripts --mode unattended
Help entry (
DeadlineCloudSubmitter-windows-x64-installer.exe --help
):Was this change documented?
Yes, in the
README.md
Is this a breaking change?
No
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.