diff options
| author | Chad Elliott <elliottc@objectcomputing.com> | 2022-10-12 10:08:05 -0500 |
|---|---|---|
| committer | Chad Elliott <elliottc@objectcomputing.com> | 2022-10-12 10:08:05 -0500 |
| commit | b1c558fb74f21c9da63c84e6b116dbbb7bbeb02c (patch) | |
| tree | 03aae6691d34dc5183646964928a1c2445059237 /modules | |
| parent | 56c19e2f626ecaee103d146b32f5ab4ad6d1086a (diff) | |
| download | MPC-b1c558fb74f21c9da63c84e6b116dbbb7bbeb02c.tar.gz | |
Added a 'type' to the combined custom command structure.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ProjectCreator.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index 6dd1d2fe..d1bdbb50 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -4674,14 +4674,15 @@ sub get_custom_value { } elsif ($cmd eq 'commands') { # only used with 'combined_custom' $value = []; - my %details = ('flags' => 'commandflags', + my %details = ('flags' => 'commandflags', 'outopt' => 'output_option', - 'gdir' => 'gendir'); + 'gdir' => 'gendir'); for my $tag (@{$self->{'custom_multi_cmd'}->{$based}}) { my $command = $self->get_custom_assign_or_override('command', $tag, $based, @params); push(@$value, $command); - my $det = $self->{'custom_multi_details'}->{$command} = {}; + my $det = $self->{'custom_multi_details'}->{$command} = {'type' => $tag, + 'outfile' => ''}; for my $k (keys %details) { $det->{$k} = $self->get_custom_assign_or_override($details{$k}, $tag, $based, @params); @@ -4704,10 +4705,9 @@ sub get_custom_value { } } } - elsif ($cmd eq 'flags' || $cmd eq 'outopt' || $cmd eq 'outfile' || - $cmd eq 'gdir') { + elsif (exists $self->{'custom_multi_details'}->{$based}->{$cmd}) { # only used with 'combined_custom' - $value = $self->{'custom_multi_details'}->{$based}->{$cmd} || ''; + $value = $self->{'custom_multi_details'}->{$based}->{$cmd}; } elsif (defined $customDefined{$cmd}) { $value = $self->get_assignment($cmd, |