ChangeLogTag: Mon Apr 7 12:27:25 2003 Chad Elliott <elliott_c@ociweb.com>

20 files changed, 453 insertions, 48 deletions

diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index 9b1c642f..5801367d 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -189,24 +189,26 @@ sub adjust_value {
 sub set_current_values {
   my($self) = shift;
   my($name) = shift;
+  my($set)  = 0;
 
   ## If any value within a foreach matches the name
   ## of a hash table within the template input we will
   ## set the values of that hash table in the current scope
-  my($ti) = $self->{'ti'};
-  if (defined $ti) {
+  if (defined $self->{'ti'}) {
     my($counter) = $self->{'foreach'}->{'count'};
     if ($counter >= 0) {
-      my($value) = $ti->get_value($name);
+      my($value) = $self->{'ti'}->get_value($name);
       if (defined $value && UNIVERSAL::isa($value, 'HASH')) {
         my(%copy) = ();
         foreach my $key (keys %$value) {
           $copy{$key} = $self->adjust_value($key, $$value{$key});
         }
         $self->{'foreach'}->{'temp_scope'}->[$counter] = \%copy;
+        $set = 1;
       }
     }
   }
+  return $set;
 }
 
 
@@ -359,6 +361,7 @@ sub get_value_with_default {
     }
     else {
 #      print "DEBUG: WARNING: $name using default value of $value\n";
+      $value = $self->adjust_value($name, $value);
     }
     $value = $self->relative($value);
   }
@@ -402,6 +405,23 @@ sub process_foreach {
     $$scope{'forfirst'}    = 1;
     $$scope{'fornotfirst'} = 0;
 
+    ## If the foreach values are mixed (HASH and SCALAR), then
+    ## remove the SCALAR values.
+    my($pset) = undef;
+    for(my $i = 0; $i <= $#values; ++$i) {
+      my($set) = $self->set_current_values($values[$i]);
+      if (!defined $pset) {
+        $pset |= $set;
+      }
+      else {
+        if ($pset && !$set) {
+          splice(@values, $i, 1);
+          $i = 0;
+          $pset = undef;
+        }
+      }
+    }
+
     for(my $i = 0; $i <= $#values; ++$i) {
       my($value) = $values[$i];
 
diff --git a/templates/em3.mpd b/templates/em3.mpd
index 98a38dd0..d169388d 100644
--- a/templates/em3.mpd
+++ b/templates/em3.mpd
@@ -80,7 +80,7 @@ LIB32=link.exe -lib
 <%endif%>
 
 <%endfor%>
-!ENDIF 
+!ENDIF
 <%endfor%>
 
 
@@ -191,7 +191,7 @@ SOURCE=.\<%idl_file%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> (<%platform_long%>) <%configuration%>"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
+# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
 InputPath=.\<%idl_file%>
 InputName=<%basenoextension(idl_file)%>
 InputDir=<%dirname(idl_file)%>
@@ -210,7 +210,7 @@ OutDir=.
 <%endif%>
 
 BuildCmds= \
-	<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
+	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
 
 "$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd
index 98a38dd0..d169388d 100644
--- a/templates/em3vcp.mpd
+++ b/templates/em3vcp.mpd
@@ -80,7 +80,7 @@ LIB32=link.exe -lib
 <%endif%>
 
 <%endfor%>
-!ENDIF 
+!ENDIF
 <%endfor%>
 
 
@@ -191,7 +191,7 @@ SOURCE=.\<%idl_file%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> (<%platform_long%>) <%configuration%>"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
+# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
 InputPath=.\<%idl_file%>
 InputName=<%basenoextension(idl_file)%>
 InputDir=<%dirname(idl_file)%>
@@ -210,7 +210,7 @@ OutDir=.
 <%endif%>
 
 BuildCmds= \
-	<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
+	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
 
 "$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
diff --git a/templates/em3vcpdll.mpt b/templates/em3vcpdll.mpt
index 5b1d4bf6..1527aae8 100644
--- a/templates/em3vcpdll.mpt
+++ b/templates/em3vcpdll.mpt
@@ -53,3 +53,25 @@ Debug {
   lib_modifier          = d
 }
 
+MFC Release {
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /O2 /Zi /Ob2
+  defines               = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /YX
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  lib_modifier          = mfc
+  use_mfc               = 2
+}
+
+MFC Debug {
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Zi /Od
+  defines               = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /Fr /YX
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  lib_modifier          = mfcd
+  use_mfc               = 2
+}
+
diff --git a/templates/em3vcpdllexe.mpt b/templates/em3vcpdllexe.mpt
index c274756d..1aea67d9 100644
--- a/templates/em3vcpdllexe.mpt
+++ b/templates/em3vcpdllexe.mpt
@@ -52,3 +52,25 @@ Debug {
   intermediate_dir      = Debug
   lib_modifier          = d
 }
+
+MFC Release {
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /O2 /Zi /Ob2
+  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  lib_modifier          = mfc
+  use_mfc               = 2
+}
+
+MFC Debug {
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Zi /Od
+  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  lib_modifier          = mfcd
+  use_mfc               = 2
+}
diff --git a/templates/em3vcplib.mpt b/templates/em3vcplib.mpt
index 96bd8cfd..4de6c3dd 100644
--- a/templates/em3vcplib.mpt
+++ b/templates/em3vcplib.mpt
@@ -54,3 +54,25 @@ Static Debug {
   pdb                   = 1
 }
 
+MFC Release {
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /O2 /Zi /Ob2
+  defines               = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /YX
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  lib_modifier          = mfcs
+  use_mfc               = 2
+}
+
+MFC Debug {
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Zi /Od
+  defines               = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /Fr /YX
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  lib_modifier          = mfcsd
+  pdb                   = 1
+  use_mfc               = 2
+}
diff --git a/templates/em3vcplibexe.mpt b/templates/em3vcplibexe.mpt
index 49ade6d2..750159e9 100644
--- a/templates/em3vcplibexe.mpt
+++ b/templates/em3vcplibexe.mpt
@@ -54,3 +54,25 @@ Static Debug {
   output_dir            = Static_Debug
   intermediate_dir      = Static_Debug
 }
+
+MFC Release {
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /O2 /Zi /Ob2
+  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  lib_modifier          = mfcs
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  use_mfc               = 1
+}
+
+MFC Debug {
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Zi /Od
+  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  lib_modifier          = mfcsd
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  use_mfc               = 1
+}
diff --git a/templates/make.mpd b/templates/make.mpd
index 1638c60c..90888d62 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -2,12 +2,6 @@
 #       Macros
 #----------------------------------------------------------------------------
 <%marker(top)%>
-<%if(tao)%>
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-<%endif%>
 SOEXT         = so
 MAKEFILE      = <%project_file%>
 <%if(exename)%>
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index e7d2807d..94c95686 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -4,7 +4,7 @@
 CFG=<%platform%> <%default_configuration%>
 !MESSAGE No configuration specified. Defaulting to <%platform%> <%default_configuration%>.
 <%endfor%>
-!ENDIF 
+!ENDIF
 
 !IF <%foreach(platforms)%><%foreach(configurations)%>"$(CFG)" != "<%platform%> <%configuration%>"<%fornotlast(" && ")%><%endfor%><%endfor%>
 !MESSAGE Invalid configuration "$(CFG)" specified.
@@ -24,13 +24,13 @@ CFG=<%platform%> <%default_configuration%>
 <%endfor%>
 !MESSAGE 
 !ERROR An invalid configuration is specified.
-!ENDIF 
+!ENDIF
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE 
+!ELSE
 NULL=nul
-!ENDIF 
+!ENDIF
 
 <%foreach(platforms)%>
 <%foreach(configurations)%>
@@ -96,36 +96,36 @@ REALCLEAN : CLEAN
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags("/MD /W3 /GX /O2 /Ob2")%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c 
+CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags("/MD /W3 /GX /O2 /Ob2")%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 RSC=rc.exe
@@ -170,10 +170,10 @@ LINK32_OBJS= \
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("<%noextension(project_file)%>.dep")
 !INCLUDE "<%noextension(project_file)%>.dep"
-!ELSE 
+!ELSE
 !MESSAGE Warning: cannot find "<%noextension(project_file)%>.dep"
-!ENDIF 
-!ENDIF 
+!ENDIF
+!ENDIF
 
 
 !IF <%foreach(platforms)%><%foreach(configurations)%>"$(CFG)" == "<%platform%> <%configuration%>" <%fornotlast("|| ")%><%endfor%><%endfor%>
@@ -185,7 +185,7 @@ SOURCE=.\<%pch_source%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
-CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c 
+CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines)%>/D <%define%>=1 <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%>=1 <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
 
 "$(INTDIR)\<%basenoextension(pch_source)%>.obj"	"$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -237,7 +237,7 @@ OutDir=.
 "$(OutDir)\$(InputName)C.h"	"$(OutDir)\$(InputName)C.i"	"$(OutDir)\$(InputName)C.cpp"	"$(OutDir)\$(InputName)S.h"	"$(OutDir)\$(InputName)S.i"	"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat
 	@echo off
-	<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>
+	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>
 <<
 
 <%endfor%>
@@ -254,5 +254,5 @@ SOURCE=.\<%resource_file%>
 
 <%endfor%>
 
-!ENDIF 
+!ENDIF
 
diff --git a/templates/nmakedll.mpt b/templates/nmakedll.mpt
index 385aaa1a..c7089953 100644
--- a/templates/nmakedll.mpt
+++ b/templates/nmakedll.mpt
@@ -75,3 +75,63 @@ Static Debug {
   need_libflags         = 1
 }
 
+MFC Release {
+  type_code             = 0x0102
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /GX /O2 /MD /Zi /Ob2 /GR
+  defines               = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /YX
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  lib_modifier          = mfc
+  debug_switch          =
+  type_is_dynamic       = 1
+  type_is_binary        = 1
+  pdb                   = 1
+  ssl_libs              = libeay32 ssleay32
+}
+
+MFC Debug {
+  type_code             = 0x0102
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  defines               = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /Fr /YX
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  lib_modifier          = mfcd
+  type_is_dynamic       = 1
+  type_is_binary        = 1
+  pdb                   = 1
+  ssl_libs              = libeay32 ssleay32
+}
+
+Static MFC Release {
+  type_description      = "Static Library"
+  type_code             = 0x0104
+  use_debug_libraries   = 0
+  compile_flags         = /G5 /W3 /GX /O2 /MD /Zi /GR
+  defines               = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /YX
+  output_dir            = Static_MFC_Release
+  intermediate_dir      = Static_MFC_Release
+  lib_modifier          = mfcs
+  debug_switch          =
+  type_is_static        = 1
+  need_libflags         = 1
+}
+
+Static MFC Debug {
+  type_description      = "Static Library"
+  type_code             = 0x0104
+  use_debug_libraries   = 1
+  compile_flags         = /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd
+  defines               = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /Fr /YX
+  output_dir            = Static_MFC_Debug
+  intermediate_dir      = Static_MFC_Debug
+  lib_modifier          = mfcsd
+  type_is_static        = 1
+  need_libflags         = 1
+}
+
diff --git a/templates/nmakeexe.mpt b/templates/nmakeexe.mpt
index 8ba79064..7be0273a 100644
--- a/templates/nmakeexe.mpt
+++ b/templates/nmakeexe.mpt
@@ -65,3 +65,54 @@ Static Debug {
   output_dir            = Static_Debug
   intermediate_dir      = Static_Debug
 }
+
+MFC Release {
+  subsystem             = windows
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /GX /O2 /MD /GR
+  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  lib_modifier          = mfc
+  debug_switch          =
+  ssl_libs              = libeay32 ssleay32
+}
+
+MFC Debug {
+  subsystem             = windows
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  lib_modifier          = mfcd
+  ssl_libs              = libeay32 ssleay32
+}
+
+Static MFC Release {
+  subsystem             = windows
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /GX /O2 /MD /GR
+  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  lib_modifier          = mfcs
+  need_libflags         = 1
+  output_dir            = Static_MFC_Release
+  intermediate_dir      = Static_MFC_Release
+  debug_switch          =
+}
+
+Static MFC Debug {
+  subsystem             = windows
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  lib_modifier          = mfcsd
+  need_libflags         = 1
+  output_dir            = Static_MFC_Debug
+  intermediate_dir      = Static_MFC_Debug
+}
+
diff --git a/templates/vc6.mpd b/templates/vc6.mpd
index 9f48e5c6..8fe6995e 100644
--- a/templates/vc6.mpd
+++ b/templates/vc6.mpd
@@ -2,7 +2,7 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "<%platform_long("Win32 (x86)")%> <%type_description("Dynamic-Link Library")%>" <%type_code("0x0102")%>
+# TARGTYPE "<%platform("Win32")%> (<%platform_hardware("x86")%>) <%type_description("Dynamic-Link Library")%>" <%type_code("0x0102")%>
 
 CFG=<%project_name%> - <%platform("Win32")%> <%default_configuration("Debug")%>
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -19,7 +19,7 @@ CFG=<%project_name%> - <%platform("Win32")%> <%default_configuration("Debug")%>
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 <%foreach(configurations)%>
-!MESSAGE "<%project_name%> - <%platform%> <%configuration%>" (based on "<%platform_long%> <%type_description%>")
+!MESSAGE "<%project_name%> - <%platform%> <%configuration%>" (based on "<%platform%> (<%platform_hardware%>) <%type_description%>")
 <%endfor%>
 !MESSAGE 
 
@@ -72,7 +72,7 @@ LIB32=link.exe -lib
 <%endif%>
 
 <%endfor%>
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -178,7 +178,7 @@ SOURCE=.\<%idl_file%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
+# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
 InputPath=.\<%idl_file%>
 InputName=<%basenoextension(idl_file)%>
 InputDir=<%dirname(idl_file)%>
@@ -197,7 +197,7 @@ OutDir=.
 <%endif%>
 
 BuildCmds= \
-	<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
+	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
 
 "$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd
index 9f48e5c6..8fe6995e 100644
--- a/templates/vc6dsp.mpd
+++ b/templates/vc6dsp.mpd
@@ -2,7 +2,7 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "<%platform_long("Win32 (x86)")%> <%type_description("Dynamic-Link Library")%>" <%type_code("0x0102")%>
+# TARGTYPE "<%platform("Win32")%> (<%platform_hardware("x86")%>) <%type_description("Dynamic-Link Library")%>" <%type_code("0x0102")%>
 
 CFG=<%project_name%> - <%platform("Win32")%> <%default_configuration("Debug")%>
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -19,7 +19,7 @@ CFG=<%project_name%> - <%platform("Win32")%> <%default_configuration("Debug")%>
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 <%foreach(configurations)%>
-!MESSAGE "<%project_name%> - <%platform%> <%configuration%>" (based on "<%platform_long%> <%type_description%>")
+!MESSAGE "<%project_name%> - <%platform%> <%configuration%>" (based on "<%platform%> (<%platform_hardware%>) <%type_description%>")
 <%endfor%>
 !MESSAGE 
 
@@ -72,7 +72,7 @@ LIB32=link.exe -lib
 <%endif%>
 
 <%endfor%>
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -178,7 +178,7 @@ SOURCE=.\<%idl_file%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%project_name%> - <%platform%> <%configuration%>"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)
+# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
 InputPath=.\<%idl_file%>
 InputName=<%basenoextension(idl_file)%>
 InputDir=<%dirname(idl_file)%>
@@ -197,7 +197,7 @@ OutDir=.
 <%endif%>
 
 BuildCmds= \
-	<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
+	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
 
 "$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
diff --git a/templates/vc6dspdll.mpt b/templates/vc6dspdll.mpt
index 0ab81755..14eb8b2a 100644
--- a/templates/vc6dspdll.mpt
+++ b/templates/vc6dspdll.mpt
@@ -25,3 +25,25 @@ Debug {
   lib_modifier          = d
 }
 
+MFC Release {
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /GX /O2 /MD /Zi /Ob2 /GR
+  defines               = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /YX
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  debug_switch          =
+  lib_modifier          = mfc
+  use_mfc               = 2
+}
+
+MFC Debug {
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  defines               = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /Fr /YX
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  lib_modifier          = mfcd
+  use_mfc               = 2
+}
diff --git a/templates/vc6dspdllexe.mpt b/templates/vc6dspdllexe.mpt
index efa9ed72..f3911ba5 100644
--- a/templates/vc6dspdllexe.mpt
+++ b/templates/vc6dspdllexe.mpt
@@ -27,3 +27,31 @@ Debug {
   output_dir            = .
   lib_modifier          = d
 }
+
+MFC Release {
+  subsystem             = windows
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /GX /O2 /MD /GR
+  common_defines        = WIN32 _WINDOWS
+  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  debug_switch          =
+  lib_modifier          = mfc
+  use_mfc               = 2
+}
+
+MFC Debug {
+  subsystem             = windows
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  common_defines        = WIN32 _WINDOWS
+  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  intermediate_dir      = MFC_Debug
+  output_dir            = MFC_Debug
+  lib_modifier          = mfcd
+  use_mfc               = 2
+}
+
diff --git a/templates/vc6dsplib.mpt b/templates/vc6dsplib.mpt
index 97cc48ec..8e873803 100644
--- a/templates/vc6dsplib.mpt
+++ b/templates/vc6dsplib.mpt
@@ -29,3 +29,27 @@ Static Debug {
   pdb                   = 1
 }
 
+MFC Release {
+  use_debug_libraries   = 0
+  compile_flags         = /G5 /W3 /GX /O2 /MD /Zi /GR
+  defines               = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /YX
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  lib_modifier          = mfcs
+  debug_switch          =
+  use_mfc               = 1
+}
+
+MFC Debug {
+  use_debug_libraries   = 1
+  compile_flags         = /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd
+  defines               = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  compile_flags_removed = /Fr /YX
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  lib_modifier          = mfcsd
+  pdb                   = 1
+  use_mfc               = 1
+}
+
diff --git a/templates/vc6dsplibexe.mpt b/templates/vc6dsplibexe.mpt
index 236717ad..d7e6f3bd 100644
--- a/templates/vc6dsplibexe.mpt
+++ b/templates/vc6dsplibexe.mpt
@@ -30,3 +30,28 @@ Static Debug {
   output_dir            = Static_Debug
   intermediate_dir      = Static_Debug
 }
+
+MFC Release {
+  use_debug_libraries   = 0
+  compile_flags         = /W3 /GX /O2 /MD /GR
+  common_defines        = WIN32 _WINDOWS
+  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  lib_modifier          = mfcs
+  output_dir            = MFC_Release
+  intermediate_dir      = MFC_Release
+  debug_switch          =
+  use_mfc               = 1
+}
+
+MFC Debug {
+  use_debug_libraries   = 1
+  compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
+  common_defines        = WIN32 _WINDOWS
+  defines               = _DEBUG _AFX_DLL ACE_HAS_MFC
+  compile_flags_removed = /YX
+  lib_modifier          = mfcsd
+  output_dir            = MFC_Debug
+  intermediate_dir      = MFC_Debug
+  use_mfc               = 1
+}
diff --git a/templates/vc7.mpd b/templates/vc7.mpd
index abe971eb..11a36c9e 100644
--- a/templates/vc7.mpd
+++ b/templates/vc7.mpd
@@ -125,7 +125,6 @@
 				</FileConfiguration>
 <%endfor%>
 			</File>
-		</Filter>
 <%endif%>
 <%foreach(source_files)%>
 			<File
@@ -162,20 +161,20 @@
 					Name="<%configuration%>|<%platform%>">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Invoking TAO_IDL Compiler on <%basename(idl_file)%> located in <%dirname(idl_file)%>"
+						Description="Invoking IDL Compiler on <%basename(idl_file)%> located in <%dirname(idl_file)%>"
 <%if(flag_overrides(idl_file, idlgendir))%>
-						CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
+						CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
 						Outputs="<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.h;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.i;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.cpp;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.h;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.i;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.cpp"/>
 <%else%>
 <%if(idlgendir)%>
-						CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
+						CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
 						Outputs="<%idlgendir%>\<%basenoextension(idl_file)%>C.h;<%idlgendir%>\<%basenoextension(idl_file)%>C.i;<%idlgendir%>\<%basenoextension(idl_file)%>C.cpp;<%idlgendir%>\<%basenoextension(idl_file)%>S.h;<%idlgendir%>\<%basenoextension(idl_file)%>S.i;<%idlgendir%>\<%basenoextension(idl_file)%>S.cpp"/>
 <%else%>
 <%if(dirname_found)%>
-						CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
+						CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
 						Outputs="<%basenoextension(idl_file)%>C.h;<%basenoextension(idl_file)%>C.i;<%basenoextension(idl_file)%>C.cpp;<%basenoextension(idl_file)%>S.h;<%basenoextension(idl_file)%>S.i;<%basenoextension(idl_file)%>S.cpp"/>
 <%else%>
-						CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
+						CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
 						Outputs="<%noextension(idl_file)%>C.h;<%noextension(idl_file)%>C.i;<%noextension(idl_file)%>C.cpp;<%noextension(idl_file)%>S.h;<%noextension(idl_file)%>S.i;<%noextension(idl_file)%>S.cpp"/>
 <%endif%>
 <%endif%>
diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt
index 731d11cb..af598438 100644
--- a/templates/vc7dll.mpt
+++ b/templates/vc7dll.mpt
@@ -48,3 +48,53 @@ Static Debug {
   runtime_library  = 3
 }
 
+MFC Release {
+  type_is_dynamic  = 1
+  type_is_binary   = 1
+  defines          = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  output_dir       = MFC_Release
+  intermediate_dir = MFC_Release
+  lib_modifier     = mfc
+  runtime_library  = 2
+  pdb              = 1
+  use_mfc          = 2
+}
+
+MFC Debug {
+  type_is_dynamic  = 1
+  type_is_binary   = 1
+  optimization     = 0
+  debug            = 1
+  defines          = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  output_dir       = MFC_Debug
+  intermediate_dir = MFC_Debug
+  lib_modifier     = mfcd
+  runtime_library  = 3
+  pdb              = 1
+  use_mfc          = 2
+}
+
+Static MFC Release {
+  type_is_static   = 1
+  defines          = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  output_dir       = Static_MFC_Release
+  intermediate_dir = Static_MFC_Release
+  lib_modifier     = mfcs
+  need_libflags    = 1
+  runtime_library  = 2
+  use_mfc          = 2
+}
+
+Static MFC Debug {
+  type_is_static   = 1
+  optimization     = 0
+  debug            = 1
+  defines          = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  output_dir       = Static_MFC_Debug
+  intermediate_dir = Static_MFC_Debug
+  lib_modifier     = mfcsd
+  need_libflags    = 1
+  runtime_library  = 3
+  use_mfc          = 2
+}
+
diff --git a/templates/vc7exe.mpt b/templates/vc7exe.mpt
index 6af92074..e370fb5e 100644
--- a/templates/vc7exe.mpt
+++ b/templates/vc7exe.mpt
@@ -44,3 +44,47 @@ Static Debug {
   runtime_library  = 3
 }
 
+MFC Release {
+  common_defines   = WIN32 _WINDOWS
+  defines          = NDEBUG _AFXDLL ACE_HAS_MFC
+  output_dir       = MFC_Release
+  intermediate_dir = MFC_Release
+  lib_modifier     = mfc
+  runtime_library  = 2
+  use_mfc          = 2
+}
+
+MFC Debug {
+  optimization     = 0
+  debug            = 1
+  common_defines   = WIN32 _WINDOWS
+  defines          = _DEBUG _AFXDLL ACE_HAS_MFC
+  output_dir       = MFC_Debug
+  intermediate_dir = MFC_Debug
+  lib_modifier     = mfcd
+  runtime_library  = 3
+  use_mfc          = 2
+}
+
+Static MFC Release {
+  defines          = NDEBUG _AFXDLL ACE_HAS_MFC
+  output_dir       = Static_MFC_Release
+  intermediate_dir = Static_MFC_Release
+  lib_modifier     = mfcs
+  need_libflags    = 1
+  runtime_library  = 2
+  use_mfc          = 2
+}
+
+Static MFC Debug {
+  optimization     = 0
+  debug            = 1
+  defines          = _DEBUG _AFXDLL ACE_HAS_MFC
+  output_dir       = Static_MFC_Debug
+  intermediate_dir = Static_MFC_Debug
+  lib_modifier     = mfcsd
+  need_libflags    = 1
+  runtime_library  = 3
+  use_mfc          = 2
+}
+