ChangeLogTag: Fri May 16 11:15:53 2003 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 29 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 74a7beccf98..a8b61c8be8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+Fri May 16 11:15:53 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/README:
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+          Added a new keyword for custom definitions.  If the file type
+          generated by the command doesn't belong to source, inline, header,
+          resource or documentation, then use generic_outputext.
+
 Thu May 15 09:32:01 2003  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/Configuration_Import_Export.cpp (import_config): Fixed a memory
-	  leak where the "data" buffer wasn't being deleted.  Thanks to
- 	  Roland Meub <Roland.Meub@tenovis.com> for reporting this.
+        * ace/Configuration_Import_Export.cpp (import_config): Fixed a memory
+          leak where the "data" buffer wasn't being deleted.  Thanks to
+          Roland Meub <Roland.Meub@tenovis.com> for reporting this.
 
 Thu May 15 10:41:32 2003  Chad Elliott  <elliott_c@ociweb.com>
 
@@ -2338,9 +2347,9 @@ Tue Apr 15 16:06:24 2003  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
         * ace/Timer_Wheel_T.cpp: Removed the use of a namespace since
           this breaks certain compilers that don't support namespaces
-	  (e.g., GCC 2.7-97 on LynxOS and SunC++ with the compat4=1
-	  options).  Thanks to Olli Savia <ops@iki.fi> and 
-	  Craig Watcham <craigw@ananzi.co.za> for reporting this problem.
+          (e.g., GCC 2.7-97 on LynxOS and SunC++ with the compat4=1
+          options).  Thanks to Olli Savia <ops@iki.fi> and
+          Craig Watcham <craigw@ananzi.co.za> for reporting this problem.
 
         * ace/OS.h: Make sure that things don't go awry on platforms
           where clearerr is defined as a macro.  Thanks to Olli Savia
diff --git a/bin/MakeProjectCreator/README b/bin/MakeProjectCreator/README
index 3dd96ccb5b2..f5e59d075c7 100644
--- a/bin/MakeProjectCreator/README
+++ b/bin/MakeProjectCreator/README
@@ -221,6 +221,9 @@ documenation_outputext  This is a comma separated list of possible
                         documentation file output extensions.  If the
                         command does not produce documenation files, then
                         this can be omitted.
+generic_outputext   If the command does not generate any of the other output
+                    types listed above, then the extensions should be listed
+                    under this.
 
 For custom file types, there are two keywords that can be used within the
 custom file type input lists: commandflags and gendir.  The commandflags can
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index 1b631b4d476..9e19628cf78 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -78,6 +78,7 @@ my(%customDefined) = ('automatic'               => 1,
                       'inline_outputext'        => 1,
                       'documentation_outputext' => 1,
                       'resource_outputext'      => 1,
+                      'generic_outputext'       => 1,
                      );
 
 ## Custom sections as well as definitions
@@ -1669,12 +1670,13 @@ sub get_custom_value {
   my($value) = undef;
 
   if ($cmd eq 'input_files') {
+    my($generic) = 'generic_files';  ## Matches with generic_outputext
     my(@array) = $self->get_component_list($based);
     $value = \@array;
 
     $self->{'custom_output_files'} = {};
     my(%vcomps) = ();
-    foreach my $vc (keys %{$self->{'valid_components'}}) {
+    foreach my $vc (keys %{$self->{'valid_components'}}, $generic) {
       my(@comps) = $self->get_component_list($vc);
       $vcomps{$vc} = \@comps;
     }
@@ -1683,7 +1685,7 @@ sub get_custom_value {
       my($cinput)  = $input;
       $cinput =~ s/\.[^\.]+$//;
       foreach my $pf (@{$self->{'generated_exts'}->{$based}->{'pre_filename'}}) {
-        foreach my $vc (keys %{$self->{'valid_components'}}) {
+        foreach my $vc (keys %{$self->{'valid_components'}}, $generic) {
           push(@outputs,
                $self->check_custom_output($based, $pf,
                                           $cinput, $vc, $vcomps{$vc}));
@@ -1917,20 +1919,22 @@ sub reset_generating_types {
 sub get_template_input {
   my($self) = shift;
 
-  if ($self->lib_target()) {
+  ## This follows along the same logic as read_template_input() by
+  ## checking for exe target and then defaulting to a lib target
+  if ($self->exe_target()) {
     if ($self->{'writing_type'} == 1) {
-      return $self->{'lib_template_input'};
+      return $self->{'lexe_template_input'};
     }
     else {
-      return $self->{'dll_template_input'};
+      return $self->{'dexe_template_input'};
     }
   }
 
   if ($self->{'writing_type'} == 1) {
-    return $self->{'lexe_template_input'};
+    return $self->{'lib_template_input'};
   }
   else {
-    return $self->{'dexe_template_input'};
+    return $self->{'dll_template_input'};
   }
 }