ChangeLogTag: Mon Jun 30 17:35:25 UTC 2014 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 12 insertions, 110 deletions

diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 29d8bbeb..137f092b 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -473,7 +473,14 @@ sub process_assignment {
       ## added.  This function will be called for each one, so we only
       ## need to handle one at a time.
       if ($value =~ s/(\s*([^:]+)):([^\s]+)/$1/) {
-        $self->{'dependency_attributes'}->{$2} = $3;
+        ## The value may contain multiple projects.  But, only one
+        ## dependency attribute will be present at any time.  So, once we
+        ## get here, we need to remove any of the other projects from the
+        ## front of the key string.
+        my $key = $2;
+        my $value = $3;
+        $key =~ s/.*\s+//;
+        $self->{'dependency_attributes'}->{$key} = $value;
       }
 
       ## Check the after value and warn the user in the event that it
diff --git a/modules/VC13ProjectCreator.pm b/modules/VC13ProjectCreator.pm
deleted file mode 100644
index ca3662be..00000000
--- a/modules/VC13ProjectCreator.pm
+++ /dev/null
@@ -1,61 +0,0 @@
-package VC13ProjectCreator;
-
-# ************************************************************
-# Description   : A VC13 Project Creator
-# Author        : Chad Elliott
-# Create Date   : 6/26/2014
-# $Id$
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-
-use VC12ProjectCreator;
-
-use vars qw(@ISA);
-@ISA = qw(VC12ProjectCreator);
-
-## NOTE: We call the constant as a function to support Perl 5.6.
-my %info = (Creator::cplusplus() => {'ext'      => '.vcxproj',
-                                     'dllexe'   => 'vc13exe',
-                                     'libexe'   => 'vc13libexe',
-                                     'dll'      => 'vc13dll',
-                                     'lib'      => 'vc13lib',
-                                     'template' => [ 'vc10', 'vc10filters' ],
-                                    },
-           );
-
-my %config = ('vcversion' => '13.00',
-              'toolsversion' => '12.0',
-              'targetframeworkversion' => '4.5',
-              'prefer32bit' => 'false'
-             );
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub get_info_hash {
-  my($self, $key) = @_;
-
-  ## If we have the setting in our information map, then use it.
-  return $info{$key} if (defined $info{$key});
-
-  ## Otherwise, see if our parent type can take care of it.
-  return $self->SUPER::get_info_hash($key);
-}
-
-sub get_configurable {
-  my($self, $name) = @_;
-
-  ## If we have the setting in our config map, then use it.
-  return $config{$name} if (defined $config{$name});
-
-  ## Otherwise, see if our parent type can take care of it.
-  return $self->SUPER::get_configurable($name);
-}
-
-1;
diff --git a/modules/VC13WorkspaceCreator.pm b/modules/VC13WorkspaceCreator.pm
deleted file mode 100644
index 2e1b45cd..00000000
--- a/modules/VC13WorkspaceCreator.pm
+++ /dev/null
@@ -1,44 +0,0 @@
-package VC13WorkspaceCreator;
-
-# ************************************************************
-# Description   : A VC13 Workspace Creator
-# Author        : Chad Elliott
-# Create Date   : 6/26/2014
-# $Id$
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-
-use VC13ProjectCreator;
-use VC12WorkspaceCreator;
-
-use vars qw(@ISA);
-@ISA = qw(VC12WorkspaceCreator);
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub pre_workspace {
-  my($self, $fh) = @_;
-  my $crlf = $self->crlf();
-
-  print $fh '', $crlf,
-            'Microsoft Visual Studio Solution File, Format Version 12.00', $crlf;
-  $self->print_workspace_comment($fh,
-            '# Visual Studio 2013', $crlf,
-            '# $Id$', $crlf,
-            '#', $crlf,
-            '# This file was generated by MPC.  Any changes made directly to', $crlf,
-            '# this file will be lost the next time it is generated.', $crlf,
-            '#', $crlf,
-            '# MPC Command:', $crlf,
-            '# ', $self->create_command_line_string($0, @ARGV), $crlf);
-}
-
-
-1;
diff --git a/modules/VC14ProjectCreator.pm b/modules/VC14ProjectCreator.pm
index a400597c..34da793a 100644
--- a/modules/VC14ProjectCreator.pm
+++ b/modules/VC14ProjectCreator.pm
@@ -13,10 +13,10 @@ package VC14ProjectCreator;
 
 use strict;
 
-use VC13ProjectCreator;
+use VC12ProjectCreator;
 
 use vars qw(@ISA);
-@ISA = qw(VC13ProjectCreator);
+@ISA = qw(VC12ProjectCreator);
 
 ## NOTE: We call the constant as a function to support Perl 5.6.
 my %info = (Creator::cplusplus() => {'ext'      => '.vcxproj',
diff --git a/modules/VC14WorkspaceCreator.pm b/modules/VC14WorkspaceCreator.pm
index 2476766c..ffb74dd5 100644
--- a/modules/VC14WorkspaceCreator.pm
+++ b/modules/VC14WorkspaceCreator.pm
@@ -14,10 +14,10 @@ package VC14WorkspaceCreator;
 use strict;
 
 use VC14ProjectCreator;
-use VC13WorkspaceCreator;
+use VC12WorkspaceCreator;
 
 use vars qw(@ISA);
-@ISA = qw(VC13WorkspaceCreator);
+@ISA = qw(VC12WorkspaceCreator);
 
 # ************************************************************
 # Subroutine Section