package: use CustomConfig instead of DNEConfigVariant #95
Conversation
nimp/base_commands/package.py
Outdated
| @@ -224,7 +224,10 @@ def run(self, env): | |||
|
|
|||
|
|
|||
| if env.variant: | |||
| variant_configuration_directory = package_configuration.configuration_directory + '/Variants/Active' | |||
| if env.unreal_version >= 5.3: | |||
There was a problem hiding this comment.
Maybe instead of duplication this check, we could have a bool with a clear name?
Something like has_ue_custom_config = env.unreal_version >= 5.3?
So if we postpone this to 5.4 or under some other condition, we can simply change one line.
nimp/base_commands/package.py
Outdated
| if env.variant: | ||
| cook_command += [ f'-CustomConfig={env.variant}' ] | ||
| else: | ||
| cook_command += [ '-DNEConfigVariant' ] |
There was a problem hiding this comment.
Maybe the if env.variant should be applied here as well? @jasugun thoughts ?
There was a problem hiding this comment.
The flag loads the active variant folder in any case.
Since we're using nimp it's always properly setup (there should be nothing if not --variant has been passed).
There was a problem hiding this comment.
But I guess it doesn't hurt to add the if env.variant.
nimp/base_commands/package.py
Outdated
| # necessary for shader debug info in case no defaultEngine is present | ||
| _setup_default_config_file(f'{variant_configuration_directory}/DefaultEngine.ini') | ||
| _setup_default_config_file(f'{variant_configuration_directory}/DefaultGame.ini') | ||
| Package.write_project_revisions(env, variant_configuration_directory) |
There was a problem hiding this comment.
In the DneVariant flow:
- We copy the variant to an avtive variant folder, that will get all the edits in write_project_revisions
- This works because the active variant folder is not perforced in any case.
In the CustomConfig flow:
- We're working with a perfoced custom folder right? In this case I think the edits won't work out of the box (it might have worked because you tested stuff in your monorepo with no files locked by perforce).
- You might want it peforce edit/revert wrap the file in that case
There was a problem hiding this comment.
I don't think we'd have the custom config folders on Perforce. I was thinking we'd have them on Git, like we do for variants currently
There was a problem hiding this comment.
Package are create Perforce side, after a sync from Git to Perforce, so the context of this command is a Perforce client
Co-authored-by: Thomas Desveaux <[email protected]>
| Package.write_project_revisions(env, active_configuration_directory) | ||
| _setup_default_config_file(f'{configuration_directory}/DefaultEngine.ini') | ||
| _setup_default_config_file(f'{configuration_directory}/DefaultGame.ini') | ||
| Package.write_project_revisions(env, configuration_directory) |
There was a problem hiding this comment.
In the DNEVariant workflow, we're editing an active folder that's not perforced.
The CustomConfig folder will be perforced I think, so we'll need to perfroce edit/revert wrap before editing in this case.
More generally, beware that we're not editing something from the CustomConfig folder somewhere else in the packaging code without the perforce wrap.
There was a problem hiding this comment.
Duplicate of #95 (comment)?
phisko
force-pushed
the
u/nph/TECH-4324
branch
from
9f29193
to
2c55941
Compare
No description provided.