ChangeLogTag: Wed Apr 9 11:50:27 UTC 2008 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 28 insertions, 1 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8abc2f521e5..5cb2ebbdf34 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,14 @@
+Wed Apr  9 11:50:27 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm:
+
+          Added a need_to_write_project override method to only allow the
+          project file to be written if it is an executable project.
+
+        * bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm:
+
+          Fixed a bug where an invalid base module was used in the @ISA.
+
 Wed Apr  9 11:41:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_2980_Regression_Test.cpp:
diff --git a/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm
index 43e9fccfcbb..585021006a9 100644
--- a/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm
+++ b/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm
@@ -37,4 +37,20 @@ sub get_template {
   return 'vxtest';
 }
 
+sub need_to_write_project {
+  my $self = shift;
+
+  ## We only want to return 1 if the project has source files and isn't a
+  ## custom-only project.  We have to check for custom_only because
+  ## non-custom related project settings are only removed after calling
+  ## need_to_write_project().
+  if (!$self->get_assignment('custom_only') &&
+      $self->SUPER::need_to_write_project() == 1) {
+    ## We only want to return 1 if this is an executable project
+    return 1 if ($self->exe_target());
+  }
+
+  return 0;
+}
+
 1;
diff --git a/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm
index cc250e56558..6421ae3858f 100644
--- a/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm
+++ b/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm
@@ -16,7 +16,7 @@ use VXTestProjectCreator;
 use WorkspaceCreator;
 
 use vars qw(@ISA);
-@ISA = qw(WorkspaceBase WorkspaceCreator);
+@ISA = qw(WorkspaceCreator);
 
 # ************************************************************
 # Subroutine Section