ChangeLogTag: Fri Jul 18 16:03:52 UTC 2008 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 30 insertions, 28 deletions

diff --git a/modules/BDS4WorkspaceCreator.pm b/modules/BDS4WorkspaceCreator.pm
index d6e8d49f..b4ce3d4d 100644
--- a/modules/BDS4WorkspaceCreator.pm
+++ b/modules/BDS4WorkspaceCreator.pm
@@ -24,29 +24,31 @@ use vars qw(@ISA);
 # ************************************************************
 
 sub crlf {
-  #my($self) = shift;
+  #my $self = shift;
   return "\n";
 }
 
 
 sub compare_output {
-  #my($self) = shift;
+  #my $self = shift;
   return 1;
 }
 
 
 sub workspace_file_extension {
-  #my($self) = shift;
+  #my $self = shift;
   return '.bdsgroup';
 }
 
 
 sub pre_workspace {
-  my($self) = shift;
-  my($fh)   = shift;
-  my($crlf) = $self->crlf();
+  my($self, $fh) = @_;
+  my $crlf = $self->crlf();
 
+  ## This identifies it as a Borland Developer Studio 2006 file
   print $fh '<?xml version="1.0" encoding="utf-8"?>', $crlf;
+
+  ## Optionally print the workspace comment
   $self->print_workspace_comment($fh,
             '<!-- $Id$ -->', $crlf,
             '<!-- MPC Command -->', $crlf,
@@ -56,31 +58,31 @@ sub pre_workspace {
 
 
 sub write_comps {
-  my($self) = shift;
-  my($fh)   = shift;
-  my($crlf) = $self->crlf();
-
-  print $fh '<BorlandProject>', $crlf;
-  print $fh '  <PersonalityInfo>', $crlf;
-  print $fh '    <Option>', $crlf;
-  print $fh '      <Option Name="Personality">Default.Personality</Option>', $crlf;
-  print $fh '      <Option Name="ProjectType"></Option>', $crlf;
-  print $fh '      <Option Name="Version">1.0</Option>', $crlf;
-  print $fh '      <Option Name="GUID">{93D77FAD-C603-4FB1-95AB-34E0B6FBF615}</Option>', $crlf;
-  print $fh '    </Option>', $crlf;
-  print $fh '  </PersonalityInfo>', $crlf;
-  print $fh '  <Default.Personality>', $crlf;
-  print $fh '    ', $crlf;
-  print $fh '    <Projects>', $crlf;
-
+  my($self, $fh) = @_;
+  my $crlf = $self->crlf();
+
+  ## Print out the guid and the personality information
+  print $fh '<BorlandProject>', $crlf,
+            '  <PersonalityInfo>', $crlf,
+            '    <Option>', $crlf,
+            '      <Option Name="Personality">Default.Personality</Option>', $crlf,
+            '      <Option Name="ProjectType"></Option>', $crlf,
+            '      <Option Name="Version">1.0</Option>', $crlf,
+            '      <Option Name="GUID">{93D77FAD-C603-4FB1-95AB-34E0B6FBF615}</Option>', $crlf,
+            '    </Option>', $crlf,
+            '  </PersonalityInfo>', $crlf,
+            '  <Default.Personality>', $crlf,
+            '    <Projects>', $crlf;
+
+  ## Print out the projects in the correct build order
   foreach my $project ($self->sort_dependencies($self->get_projects(), 0)) {
-    print $fh '      <Projects Name="$project">$project</Projects>', $crlf,
+    print $fh '      <Projects Name="$project">$project</Projects>', $crlf;
   }
 
-  print $fh '    </Projects>', $crlf;
-  print $fh '    <Dependencies/>', $crlf;
-  print $fh '  </Default.Personality>', $crlf;
-  print $fh '</BorlandProject>', $crlf;
+  print $fh '    </Projects>', $crlf,
+            '    <Dependencies/>', $crlf,
+            '  </Default.Personality>', $crlf,
+            '</BorlandProject>', $crlf;
 }