revert the earlier change of using the -into dir for the projects.lst file, it was not correct; in add_dependencies need to account for -into here to edit the .project and .wrproject files

2 files changed, 6 insertions, 5 deletions

diff --git a/modules/CDT6WorkspaceCreator.pm b/modules/CDT6WorkspaceCreator.pm
index 066d183a..f7a31537 100644
--- a/modules/CDT6WorkspaceCreator.pm
+++ b/modules/CDT6WorkspaceCreator.pm
@@ -66,10 +66,9 @@ sub write_comps {
   my $crlf = $self->crlf();
   $self->{'seen_deps'} = {};
 
-  my $prefix = ($self->{'into'} ne '') ? $self->{'into'} . '/' : '';
   foreach my $project ($self->sort_dependencies($self->get_projects(), 0)) {
     print $fh "$$info{$project}->[0] ",
-      Cwd::abs_path($prefix . $self->mpc_dirname($project)), '/.project', $crlf;
+      Cwd::abs_path($self->mpc_dirname($project)), '/.project', $crlf;
     $self->add_dependencies($creator, $project);
   }
 }
@@ -77,6 +76,8 @@ sub write_comps {
 sub add_dependencies {
   my($self, $creator, $proj) = @_;
   my $outdir = $self->mpc_dirname($proj);
+  my $into = $self->get_outdir();
+  $outdir = "$into/$outdir" if $into ne '.';
 
   my $pre     = '    <project>';
   my $post    = '</project>';
diff --git a/modules/WB26WorkspaceCreator.pm b/modules/WB26WorkspaceCreator.pm
index 5ae4c2d1..bc3a5cae 100644
--- a/modules/WB26WorkspaceCreator.pm
+++ b/modules/WB26WorkspaceCreator.pm
@@ -134,16 +134,16 @@ sub list_file_body {
             '#----------------------------------------------------------------------------', $crlf);
 
   ## Print out each target separately
-  my $prefix = ($self->{'into'} ne '') ? $self->{'into'} . '/' : '';
   foreach my $project ($self->sort_dependencies($self->get_projects(), 0)) {
-    print $fh Cwd::abs_path($prefix . $self->mpc_dirname($project)),
-      '/.project', $crlf;
+    print $fh Cwd::abs_path($self->mpc_dirname($project)), '/.project', $crlf;
   }
 }
 
 sub add_dependencies {
   my($self, $creator, $proj) = @_;
   my $outdir = $self->mpc_dirname($proj);
+  my $into = $self->get_outdir();
+  $outdir = "$into/$outdir" if $into ne '.';
   my $proj_pre = $self->get_project_prefix();
 
   ## These values will be changed after the first time through the for