ChangeLogTag: Wed Aug 12 22:29:21 UTC 2009 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 15 insertions, 29 deletions

diff --git a/modules/WixWorkspaceCreator.pm b/modules/WixWorkspaceCreator.pm
index 256186b2..60f42b39 100644
--- a/modules/WixWorkspaceCreator.pm
+++ b/modules/WixWorkspaceCreator.pm
@@ -31,16 +31,15 @@ sub workspace_file_extension {
 }
 
 sub workspace_file_name {
-  my($self) = shift;
-  my($name) = $self->get_workspace_name();
-
-  return $self->get_modified_workspace_name($name, '.wxi');
+  my $self = shift;
+  return $self->get_modified_workspace_name($self->get_workspace_name(),
+                                            '.wxi');
 }
 
 sub pre_workspace {
   my($self, $fh) = @_;
-  my($crlf) = $self->crlf();
-  my($name) = $self->get_workspace_name();
+  my $crlf = $self->crlf();
+  my $name = $self->get_workspace_name();
 
   ## Begin the project definition for the workspace
   print $fh '<?xml version="1.0" encoding="utf-8" standalone="yes"?>', $crlf,
@@ -48,37 +47,30 @@ sub pre_workspace {
 }
 
 sub write_comps {
-  my($self)     = shift;
-  my($fh)       = shift;
-  my($projects) = $self->get_projects();
-  my(@list)     = $self->sort_dependencies($projects);
-  my($crlf)     = $self->crlf();
+  my($self, $fh) = @_;
+  my $crlf = $self->crlf();
 
 
   # print the target for clean
-  foreach my $project (@list) {
+  foreach my $project ($self->sort_dependencies($self->get_projects())) {
     print $fh "  <?include $project ?>", $crlf;
   }
 }
 
 sub post_workspace {
   my($self, $fh) = @_;
-  my($projects)  = $self->get_projects();
-  my($info)      = $self->get_project_info();
-  my(@list)      = $self->sort_dependencies($projects);
-  my($crlf)      = $self->crlf();
-  my($wname)      = $self->get_workspace_name();
+  my $info = $self->get_project_info();
+  my $crlf = $self->crlf();
 
   # Create a component group consisting of all the projects.
   print $fh $crlf,
             '  <Fragment>', $crlf,
-            '    <ComponentGroup Id="', $wname, '">', $crlf;
-
-  foreach my $project (@list) {
-    my($pname, $rawdeps, $guid, $language, $custom_only, $nocross, @cfgs) = @{$$info{$project}};
-    my($name, $proj) = $self->adjust_names($pname, $project, $language);
+            '    <ComponentGroup Id="',
+            $self->get_workspace_name(), '">', $crlf;
 
-    print $fh '      <ComponentRef Id="', $name, '" />', $crlf;
+  foreach my $project ($self->sort_dependencies($self->get_projects())) {
+    print $fh '      <ComponentRef Id="',
+              $$info{$project}->[0], '" />', $crlf;
   }
 
   print $fh '    </ComponentGroup>', $crlf,
@@ -86,10 +78,4 @@ sub post_workspace {
             '</Include>', $crlf;
 }
 
-sub adjust_names {
-  my($self, $name, $proj, $lang) = @_;
-  $proj =~ s/\//\\/g;
-  return $name, $proj;
-}
-
 1;