summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2003-05-14 19:11:18 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2003-05-14 19:11:18 +0000
commit9711605e8e53616e8e965217a9c599c716a20c56 (patch)
treebbb8e7956177b5ecee6efd75e64c172733d8ad58
parentc52c01015c4e826f2e2c5bd696d206ccabf0af83 (diff)
downloadATCD-9711605e8e53616e8e965217a9c599c716a20c56.tar.gz
ChangeLogTag: Wed May 14 14:09:56 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog8
-rw-r--r--bin/MakeProjectCreator/modules/ProjectCreator.pm23
2 files changed, 19 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 27584b749ad..ecbab746a80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed May 14 14:09:56 2003 Chad Elliott <elliott_c@ociweb.com>
+
+ * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+ Fixed a bug with custom types when processing multiple mpc files
+ that use a custom type. The type definitions were not being
+ removed after processing.
+
Wed May 14 13:52:37 2003 Chad Elliott <elliott_c@ociweb.com>
* bin/MakeProjectCreator/README:
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index 4d0fd0950a9..1700cb6d29b 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -1890,19 +1890,18 @@ sub reset_values {
sub reset_generating_types {
- my($self) = shift;
+ my($self) = shift;
+ my(%reset) = ('matching_assignments' => \%ma,
+ 'valid_components' => \%vc,
+ 'generated_exts' => \%genext,
+ 'exclude_components' => \%ec,
+ );
- foreach my $key (keys %ma) {
- $self->{'matching_assignments'}->{$key} = $ma{$key};
- }
- foreach my $key (keys %vc) {
- $self->{'valid_components'}->{$key} = $vc{$key};
- }
- foreach my $key (keys %genext) {
- $self->{'generated_exts'}->{$key} = $genext{$key};
- }
- foreach my $key (keys %ec) {
- $self->{'exclude_components'}->{$key} = $ec{$key};
+ foreach my $r (keys %reset) {
+ $self->{$r} = {};
+ foreach my $key (keys %{$reset{$r}}) {
+ $self->{$r}->{$key} = $reset{$r}->{$key};
+ }
}
$self->{'custom_types'} = {};