From 540fdbd421a8101868c5f718b2a1c9d952dd4350 Mon Sep 17 00:00:00 2001 From: elliott_c Date: Fri, 23 Jan 2004 20:07:53 +0000 Subject: ChangeLogTag: Fri Jan 23 14:04:31 2004 Chad Elliott --- ChangeLog | 26 ++++++++++++++++++------ bin/MakeProjectCreator/README | 16 +++++++-------- bin/MakeProjectCreator/modules/ProjectCreator.pm | 10 ++------- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e5cc9cecbd..7b59eb5397a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,23 @@ +Fri Jan 23 14:04:31 2004 Chad Elliott + + * bin/MakeProjectCreator/README: + * bin/MakeProjectCreator/modules/ProjectCreator.pm: + + Changed the defaulting rules for implicitly adding source files + when IDL_Files (or any other custom type) is specified. + Previously, generated source files would only be added to the + Source_Files section only if IDL_Files was not specified and no + generated source files were already listed in Source_Files. Now, + the generated source files will be added whether or not IDL_Files + is specified and no generated source files were already listed in + Source_Files. + Fri Jan 23 19:09:43 UTC 2004 Johnny Willemsen - * ace/OS_NS_string.cpp: - With CBuilderX Preview strdup is in the std namespace, so - added ACE_STD_NAMESPACE which expands to std with Borland, - to nothing with other compilers. + * ace/OS_NS_string.cpp: + With CBuilderX Preview strdup is in the std namespace, so + added ACE_STD_NAMESPACE which expands to std with Borland, + to nothing with other compilers. Fri Jan 23 10:04:00 2004 Gary Maxey @@ -24,7 +38,7 @@ Fri Jan 23 09:49:00 2004 Gary Maxey Fix for BUGID 1708 Added #elif in ACE_OS::sigwait to use alternate sigwait() when - compiling for Tandem NSK platform. + compiling for Tandem NSK platform. Fri Jan 23 09:34:00 2004 Gary Maxey @@ -33,7 +47,7 @@ Fri Jan 23 09:34:00 2004 Gary Maxey Fix for BUGID 1709 Added #ifdef to use alternate select() when compiling for Tandem - NSK platform. + NSK platform. Fri Jan 23 10:30:12 2004 Chad Elliott diff --git a/bin/MakeProjectCreator/README b/bin/MakeProjectCreator/README index e9826c49a81..bc3988cdbad 100644 --- a/bin/MakeProjectCreator/README +++ b/bin/MakeProjectCreator/README @@ -425,14 +425,14 @@ Defaulting Behavior all of the files in the directory will be added to the corresponding list by extension -3) If idl files exist in the directory and - the IDL_Files components are left defaulted (i.e. not listed) and - none of the idl generated files are listed in the corresponding lists - - the project is assumed to be a TAO project, the idl files are added to - the IDL_Files list and all of the (would be) generated files will be - added to the front of the corresponding lists (source, inline and - header lists) +3) If custom files (ex. idl files) exist in the directory and + the custom files components (ex. IDL_Files) are left defaulted (i.e. not + listed) or the custom files components are specified and none of the + custom generated files are listed in the corresponding lists + + the custom files are added to the custom files component list if the + weren't specified and all of the (would be) generated files will be added + to the front of the corresponding lists (source, inline and header lists) 4) If files are listed in the Source_Files list and a corresponding header or inline file exists diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm index 116e4ab7667..07671d1f243 100644 --- a/bin/MakeProjectCreator/modules/ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm @@ -1477,12 +1477,7 @@ sub generate_default_components { if (!$self->is_special_tag($tag)) { $self->sift_files($files, $exts, $pchh, $pchc, $tag, $array); - if (defined $self->{'generated_exts'}->{$tag}) { - if (defined $$array[0]) { - $self->{'defaulted'}->{$tag} = 1; - } - } - elsif ($tag eq 'source_files') { + if ($tag eq 'source_files') { foreach my $gentype (keys %{$self->{'generated_exts'}}) { ## If we are auto-generating the source_files, then ## we need to make sure that any generated source @@ -1607,8 +1602,7 @@ sub list_default_generated { my($gentype) = shift; my($tags) = shift; - if ($self->{'defaulted'}->{$gentype} && - $self->{'generated_exts'}->{$gentype}->{'automatic'}) { + if ($self->{'generated_exts'}->{$gentype}->{'automatic'}) { ## After all source and headers have been defaulted, see if we ## need to add the generated .h, .i and .cpp files if (defined $self->{$gentype}) { -- cgit v1.2.1