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

17 files changed, 48 insertions, 146 deletions

diff --git a/ChangeLog b/ChangeLog
index 989bb8a3..005eb45b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+Mon Jun 30 17:35:25 UTC 2014  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/pin_base.mpb:
+        * config/pintool.mpb:
+        * config/winapp.mpb:
+        * config/wireshark.mpb:
+        * docs/README:
+        * docs/USAGE:
+        * modules/VC14ProjectCreator.pm:
+        * modules/VC14WorkspaceCreator.pm:
+
+          Removed references to vc13.
+
+        * modules/VC13ProjectCreator.pm:
+        * modules/VC13WorkspaceCreator.pm:
+        * templates/vc13dll.mpt:
+        * templates/vc13exe.mpt:
+        * templates/vc13lib.mpt:
+        * templates/vc13libexe.mpt:
+        * templates/vc13platforms.mpt:
+
+          Removed these files.  It turned out that vc13 was redundant and is
+          covered by vc12.
+
+        * modules/ProjectCreator.pm:
+
+          Fixed a bug in the handling of the dependency attribute of the
+          'after' keyword.
+
 Mon Jun 30 12:28:49 UTC 2014  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/VC8WorkspaceCreator.pm:
diff --git a/config/pin_base.mpb b/config/pin_base.mpb
index 9ed92747..f1d58222 100644
--- a/config/pin_base.mpb
+++ b/config/pin_base.mpb
@@ -16,7 +16,7 @@ project {
 
   }
 
-  specific (vc10, vc11, vc12, vc13, vc14) {
+  specific (vc10, vc11, vc12, vc14) {
     runtime_library = MultiThreaded
     ImageHasSafeExceptionHandlers = false
 
diff --git a/config/pintool.mpb b/config/pintool.mpb
index 04b8567e..65a01390 100644
--- a/config/pintool.mpb
+++ b/config/pintool.mpb
@@ -43,7 +43,7 @@ feature (ia32) {
     link_options += /ENTRY:Ptrace_DllMainCRTStartup@12
   }
 
-  specific (vc10, vc11, vc12, vc13, vc14) {
+  specific (vc10, vc11, vc12, vc14) {
     EntryPointSymbol = Ptrace_DllMainCRTStartup@12
   }
 }
@@ -53,7 +53,7 @@ feature (intel64) {
     link_options += /ENTRY:Ptrace_DllMainCRTStartup
   }
 
-  specific (vc10, vc11, vc12, vc13, vc14) {
+  specific (vc10, vc11, vc12, vc14) {
     EntryPointSymbol = Ptrace_DllMainCRTStartup
   }
 }
diff --git a/config/winapp.mpb b/config/winapp.mpb
index 9fc36863..5807754d 100644
--- a/config/winapp.mpb
+++ b/config/winapp.mpb
@@ -7,7 +7,7 @@ project {
   } else {
     subsystem = 2
   }
-  specific(vc10, vc11, vc12, vc13, vc14) {
+  specific(vc10, vc11, vc12, vc14) {
     subsystem = Windows
   }
 }
diff --git a/config/wireshark.mpb b/config/wireshark.mpb
index fe45d1af..4a69df98 100644
--- a/config/wireshark.mpb
+++ b/config/wireshark.mpb
@@ -18,7 +18,7 @@ project : glib {
   specific(vc9) {
     macros      += MSC_VER_REQUIRED=1500
   }
-  specific(vc10, vc11, vc12, vc13, vc14) {
+  specific(vc10, vc11, vc12, vc14) {
     macros      += MSC_VER_REQUIRED=1600
   }
   verbatim(nmake, top) {
diff --git a/docs/README b/docs/README
index 3c59347b..b3bfe950 100644
--- a/docs/README
+++ b/docs/README
@@ -355,7 +355,6 @@ specific        This scope allows assignments that are specific to a
                 vc10     |         |      |     X     |    X    |
                 vc11     |         |      |     X     |    X    |
                 vc12     |         |      |     X     |    X    |
-                vc13     |         |      |     X     |    X    |
                 vc14     |         |      |     X     |    X    |
                 wix      |         |      |           |    X    |
 
diff --git a/docs/USAGE b/docs/USAGE
index 41e9c9d3..16b2e5ba 100644
--- a/docs/USAGE
+++ b/docs/USAGE
@@ -25,8 +25,8 @@ Usage: mwc.pl [-global <file>] [-include <directory>] [-recurse]
               [-language <cplusplus | csharp | java | vb>]
               [-type <automake | bcb2007 | bcb2009 | bds4 | bmake | cc | cdt6 |
                       cdt7 | em3 | ghs | html | make | nmake | rpmspec | sle |
-                      vc6 | vc7 | vc8 | vc9 | vc10 | vc11 | vc12 | vc13 |
-                      vc14 | vc71 | wb26 | wb30 | wix>]
+                      vc6 | vc7 | vc8 | vc9 | vc10 | vc11 | vc12 | vc14 |
+                      vc71 | wb26 | wb30 | wix>]
               [files]
 
        -base           Add <project> as a base project to each generated
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
diff --git a/templates/vc13dll.mpt b/templates/vc13dll.mpt
deleted file mode 100644
index 06db9dc1..00000000
--- a/templates/vc13dll.mpt
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-conditional_include "vc13platforms"
-conditional_include "vc1xdll"
-conditional_include "user_vc13dll"
diff --git a/templates/vc13exe.mpt b/templates/vc13exe.mpt
deleted file mode 100644
index 10a6a1a5..00000000
--- a/templates/vc13exe.mpt
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-conditional_include "vc13platforms"
-conditional_include "vc1xexe"
-conditional_include "user_vc13exe"
diff --git a/templates/vc13lib.mpt b/templates/vc13lib.mpt
deleted file mode 100644
index a76a0fa4..00000000
--- a/templates/vc13lib.mpt
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-conditional_include "vc13platforms"
-conditional_include "vc1xlib"
-conditional_include "user_vc13lib"
diff --git a/templates/vc13libexe.mpt b/templates/vc13libexe.mpt
deleted file mode 100644
index 0fd24a9d..00000000
--- a/templates/vc13libexe.mpt
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-conditional_include "vc13platforms"
-conditional_include "vc1xlibexe"
-conditional_include "user_vc13rlibexe"
diff --git a/templates/vc13platforms.mpt b/templates/vc13platforms.mpt
deleted file mode 100644
index 59b0d05b..00000000
--- a/templates/vc13platforms.mpt
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- MPC -*-
-// $Id$
-//
-conditional_include "vc12platforms"