ChangeLogTag: Wed Apr 9 08:22:56 2003 Chad Elliott <elliott_c@ociweb.com>

19 files changed, 201 insertions, 115 deletions

diff --git a/modules/Creator.pm b/modules/Creator.pm
index 9fee09cf..552f4140 100644
--- a/modules/Creator.pm
+++ b/modules/Creator.pm
@@ -47,7 +47,7 @@ sub new {
   my($toplevel)  = shift;
   my($baseprojs) = shift;
   my($type)      = shift;
-  my($self)      = Parser::new($class);
+  my($self)      = Parser::new($class, $inc);
 
   $self->{'relative'}       = $relative;
   $self->{'template'}       = $template;
@@ -56,7 +56,6 @@ sub new {
   $self->{'grammar_type'}   = $type;
   $self->{'type_check'}     = $type . '_defined';
   $self->{'global_read'}    = 0;
-  $self->{'include'}        = $inc;
   $self->{'current_input'}  = '';
   $self->{'progress'}       = $progress;
   $self->{'addtemp'}        = $addtemp;
@@ -314,21 +313,6 @@ sub generate_default_file_list {
 }
 
 
-sub search_include_path {
-  my($self)     = shift;
-  my($file)     = shift;
-  my($found)    = undef;
-  my($includes) = $self->get_include_path();
-  foreach my $include (@$includes) {
-    if (-r "$include/$file") {
-      $found = "$include/$file";
-      last;
-    }
-  }
-  return $found;
-}
-
-
 sub windows_crlf {
   #my($self) = shift;
   if ($^O eq 'MSWin32' || $^O eq 'cygwin') {
@@ -511,12 +495,6 @@ sub get_global_cfg {
 }
 
 
-sub get_include_path {
-  my($self) = shift;
-  return $self->{'include'};
-}
-
-
 sub get_template_override {
   my($self) = shift;
   return $self->{'template'};
diff --git a/modules/Driver.pm b/modules/Driver.pm
index 0e5b70d6..8aff9671 100644
--- a/modules/Driver.pm
+++ b/modules/Driver.pm
@@ -14,10 +14,10 @@ use strict;
 use File::Basename;
 
 use Options;
-use StringProcessor;
+use Parser;
 
 use vars qw(@ISA);
-@ISA = qw(StringProcessor Options);
+@ISA = qw(Parser Options);
 
 # ************************************************************
 # Data Section
@@ -40,15 +40,51 @@ sub new {
 
   $self->{'path'}     = $path;
   $self->{'name'}     = $name;
-  $self->{'version'}  = 1.6;
+  $self->{'version'}  = 1.7;
   $self->{'types'}    = {};
   $self->{'creators'} = \@creators;
   $self->{'default'}  = $creators[0];
+  $self->{'reldefs'}  = {};
+  $self->{'relorder'} = [];
 
   return $self;
 }
 
 
+sub convert_slashes {
+  #my($self) = shift;
+  return 0;
+}
+
+
+sub parse_line {
+  my($self)        = shift;
+  my($ih)          = shift;
+  my($line)        = shift;
+  my($status)      = 1;
+  my($errorString) = '';
+
+  if ($line eq '') {
+  }
+  elsif ($line =~ /^(\w+)(\s*,\s*(.*))?$/) {
+    my($name)  = $1;
+    my($value) = $3;
+    if (defined $value) {
+      $value =~ s/^\s+//;
+      $value =~ s/\s+$//;
+    }
+    $self->{'reldefs'}->{$name} = $value;
+    push(@{$self->{'relorder'}}, $name);
+  }
+  else {
+    $status = 0;
+    $errorString = "ERROR: Unrecognized line: $line";
+  }
+
+  return $status, $errorString;
+}
+
+
 sub optionError {
   my($self) = shift;
   my($line) = shift;
@@ -196,33 +232,43 @@ sub run {
     push(@{$options->{'input'}}, '');
   }
   if (!defined $options->{'global'}) {
-    $options->{'global'} = $self->{'path'} . '/config/global.mpb';
+    my($global) = $self->{'path'} . '/config/global.mpb';
+    if (-r $global) {
+      $options->{'global'} = $global;
+    }
   }
   ## Always add the default include paths
   unshift(@{$options->{'include'}}, $self->{'path'} . '/templates');
   unshift(@{$options->{'include'}}, $self->{'path'} . '/config');
 
   if ($options->{'reldefs'}) {
-    if (defined $ENV{ACE_ROOT} &&
-        !defined $options->{'relative'}->{'ACE_ROOT'}) {
-      $options->{'relative'}->{'ACE_ROOT'} = $ENV{ACE_ROOT};
-    }
-    if (!defined $options->{'relative'}->{'TAO_ROOT'}) {
-      if (defined $ENV{TAO_ROOT}) {
-        $options->{'relative'}->{'TAO_ROOT'} = $ENV{TAO_ROOT};
-      }
-      else {
-        $options->{'relative'}->{'TAO_ROOT'} =
-                  $options->{'relative'}->{'ACE_ROOT'} . '/TAO';
+    ## Only try to read the file if it exists
+    my($rel) = $self->{'path'} . '/config/default.rel';
+    if (-r $rel) {
+      my($srel, $errorString) = $self->read_file($rel);
+      if (!$srel) {
+        print STDERR "$errorString\nin $rel\n";
+        return $status;
       }
     }
-    if (!defined $options->{'relative'}->{'CIAO_ROOT'}) {
-      if (defined $ENV{CIAO_ROOT}) {
-        $options->{'relative'}->{'CIAO_ROOT'} = $ENV{CIAO_ROOT};
+
+    foreach my $key (@{$self->{'relorder'}}) {
+      if (defined $ENV{$key} &&
+          !defined $options->{'relative'}->{$key}) {
+        $options->{'relative'}->{$key} = $ENV{$key};
       }
-      else {
-        $options->{'relative'}->{'CIAO_ROOT'} =
-                  $options->{'relative'}->{ACE_ROOT} . '/TAO/CIAO';
+      if (defined $self->{'reldefs'}->{$key} &&
+          !defined $options->{'relative'}->{$key}) {
+        my($value) = $self->{'reldefs'}->{$key};
+        if ($value =~ /\$(\w+)(.*)?/) {
+          my($var)   = $1;
+          my($extra) = $2;
+          $options->{'relative'}->{$key} = 
+                     $options->{'relative'}->{$var} . $extra;
+        }
+        else {
+          $options->{'relative'}->{$key} = $value;
+        }
       }
     }
   }
@@ -232,7 +278,7 @@ sub run {
 
   ## Save the original directory outside of the loop
   ## to avoid calling it multiple times.
-  my($orig_dir) = Cwd::getcwd();
+  my($orig_dir) = $self->getcwd();
 
   ## Generate the files
   foreach my $cfile (@{$options->{'input'}}) {
diff --git a/modules/Parser.pm b/modules/Parser.pm
index f32402c8..1376c8ac 100644
--- a/modules/Parser.pm
+++ b/modules/Parser.pm
@@ -29,10 +29,13 @@ my($cwd) = Cwd::getcwd();
 # ************************************************************
 
 sub new {
-  my($class)  = shift;
-  my($self)   = $class->SUPER::new();
+  my($class) = shift;
+  my($inc)   = shift;
+  my($self)  = $class->SUPER::new();
 
   $self->{'line_number'} = 0;
+  $self->{'include'}     = $inc;
+
   return $self;
 }
 
@@ -131,6 +134,27 @@ sub slash_to_backslash {
 }
 
 
+sub get_include_path {
+  my($self) = shift;
+  return $self->{'include'};
+}
+
+
+sub search_include_path {
+  my($self)  = shift; 
+  my($file)  = shift; 
+  my($found) = undef; 
+
+  foreach my $include (@{$self->{'include'}}) {
+    if (-r "$include/$file") {
+      $found = "$include/$file";
+      last;
+    }
+  }  
+  return $found;
+}
+
+
 # ************************************************************
 # Virtual Methods To Be Overridden
 # ************************************************************
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 3e784b89..1af95d62 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -47,7 +47,6 @@ my(%validNames) = ('exename'         => 1,
                    'pch_header'      => 1,
                    'pch_source'      => 1,
                    'ssl'             => 1,
-                   'tao'             => 1,
                    'dllout'          => 1,
                    'libout'          => 1,
                    'dllflags'        => 1,
@@ -610,7 +609,7 @@ sub read_template_input {
   if (defined $file) {
     my($file) = $self->search_include_path("$file.$TemplateInputExtension");
     if (defined $file) {
-      $self->{$tag} = new TemplateInputReader();
+      $self->{$tag} = new TemplateInputReader($self->get_include_path());
       ($status, $errorString) = $self->{$tag}->read_file($file);
     }
     else {
@@ -921,7 +920,6 @@ sub generate_default_components {
           $self->sift_files($files, $exts, $pchh, $pchc, $tag, $array);
           if ($tag eq 'idl_files' && defined $$array[0]) {
             $self->{'idl_defaulted'} = 1;
-            $self->process_assignment('tao', 1);
           }
           elsif ($tag eq 'source_files') {
             ## If we are auto-generating the source_files, then
diff --git a/modules/TemplateInputReader.pm b/modules/TemplateInputReader.pm
index 3b9a5e21..40f663ca 100644
--- a/modules/TemplateInputReader.pm
+++ b/modules/TemplateInputReader.pm
@@ -18,12 +18,19 @@ use vars qw(@ISA);
 @ISA = qw(Parser);
 
 # ************************************************************
+# Data Section
+# ************************************************************
+
+my($mpt)  = 'mpt';
+
+# ************************************************************
 # Subroutine Section
 # ************************************************************
 
 sub new {
   my($class) = shift;
-  my($self)  = Parser::new($class);
+  my($inc)   = shift;
+  my($self)  = Parser::new($class, $inc);
 
   $self->{'values'}  = {};
   $self->{'cindex'}  = 0;
@@ -63,9 +70,10 @@ sub parse_line {
       $errorString = 'ERROR: Unmatched curly brace';
     }
   }
-  elsif ($line =~ /^(\w+)\s*=\s*(.*)?/) {
+  elsif ($line =~ /^(\w+)\s*(\+=|=)\s*(.*)?/) {
     my($name)  = $1;
-    my($value) = $2;
+    my($op)    = $2;
+    my($value) = $3;
 
     if (defined $value) {
       $value = $self->create_array($value);
@@ -74,12 +82,46 @@ sub parse_line {
       $value = '';
     }
 
-    if (!defined $$current[$self->{'cindex'}]->{$name}) {
-      $$current[$self->{'cindex'}]->{$name} = $value;
+    if ($op eq '+=') {
+      my($ref) = $$current[$self->{'cindex'}]->{$name};
+      if (defined $ref) {
+        if (UNIVERSAL::isa($ref, 'ARRAY')) {
+          if (UNIVERSAL::isa($value, 'ARRAY')) {
+            push(@$ref, @$value);
+          }
+          else {
+            push(@$ref, $value);
+          }
+        }
+        else {
+          if (UNIVERSAL::isa($value, 'ARRAY')) {
+            $$current[$self->{'cindex'}]->{$name} .= " @$value";
+          }
+          else {
+            $$current[$self->{'cindex'}]->{$name} .= $value;
+          }
+        }
+      }
+      else {
+        $$current[$self->{'cindex'}]->{$name} = $value;
+      }
     }
     else {
-      $status = 0;
-      $errorString = "ERROR: Redifinition of '$name'";
+      if (!$$current[$self->{'cindex'}]->{$name}) {
+        $$current[$self->{'cindex'}]->{$name} = $value;
+      }
+      else {
+        $status = 0;
+        $errorString = "ERROR: Redifinition of '$name'";
+      }
+    }
+  }
+  elsif ($line =~ /^conditional_include\s+"([\w\s\-\+\/\\\.]+)"$/) {
+    my($file) = $self->search_include_path("$1.$mpt");
+    if (defined $file) {
+      my($ol) = $self->{'line_number'};
+      ($status, $errorString) = $self->read_file($file);
+      $self->{'line_number'} = $ol;
     }
   }
   else {
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index 5801367d..38629953 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -329,6 +329,11 @@ sub get_value {
         ## Then get it from our known values
         if (!defined $value) {
           $value = $self->{'values'}->{$name};
+          if (!defined $value) {
+            ## Call back onto the project creator to allow
+            ## it to fill in the value before defaulting to undef.
+            $value = $self->{'prjc'}->fill_value($name);
+          }
         }
       }
     }
@@ -351,13 +356,8 @@ sub get_value_with_default {
   else {
     $value = $self->{'defaults'}->{$name};
     if (!defined $value) {
-      ## Call back onto the project creator to allow
-      ## it to fill in the value before defaulting to an empty string.
-      $value = $self->{'prjc'}->fill_value($name);
-      if (!defined $value) {
-#        print "DEBUG: WARNING: $name defaulting to empty string\n";
-        $value = '';
-      }
+#      print "DEBUG: WARNING: $name defaulting to empty string\n";
+      $value = '';
     }
     else {
 #      print "DEBUG: WARNING: $name using default value of $value\n";
diff --git a/templates/em3vcpdll.mpt b/templates/em3vcpdll.mpt
index 1527aae8..3f8d8356 100644
--- a/templates/em3vcpdll.mpt
+++ b/templates/em3vcpdll.mpt
@@ -5,7 +5,6 @@ default_platform_long = "WCE ARM"
 type_is_binary        = 1
 type_is_dynamic       = 1
 common_defines        = UNICODE _UNICODE
-pch_defines           = ACE_USING_PCH
 ssl_libs              = libeay32 ssleay32
 pdb                   = 1
 
@@ -56,7 +55,7 @@ Debug {
 MFC Release {
   use_debug_libraries   = 0
   compile_flags         = /W3 /O2 /Zi /Ob2
-  defines               = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
@@ -67,7 +66,7 @@ MFC Release {
 MFC Debug {
   use_debug_libraries   = 1
   compile_flags         = /W3 /Zi /Od
-  defines               = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
@@ -75,3 +74,4 @@ MFC Debug {
   use_mfc               = 2
 }
 
+conditional_include "vcpartialmacros"
diff --git a/templates/em3vcpdllexe.mpt b/templates/em3vcpdllexe.mpt
index 1aea67d9..9240a1aa 100644
--- a/templates/em3vcpdllexe.mpt
+++ b/templates/em3vcpdllexe.mpt
@@ -5,7 +5,6 @@ default_platform_long = "WCE ARM"
 configurations        = Release Debug
 type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
-pch_defines           = ACE_USING_PCH
 ssl_libs              = libeay32 ssleay32
 pdb                   = 1
 
@@ -56,7 +55,7 @@ Debug {
 MFC Release {
   use_debug_libraries   = 0
   compile_flags         = /W3 /O2 /Zi /Ob2
-  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
@@ -67,10 +66,12 @@ MFC Release {
 MFC Debug {
   use_debug_libraries   = 1
   compile_flags         = /W3 /Zi /Od
-  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
   lib_modifier          = mfcd
   use_mfc               = 2
 }
+
+conditional_include "vcpartialmacros"
diff --git a/templates/em3vcplib.mpt b/templates/em3vcplib.mpt
index 4de6c3dd..6edce407 100644
--- a/templates/em3vcplib.mpt
+++ b/templates/em3vcplib.mpt
@@ -6,7 +6,6 @@ configurations        = "Static Release" "Static Debug"
 common_defines        = UNICODE _UNICODE
 type_is_static        = 1
 need_libflags         = 1
-pch_defines           = ACE_USING_PCH
 
 WCE x86 {
   type_code   = 0x8304
@@ -57,7 +56,7 @@ Static Debug {
 MFC Release {
   use_debug_libraries   = 0
   compile_flags         = /W3 /O2 /Zi /Ob2
-  defines               = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
@@ -68,7 +67,7 @@ MFC Release {
 MFC Debug {
   use_debug_libraries   = 1
   compile_flags         = /W3 /Zi /Od
-  defines               = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
@@ -76,3 +75,5 @@ MFC Debug {
   pdb                   = 1
   use_mfc               = 2
 }
+
+conditional_include "vcpartialmacros"
diff --git a/templates/em3vcplibexe.mpt b/templates/em3vcplibexe.mpt
index 750159e9..284c220a 100644
--- a/templates/em3vcplibexe.mpt
+++ b/templates/em3vcplibexe.mpt
@@ -5,7 +5,6 @@ default_platform_long = "WCE ARM"
 configurations        = "Static Release" "Static Debug"
 type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
-pch_defines           = ACE_USING_PCH
 ssl_libs              = libeay32 ssleay32
 need_libflags         = 1
 pdb                   = 1
@@ -58,7 +57,7 @@ Static Debug {
 MFC Release {
   use_debug_libraries   = 0
   compile_flags         = /W3 /O2 /Zi /Ob2
-  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcs
   output_dir            = MFC_Release
@@ -69,10 +68,12 @@ MFC Release {
 MFC Debug {
   use_debug_libraries   = 1
   compile_flags         = /W3 /Zi /Od
-  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcsd
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
   use_mfc               = 1
 }
+
+conditional_include "vcpartialmacros"
diff --git a/templates/nmakedll.mpt b/templates/nmakedll.mpt
index c7089953..2e7f17a2 100644
--- a/templates/nmakedll.mpt
+++ b/templates/nmakedll.mpt
@@ -2,7 +2,6 @@ configurations        = Release Debug "Static Release" "Static Debug"
 platforms             = Win32
 default_configuration = Debug
 common_defines        = WIN32 _WINDOWS
-pch_defines           = ACE_USING_PCH
 
 Win32 {
   machine_description = x86
@@ -79,7 +78,7 @@ 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
+  defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
@@ -95,7 +94,7 @@ 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
+  defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
@@ -111,7 +110,7 @@ Static MFC Release {
   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
+  defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = Static_MFC_Release
   intermediate_dir      = Static_MFC_Release
@@ -126,7 +125,7 @@ Static MFC Debug {
   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
+  defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = Static_MFC_Debug
   intermediate_dir      = Static_MFC_Debug
@@ -135,3 +134,4 @@ Static MFC Debug {
   need_libflags         = 1
 }
 
+conditional_include "vcfullmacros"
diff --git a/templates/nmakeexe.mpt b/templates/nmakeexe.mpt
index 7be0273a..ddcc9677 100644
--- a/templates/nmakeexe.mpt
+++ b/templates/nmakeexe.mpt
@@ -6,7 +6,6 @@ default_configuration = Debug
 type_is_binary        = 1
 common_defines        = WIN32 _CONSOLE
 subsystem             = console
-pch_defines           = ACE_USING_PCH
 pdb                   = 1
 
 Win32 {
@@ -70,7 +69,7 @@ MFC Release {
   subsystem             = windows
   use_debug_libraries   = 0
   compile_flags         = /W3 /GX /O2 /MD /GR
-  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
@@ -83,7 +82,7 @@ MFC Debug {
   subsystem             = windows
   use_debug_libraries   = 1
   compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
-  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
@@ -95,7 +94,7 @@ Static MFC Release {
   subsystem             = windows
   use_debug_libraries   = 0
   compile_flags         = /W3 /GX /O2 /MD /GR
-  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcs
   need_libflags         = 1
@@ -108,7 +107,7 @@ 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
+  defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcsd
   need_libflags         = 1
@@ -116,3 +115,4 @@ Static MFC Debug {
   intermediate_dir      = Static_MFC_Debug
 }
 
+conditional_include "vcfullmacros"
diff --git a/templates/va4icc.mpd b/templates/va4icc.mpd
index 1a47193b..671a840e 100644
--- a/templates/va4icc.mpd
+++ b/templates/va4icc.mpd
@@ -16,8 +16,6 @@ if $__TOS_WIN__ {
                 define ("<%libflag%>", "1"),
 <%endfor%>
 <%endif%>
-                define ("ACE_HAS_WINSOCK2","1"),
-                define ("ACE_HAS_WCHAR_TYPEDEFS_CHAR","1"),
                 define ("_stricmp", "stricmp"),
                 define ("_strnicmp", "strnicmp"),
                 define ("_O_TEMPORARY", 0x08),
@@ -25,8 +23,6 @@ if $__TOS_WIN__ {
                 define ("_O_TRUNC", "O_TRUNC"),
                 define ("_O_EXCL", "O_EXCL"),
                 define ("_INTEGRAL_MAX_BITS", 64),
-                define ('ACE_LACKS_RTTI', '1'),
-                define ('ACE_USE_RCSID', '0'),
                 gen('check', 'bounds', 'no'),
                 gen('libansi', 'yes'),
                 link('typecheck', 'yes'),
@@ -39,9 +35,6 @@ if $__TOS_WIN__ {
 if $__TOS_AIX__ {
         option PlatformOptions =
                 defaults('xlC_r'),
-                define ('ACE_AIX_VERS', '<%aix_vers("501")%>'),
-                define ('ACE_LACKS_RTTI', '1'),
-                define ('ACE_USE_RCSID', '0'),
                 gen('check', 'bounds', 'no'),
                 gen('libansi', 'yes'),
                 link('typecheck', 'yes'),
diff --git a/templates/vc6dspdll.mpt b/templates/vc6dspdll.mpt
index 14eb8b2a..a3c42b3c 100644
--- a/templates/vc6dspdll.mpt
+++ b/templates/vc6dspdll.mpt
@@ -2,7 +2,6 @@ configurations  = Release Debug
 type_is_binary  = 1
 type_is_dynamic = 1
 common_defines  = WIN32 _WINDOWS
-pch_defines     = ACE_USING_PCH
 ssl_libs        = libeay32 ssleay32
 pdb             = 1
 
@@ -28,7 +27,7 @@ Debug {
 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
+  defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
@@ -40,10 +39,12 @@ MFC Release {
 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
+  defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
   lib_modifier          = mfcd
   use_mfc               = 2
 }
+
+conditional_include "vcpartialmacros"
diff --git a/templates/vc6dspdllexe.mpt b/templates/vc6dspdllexe.mpt
index f3911ba5..50df87e6 100644
--- a/templates/vc6dspdllexe.mpt
+++ b/templates/vc6dspdllexe.mpt
@@ -4,7 +4,6 @@ configurations   = Release Debug
 type_is_binary   = 1
 common_defines   = WIN32 _CONSOLE
 subsystem        = console
-pch_defines      = ACE_USING_PCH
 ssl_libs         = libeay32 ssleay32
 pdb              = 1
 
@@ -33,7 +32,7 @@ MFC Release {
   use_debug_libraries   = 0
   compile_flags         = /W3 /GX /O2 /MD /GR
   common_defines        = WIN32 _WINDOWS
-  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
@@ -47,7 +46,7 @@ MFC Debug {
   use_debug_libraries   = 1
   compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
   common_defines        = WIN32 _WINDOWS
-  defines               = _DEBUG _AFXDLL ACE_HAS_MFC
+  defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   intermediate_dir      = MFC_Debug
   output_dir            = MFC_Debug
@@ -55,3 +54,4 @@ MFC Debug {
   use_mfc               = 2
 }
 
+conditional_include "vcpartialmacros"
diff --git a/templates/vc6dsplib.mpt b/templates/vc6dsplib.mpt
index 8e873803..d7968bb5 100644
--- a/templates/vc6dsplib.mpt
+++ b/templates/vc6dsplib.mpt
@@ -5,7 +5,6 @@ default_configuration = "Static Debug"
 common_defines        = WIN32 _WINDOWS
 type_is_static        = 1
 need_libflags         = 1
-pch_defines           = ACE_USING_PCH
 
 Static Release {
   use_debug_libraries   = 0
@@ -32,7 +31,7 @@ Static Debug {
 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
+  defines               = NDEBUG
   compile_flags_removed = /YX
   output_dir            = MFC_Release
   intermediate_dir      = MFC_Release
@@ -44,7 +43,7 @@ MFC Release {
 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
+  defines               = _DEBUG
   compile_flags_removed = /Fr /YX
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
@@ -53,3 +52,4 @@ MFC Debug {
   use_mfc               = 1
 }
 
+conditional_include "vcpartialmacros"
diff --git a/templates/vc6dsplibexe.mpt b/templates/vc6dsplibexe.mpt
index d7e6f3bd..2cbf804d 100644
--- a/templates/vc6dsplibexe.mpt
+++ b/templates/vc6dsplibexe.mpt
@@ -5,7 +5,6 @@ default_configuration = "Static Debug"
 type_is_binary        = 1
 common_defines        = WIN32 _CONSOLE
 subsystem             = console
-pch_defines           = ACE_USING_PCH
 ssl_libs              = libeay32 ssleay32
 need_libflags         = 1
 pdb                   = 1
@@ -35,7 +34,7 @@ MFC Release {
   use_debug_libraries   = 0
   compile_flags         = /W3 /GX /O2 /MD /GR
   common_defines        = WIN32 _WINDOWS
-  defines               = NDEBUG _AFXDLL ACE_HAS_MFC
+  defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcs
   output_dir            = MFC_Release
@@ -48,10 +47,12 @@ 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
+  defines               = _DEBUG _AFX_DLL
   compile_flags_removed = /YX
   lib_modifier          = mfcsd
   output_dir            = MFC_Debug
   intermediate_dir      = MFC_Debug
   use_mfc               = 1
 }
+
+conditional_include "vcpartialmacros"
diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt
index af598438..154870ea 100644
--- a/templates/vc7dll.mpt
+++ b/templates/vc7dll.mpt
@@ -1,6 +1,5 @@
 configurations     = Release Debug "Static Release" "Static Debug"
 common_defines     = WIN32 _WINDOWS
-pch_defines        = ACE_USING_PCH
 ssl_libs           = libeay32 ssleay32
 
 Release {
@@ -51,7 +50,7 @@ Static Debug {
 MFC Release {
   type_is_dynamic  = 1
   type_is_binary   = 1
-  defines          = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  defines          = NDEBUG
   output_dir       = MFC_Release
   intermediate_dir = MFC_Release
   lib_modifier     = mfc
@@ -65,7 +64,7 @@ MFC Debug {
   type_is_binary   = 1
   optimization     = 0
   debug            = 1
-  defines          = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  defines          = _DEBUG
   output_dir       = MFC_Debug
   intermediate_dir = MFC_Debug
   lib_modifier     = mfcd
@@ -76,7 +75,7 @@ MFC Debug {
 
 Static MFC Release {
   type_is_static   = 1
-  defines          = NDEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  defines          = NDEBUG
   output_dir       = Static_MFC_Release
   intermediate_dir = Static_MFC_Release
   lib_modifier     = mfcs
@@ -89,7 +88,7 @@ Static MFC Debug {
   type_is_static   = 1
   optimization     = 0
   debug            = 1
-  defines          = _DEBUG ACE_HAS_MFC ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
+  defines          = _DEBUG
   output_dir       = Static_MFC_Debug
   intermediate_dir = Static_MFC_Debug
   lib_modifier     = mfcsd
@@ -98,3 +97,4 @@ Static MFC Debug {
   use_mfc          = 2
 }
 
+conditional_include "vcfullmacros"
diff --git a/templates/vc7exe.mpt b/templates/vc7exe.mpt
index e370fb5e..e23f1049 100644
--- a/templates/vc7exe.mpt
+++ b/templates/vc7exe.mpt
@@ -1,7 +1,6 @@
 configurations     = Release Debug "Static Release" "Static Debug"
 type_is_binary     = 1
 common_defines     = WIN32 _CONSOLE
-pch_defines        = ACE_USING_PCH
 configuration_type = 1
 subsystem          = 1
 ssl_libs           = libeay32 ssleay32
@@ -46,7 +45,7 @@ Static Debug {
 
 MFC Release {
   common_defines   = WIN32 _WINDOWS
-  defines          = NDEBUG _AFXDLL ACE_HAS_MFC
+  defines          = NDEBUG _AFXDLL
   output_dir       = MFC_Release
   intermediate_dir = MFC_Release
   lib_modifier     = mfc
@@ -58,7 +57,7 @@ MFC Debug {
   optimization     = 0
   debug            = 1
   common_defines   = WIN32 _WINDOWS
-  defines          = _DEBUG _AFXDLL ACE_HAS_MFC
+  defines          = _DEBUG _AFXDLL
   output_dir       = MFC_Debug
   intermediate_dir = MFC_Debug
   lib_modifier     = mfcd
@@ -67,7 +66,7 @@ MFC Debug {
 }
 
 Static MFC Release {
-  defines          = NDEBUG _AFXDLL ACE_HAS_MFC
+  defines          = NDEBUG _AFXDLL
   output_dir       = Static_MFC_Release
   intermediate_dir = Static_MFC_Release
   lib_modifier     = mfcs
@@ -79,7 +78,7 @@ Static MFC Release {
 Static MFC Debug {
   optimization     = 0
   debug            = 1
-  defines          = _DEBUG _AFXDLL ACE_HAS_MFC
+  defines          = _DEBUG _AFXDLL
   output_dir       = Static_MFC_Debug
   intermediate_dir = Static_MFC_Debug
   lib_modifier     = mfcsd
@@ -88,3 +87,4 @@ Static MFC Debug {
   use_mfc          = 2
 }
 
+conditional_include "vcfullmacros"