diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-08-27 11:46:54 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-08-27 11:46:54 +0000 |
| commit | 3299fdd5572d02dcabcc7c746779dce6f007e1c6 (patch) | |
| tree | 7ebc37db75c3011a2568dc489b2fab2f2ea020c8 | |
| parent | 438bc148fbc462229020c4f2aeb08b58d6064840 (diff) | |
| download | ATCD-3299fdd5572d02dcabcc7c746779dce6f007e1c6.tar.gz | |
ChangeLogTag: Tue Aug 27 06:45:58 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/ProjectCreator.pm | 24 |
3 files changed, 32 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 5d84ccae911..346bcebbe31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Aug 27 06:45:58 2002 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/ProjectCreator.pm: + + Fixed a problem where .i and .h files would be added even if they + didn't exist. + Tue Aug 27 10:09:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> * etc/tao_dynamicany.doxygen: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 5d84ccae911..346bcebbe31 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Tue Aug 27 06:45:58 2002 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/ProjectCreator.pm: + + Fixed a problem where .i and .h files would be added even if they + didn't exist. + Tue Aug 27 10:09:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> * etc/tao_dynamicany.doxygen: diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm index f66b5c04eea..4448aa27068 100644 --- a/bin/MakeProjectCreator/modules/ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm @@ -901,6 +901,13 @@ sub add_source_corresponding_component_files { } } + ## We need to cross-check the idl files. But we need to remove + ## the idl extension first. + my(@idl) = $self->get_component_list('idl_files'); + for(my $i = 0; $i <= $#idl; $i++) { + $idl[$i] =~ s/\.idl$//; + } + ## for each cpp file, we add a corresponding header or inline file ## if it exists and is not already in the list of headers my($names) = $self->{$tag}; @@ -943,13 +950,18 @@ sub add_source_corresponding_component_files { ## we must check to see if the file *would be* generated ## from idl. If so, we will add the file with the default ## (i.e. first) file extension. - foreach my $ending (@{$self->{'skeleton_endings'}}) { - if ($c =~ /$ending$/) { - my($ext) = $$vc{$tag}->[0]; - $ext =~ s/\\//g; - push(@$array, "$c$ext"); - last; + foreach my $idl (@idl) { + if ($c =~ /^$idl/) { + foreach my $ending (@{$self->{'skeleton_endings'}}) { + if ($c =~ /^$idl$ending$/) { + my($ext) = $$vc{$tag}->[0]; + $ext =~ s/\\//g; + push(@$array, "$c$ext"); + last; + } + } } + last; } } } |