Fri Jun 18 15:35:36 1999 Irfan Pyarali <irfan@cs.wustl.edu>

18 files changed, 215 insertions, 261 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index fc774c631d6..e4afc7b72e9 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,4 +1,9 @@
-Fri Jun 18 15:12:15 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
+Fri Jun 18 15:35:36 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_array/array_cs.cpp (visit_array): Moved
+	  the generation of the *_array_alloc and *_array_free functions
+	  from the i file to the cpp file.  This is because of the
+	  lameness of namespaces and MSVC export madness.
 
 	* tao/GIOP.cpp (process_server_request): Removed extra
 	  ACE_UNUSED_ARG (response_required) and initialized <request_id>
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index af6b5a497a8..493ac9aa0cd 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -42,97 +42,12 @@ be_visitor_array_ci::~be_visitor_array_ci (void)
 
 int be_visitor_array_ci::visit_array (be_array *node)
 {
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_type *bt;  // base type
-
   // nothing to do if we are imported or code is already generated
   if (node->imported () || (node->cli_inline_gen ()))
     return 0;
 
   this->ctx_->node (node); // save the array node
 
-  // retrieve the type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_ci::"
-                         "visit_array - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local names
-  // save the node's local name and full name in a buffer for quick use later
-  // on 
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  if (this->ctx_->tdef ())
-    {
-      // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
-      ACE_OS::sprintf (lname, "%s", 
-                       node->local_name ()->get_string ());
-    }
-  else
-    {
-      // for anonymous arrays ...
-      // we have to generate a name for us that has an underscope prepended to
-      // our local name. This needs to be inserted after the parents's name
-
-      if (node->is_nested ())
-        {
-          be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (), 
-                           node->local_name ()->get_string ());
-          ACE_OS::sprintf (lname, "_%s", 
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
-          ACE_OS::sprintf (lname, "_%s", 
-                           node->local_name ()->get_string ());
-        }
-    }
-
-  // alloc method
-  os->indent (); // start from current indentation
-  *os << "ACE_INLINE " << fname << "_slice *" << be_nl;
-  *os << fname << "_alloc (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return new ";
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_ci::"
-                         "visit_array - "
-                         "base type decl failed\n"),
-                        -1);
-    }
-
-  if (node->gen_dimensions (os) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_array::"
-                         "gen_client_inline - "
-                         "dimensions codegen failed\n"),
-                        -1);
-    }
-
-  *os << ";" << be_uidt_nl;
-  *os << "}\n\n";
-
-  // free method
-  os->indent ();
-  *os << "ACE_INLINE void" << be_nl
-      << fname << "_free (" << fname
-      << "_slice *_tao_slice)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "delete [] _tao_slice;" << be_uidt_nl;
-  *os << "}\n\n";
-
   // generate code for the _var, _out, and _forany types
   if (this->gen_var_impl (node) == -1)
     {
@@ -178,7 +93,7 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local names of the var
   // save the node's local name and full name in a buffer for quick use later
-  // on 
+  // on
   ACE_OS::memset (nodename, '\0', NAMEBUFSIZE);
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
@@ -187,7 +102,7 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
       // typedefed node
       ACE_OS::sprintf (nodename, "%s", node->fullname ());
       ACE_OS::sprintf (fname, "%s_var", node->fullname ());
-      ACE_OS::sprintf (lname, "%s_var", 
+      ACE_OS::sprintf (lname, "%s_var",
                        node->local_name ()->get_string ());
     }
   else
@@ -198,18 +113,18 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (), 
+          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (fname, "%s::_%s_var", parent->fullname (), 
+          ACE_OS::sprintf (fname, "%s::_%s_var", parent->fullname (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (lname, "_%s_var", 
+          ACE_OS::sprintf (lname, "_%s_var",
                            node->local_name ()->get_string ());
         }
       else
         {
           ACE_OS::sprintf (nodename, "_%s", node->fullname ());
           ACE_OS::sprintf (fname, "_%s_var", node->fullname ());
-          ACE_OS::sprintf (lname, "_%s_var", 
+          ACE_OS::sprintf (lname, "_%s_var",
                            node->local_name ()->get_string ());
         }
     }
@@ -240,7 +155,7 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   // copy constructor (deep copy)
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const " << fname 
+  *os << fname << "::" << lname << " (const " << fname
       << " &p) // copy constructor" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "this->ptr_ = " << nodename << "_dup (p.ptr_);" << be_uidt_nl;
@@ -257,10 +172,10 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   // assignment operator
   os->indent ();
   *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << nodename 
+  *os << fname << "::operator= (" << nodename
       << "_slice *p)" << be_nl;
   *os << "{" << be_idt_nl;
-  *os << "// is what we own the same that is being assigned to us?" 
+  *os << "// is what we own the same that is being assigned to us?"
       << be_nl;
   *os << "if (this->ptr_ != p)" << be_nl;
   *os << "{" << be_idt_nl;
@@ -274,14 +189,14 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   // assignment operator from _var
   os->indent ();
   *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (const " << fname 
+  *os << fname << "::operator= (const " << fname
       << " &p)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "if (this != &p)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "// not assigning to ourselves" << be_nl;
   *os << nodename << "_free (this->ptr_); // free old stuff" << be_nl;
-  *os << "this->ptr_ = " << nodename 
+  *os << "this->ptr_ = " << nodename
       << "_dup (p.ptr_);// deep copy" << be_uidt_nl;
   *os << "}" << be_nl;
   *os << "return *this;" << be_uidt_nl;
@@ -290,7 +205,7 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
   // other extra methods - cast operators ()
   os->indent ();
   *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << nodename 
+  *os << fname << "::operator " << nodename
       << "_slice * const &() const // cast" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "return this->ptr_;" << be_uidt_nl;
@@ -371,7 +286,7 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local names of the out class
   // save the node's local name and full name in a buffer for quick use later
-  // on 
+  // on
   ACE_OS::memset (nodename, '\0', NAMEBUFSIZE);
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
@@ -380,7 +295,7 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
       // typedefed node
       ACE_OS::sprintf (nodename, "%s", node->fullname ());
       ACE_OS::sprintf (fname, "%s_out", node->fullname ());
-      ACE_OS::sprintf (lname, "%s_out", 
+      ACE_OS::sprintf (lname, "%s_out",
                        node->local_name ()->get_string ());
     }
   else
@@ -391,18 +306,18 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (), 
+          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (fname, "%s::_%s_out", parent->fullname (), 
+          ACE_OS::sprintf (fname, "%s::_%s_out", parent->fullname (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (lname, "_%s_out", 
+          ACE_OS::sprintf (lname, "_%s_out",
                            node->local_name ()->get_string ());
         }
       else
         {
           ACE_OS::sprintf (nodename, "_%s", node->fullname ());
           ACE_OS::sprintf (fname, "_%s_out", node->fullname ());
-          ACE_OS::sprintf (lname, "_%s_out", 
+          ACE_OS::sprintf (lname, "_%s_out",
                            node->local_name ()->get_string ());
         }
     }
@@ -428,7 +343,7 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
   // constructor from _var &
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << nodename 
+  *os << fname << "::" << lname << " (" << nodename
       << "_var &p) // constructor from _var" << be_nl;
   *os << "  : ptr_ (p.out ())" << be_nl;
   *os << "{" << be_idt_nl;
@@ -439,7 +354,7 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
   // copy constructor
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const " << fname 
+  *os << fname << "::" << lname << " (const " << fname
       << " &p) // copy constructor" << be_nl;
   *os << "  : ptr_ (ACE_const_cast ("
       << fname << "&,p).ptr_)" << be_nl;
@@ -448,7 +363,7 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
   // assignment operator from _out &
   os->indent ();
   *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (const " << fname 
+  *os << fname << "::operator= (const " << fname
       << " &p)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "this->ptr_ = ACE_const_cast ("
@@ -461,7 +376,7 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
   // assignment operator from _ptr
   os->indent ();
   *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << nodename 
+  *os << fname << "::operator= (" << nodename
       << "_slice *p)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "this->ptr_ = p;" << be_nl;
@@ -471,7 +386,7 @@ be_visitor_array_ci::gen_out_impl (be_array *node)
   // other extra methods - cast operator ()
   os->indent ();
   *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << nodename 
+  *os << fname << "::operator " << nodename
       << "_slice *&() // cast" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "return this->ptr_;" << be_uidt_nl;
@@ -505,7 +420,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local names of the var
   // save the node's local name and full name in a buffer for quick use later
-  // on 
+  // on
   ACE_OS::memset (nodename, '\0', NAMEBUFSIZE);
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
@@ -514,7 +429,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
       // typedefed node
       ACE_OS::sprintf (nodename, "%s", node->fullname ());
       ACE_OS::sprintf (fname, "%s_forany", node->fullname ());
-      ACE_OS::sprintf (lname, "%s_forany", 
+      ACE_OS::sprintf (lname, "%s_forany",
                        node->local_name ()->get_string ());
     }
   else
@@ -525,18 +440,18 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (), 
+          ACE_OS::sprintf (nodename, "%s::_%s", parent->fullname (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (fname, "%s::_%s_forany", parent->fullname (), 
+          ACE_OS::sprintf (fname, "%s::_%s_forany", parent->fullname (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (lname, "_%s_forany", 
+          ACE_OS::sprintf (lname, "_%s_forany",
                            node->local_name ()->get_string ());
         }
       else
         {
           ACE_OS::sprintf (nodename, "_%s", node->fullname ());
           ACE_OS::sprintf (fname, "_%s_forany", node->fullname ());
-          ACE_OS::sprintf (lname, "_%s_forany", 
+          ACE_OS::sprintf (lname, "_%s_forany",
                            node->local_name ()->get_string ());
         }
     }
@@ -561,7 +476,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   // constr from a _slice *
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << nodename << "_slice *p, " 
+  *os << fname << "::" << lname << " (" << nodename << "_slice *p, "
       << "CORBA::Boolean nocopy)" << be_nl;
   *os << "  : ptr_ (p)," << be_nl;
   *os << "    nocopy_ (nocopy)" << be_nl;
@@ -570,7 +485,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   // copy constructor (deep copy)
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const " << fname 
+  *os << fname << "::" << lname << " (const " << fname
       << " &p) // copy constructor" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "this->ptr_ = " << nodename << "_dup (p.ptr_);" << be_nl;
@@ -588,7 +503,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   // assignment operator
   os->indent ();
   *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << nodename 
+  *os << fname << "::operator= (" << nodename
       << "_slice *p)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "// is what we own the same that is being assigned to us?" <<
@@ -605,14 +520,14 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
   // assignment operator from _forany
   os->indent ();
   *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (const " << fname 
+  *os << fname << "::operator= (const " << fname
       << " &p)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "if (this != &p)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "// not assigning to ourselves" << be_nl;
   *os << nodename << "_free (this->ptr_); // free old stuff" << be_nl;
-  *os << "this->ptr_ = " << nodename 
+  *os << "this->ptr_ = " << nodename
       << "_dup (p.ptr_);// deep copy" << be_nl;
   *os << "this->nocopy_ = p.nocopy_;" << be_uidt_nl;
   *os << "}" << be_nl;
@@ -630,7 +545,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
 
   os->indent ();
   *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << nodename 
+  *os << fname << "::operator " << nodename
       << "_slice *&() // cast " << be_nl;
   *os << "{" << be_idt_nl;
   *os << "return this->ptr_;" << be_uidt_nl;
@@ -698,4 +613,3 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
 
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
index 9e71a704bd0..bfb15e7af9e 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -66,14 +66,14 @@ int be_visitor_array_cs::visit_array (be_array *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local names of the var
   // save the node's local name and full name in a buffer for quick use later
-  // on 
+  // on
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   if (this->ctx_->tdef ())
     {
       // typedefed node
       ACE_OS::sprintf (fname, "%s", node->fullname ());
-      ACE_OS::sprintf (lname, "%s", 
+      ACE_OS::sprintf (lname, "%s",
                        node->local_name ()->get_string ());
     }
   else
@@ -84,15 +84,15 @@ int be_visitor_array_cs::visit_array (be_array *node)
       if (node->is_nested ())
         {
           be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (), 
+          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
                            node->local_name ()->get_string ());
-          ACE_OS::sprintf (lname, "_%s", 
+          ACE_OS::sprintf (lname, "_%s",
                            node->local_name ()->get_string ());
         }
       else
         {
           ACE_OS::sprintf (fname, "_%s", node->fullname ());
-          ACE_OS::sprintf (lname, "_%s", 
+          ACE_OS::sprintf (lname, "_%s",
                            node->local_name ()->get_string ());
         }
     }
@@ -111,6 +111,42 @@ int be_visitor_array_cs::visit_array (be_array *node)
   *os << "return _tao_dup_array;" << be_uidt_nl;
   *os << "}\n\n";
 
+  // alloc method
+  os->indent (); // start from current indentation
+  *os << fname << "_slice *" << be_nl;
+  *os << fname << "_alloc (void)" << be_nl;
+  *os << "{" << be_idt_nl;
+  *os << "return new ";
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_array_ci::"
+                         "visit_array - "
+                         "base type decl failed\n"),
+                        -1);
+    }
+
+  if (node->gen_dimensions (os) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_array::"
+                         "gen_client - "
+                         "dimensions codegen failed\n"),
+                        -1);
+    }
+
+  *os << ";" << be_uidt_nl;
+  *os << "}\n\n";
+
+  // free method
+  os->indent ();
+  *os << "void" << be_nl
+      << fname << "_free (" << fname
+      << "_slice *_tao_slice)" << be_nl;
+  *os << "{" << be_idt_nl;
+  *os << "delete [] _tao_slice;" << be_uidt_nl;
+  *os << "}\n\n";
+
   // copy method
   os->indent ();
   *os << "void " << be_nl;
@@ -215,7 +251,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
     }
   *os << be_uidt_nl << "}\n\n";
 
-#if 0 
+#if 0
   // typecode for anonymous arrays is not required since we do not generate the
   // Any operators for it and it cannot be used as a type
 
diff --git a/TAO/tests/DynAny_Test/basic_test.dsp b/TAO/tests/DynAny_Test/basic_test.dsp
index 4162af55a52..1a1a05a6bdf 100644
--- a/TAO/tests/DynAny_Test/basic_test.dsp
+++ b/TAO/tests/DynAny_Test/basic_test.dsp
@@ -7,19 +7,19 @@
 CFG=DynAny Basics - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

-!MESSAGE NMAKE /f "DynAny Basics.mak".

-!MESSAGE

+!MESSAGE 

+!MESSAGE NMAKE /f "basic_test.mak".

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

-!MESSAGE NMAKE /f "DynAny Basics.mak" CFG="DynAny Basics - Win32 Debug"

-!MESSAGE

+!MESSAGE 

+!MESSAGE NMAKE /f "basic_test.mak" CFG="DynAny Basics - Win32 Debug"

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "DynAny Basics - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "DynAny Basics - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -76,7 +76,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -187,13 +187,13 @@ SOURCE=.\da_tests.idl
 

 !IF  "$(CFG)" == "DynAny Basics - Win32 Release"

 

-USERDEP__DA_TE="..\..\..\bin\tao_idl.exe"

+USERDEP__DA_TE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\da_tests.idl

 InputName=da_tests

 

 BuildCmds= \

-	..\..\..\bin\tao_idl $(InputName).idl

+	..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -225,7 +225,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "DynAny Basics - Win32 Debug"

 

-USERDEP__DA_TE="..\..\..\bin\tao_idl.exe"

+USERDEP__DA_TE="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\da_tests.idl

 InputName=da_tests

@@ -261,7 +261,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/InterOp-Naming/client.dsp b/TAO/tests/InterOp-Naming/client.dsp
index 87792b7b796..fe654504468 100644
--- a/TAO/tests/InterOp-Naming/client.dsp
+++ b/TAO/tests/InterOp-Naming/client.dsp
@@ -7,19 +7,19 @@
 CFG=InterOp Naming Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "client.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "client.mak" CFG="InterOp Naming Client - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "InterOp Naming Client - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "InterOp Naming Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -76,7 +76,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -131,8 +131,8 @@ SOURCE=.\INS.idl
 

 !IF  "$(CFG)" == "InterOp Naming Client - Win32 Release"

 

-USERDEP__INS_I="..\..\..\bin\Release\tao_idl.exe"

-# Begin Custom Build - Invoking TAO idl compiler on INS.idl

+USERDEP__INS_I="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\INS.idl

 InputName=INS

 

@@ -169,8 +169,8 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "InterOp Naming Client - Win32 Debug"

 

-USERDEP__INS_I="..\..\..\bin\tao_idl.exe"

-# Begin Custom Build - Invoking TAO idl compiler on INS.idl

+USERDEP__INS_I="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\INS.idl

 InputName=INS

 

@@ -205,7 +205,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/InterOp-Naming/server.dsp b/TAO/tests/InterOp-Naming/server.dsp
index 9758d732199..dc839a9117a 100644
--- a/TAO/tests/InterOp-Naming/server.dsp
+++ b/TAO/tests/InterOp-Naming/server.dsp
@@ -7,23 +7,22 @@
 CFG=InterOp Naming Server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server.mak" CFG="InterOp Naming Server - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "InterOp Naming Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "InterOp Naming Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

+!MESSAGE "InterOp Naming Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "InterOp Naming Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -77,7 +76,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -92,7 +91,7 @@ SOURCE=.\INS.idl
 

 !IF  "$(CFG)" == "InterOp Naming Server - Win32 Release"

 

-# Begin Custom Build - Invoking TAO idl compiler on INS.idl

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\INS.idl

 InputName=INS

 

@@ -129,7 +128,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "InterOp Naming Server - Win32 Debug"

 

-# Begin Custom Build - Invoking TAO idl compiler on INS.idl

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\INS.idl

 InputName=INS

 

@@ -164,7 +163,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/Multiple_Inheritance/client.dsp b/TAO/tests/Multiple_Inheritance/client.dsp
index 597e103cb84..a650639ba7e 100644
--- a/TAO/tests/Multiple_Inheritance/client.dsp
+++ b/TAO/tests/Multiple_Inheritance/client.dsp
@@ -133,7 +133,7 @@ InputPath=.\Multiple_Inheritance.idl
 InputName=Multiple_Inheritance

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -171,7 +171,7 @@ InputPath=.\Multiple_Inheritance.idl
 InputName=Multiple_Inheritance

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/Multiple_Inheritance/server.dsp b/TAO/tests/Multiple_Inheritance/server.dsp
index e21db9eb48d..71919f97b01 100644
--- a/TAO/tests/Multiple_Inheritance/server.dsp
+++ b/TAO/tests/Multiple_Inheritance/server.dsp
@@ -137,7 +137,7 @@ InputPath=.\Multiple_Inheritance.idl
 InputName=Multiple_Inheritance

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -175,7 +175,7 @@ InputPath=.\Multiple_Inheritance.idl
 InputName=Multiple_Inheritance

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp
index 3fc2524dd7c..0e99900c5d2 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp
@@ -7,19 +7,19 @@
 CFG=Nested Upcall MT_Client Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "client.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "client.mak" CFG="Nested Upcall MT_Client Client - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Nested Upcall MT_Client Client - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Nested Upcall MT_Client Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -78,7 +78,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -137,13 +137,13 @@ SOURCE=.\MT_Client_Test.idl
 

 !IF  "$(CFG)" == "Nested Upcall MT_Client Client - Win32 Release"

 

-USERDEP__MT_CL="..\..\..\.\bin\Release\tao_idl.exe"

+USERDEP__MT_CL="..\..\..\.\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\MT_Client_Test.idl

 InputName=MT_Client_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -175,13 +175,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Nested Upcall MT_Client Client - Win32 Debug"

 

-USERDEP__MT_CL="..\..\..\..\bin\tao_idl.exe"

+USERDEP__MT_CL="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\MT_Client_Test.idl

 InputName=MT_Client_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -211,7 +211,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp
index 91591fd6dda..8d69f15c911 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp
@@ -7,19 +7,19 @@
 CFG=Nested Upcall MT_Client Server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server.mak" CFG="Nested Upcall MT_Client Server - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Nested Upcall MT_Client Server - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Nested Upcall MT_Client Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -78,7 +78,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -133,13 +133,13 @@ SOURCE=.\MT_Client_Test.idl
 

 !IF  "$(CFG)" == "Nested Upcall MT_Client Server - Win32 Release"

 

-USERDEP__MT_CL="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__MT_CL="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\MT_Client_Test.idl

 InputName=MT_Client_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -171,13 +171,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Nested Upcall MT_Client Server - Win32 Debug"

 

-USERDEP__MT_CL="..\..\..\..\bin\tao_idl.exe"

+USERDEP__MT_CL="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL Compiler

 InputPath=.\MT_Client_Test.idl

 InputName=MT_Client_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -207,7 +207,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/NestedUpcall/Reactor/client.dsp b/TAO/tests/NestedUpcall/Reactor/client.dsp
index e2e67171ba3..00e15c7f3f1 100644
--- a/TAO/tests/NestedUpcall/Reactor/client.dsp
+++ b/TAO/tests/NestedUpcall/Reactor/client.dsp
@@ -7,19 +7,19 @@
 CFG=Nested Upcall Reactor Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "client.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "client.mak" CFG="Nested Upcall Reactor Client - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Nested Upcall Reactor Client - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Nested Upcall Reactor Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -78,7 +78,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 TAOd.lib aced.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -137,13 +137,13 @@ SOURCE=.\Reactor.idl
 

 !IF  "$(CFG)" == "Nested Upcall Reactor Client - Win32 Release"

 

-USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\Reactor.idl

 InputName=Reactor

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -175,13 +175,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Nested Upcall Reactor Client - Win32 Debug"

 

-USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"

+USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL Compiler

 InputPath=.\Reactor.idl

 InputName=Reactor

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -211,7 +211,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/NestedUpcall/Reactor/server.dsp b/TAO/tests/NestedUpcall/Reactor/server.dsp
index cf538ca14ac..86ca1fe6f61 100644
--- a/TAO/tests/NestedUpcall/Reactor/server.dsp
+++ b/TAO/tests/NestedUpcall/Reactor/server.dsp
@@ -7,19 +7,19 @@
 CFG=Nested Upcall Reactor Server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server.mak" CFG="Nested Upcall Reactor Server - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Nested Upcall Reactor Server - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Nested Upcall Reactor Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -78,7 +78,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 TAOd.lib aced.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -137,13 +137,13 @@ SOURCE=.\Reactor.idl
 

 !IF  "$(CFG)" == "Nested Upcall Reactor Server - Win32 Release"

 

-USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\Reactor.idl

 InputName=Reactor

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -175,13 +175,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Nested Upcall Reactor Server - Win32 Debug"

 

-USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"

+USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL Compiler

 InputPath=.\Reactor.idl

 InputName=Reactor

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -211,7 +211,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp
index 4a18709092b..e5c7a04a4f1 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp
@@ -7,19 +7,19 @@
 CFG=Nested Upcall Triangle Initiator - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "initiator.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "initiator.mak" CFG="Nested Upcall Triangle Initiator - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Nested Upcall Triangle Initiator - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Nested Upcall Triangle Initiator - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -78,7 +78,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -133,13 +133,13 @@ SOURCE=.\Triangle_Test.idl
 

 !IF  "$(CFG)" == "Nested Upcall Triangle Initiator - Win32 Release"

 

-USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\Triangle_Test.idl

 InputName=Triangle_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -171,13 +171,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Nested Upcall Triangle Initiator - Win32 Debug"

 

-USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"

+USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL Compiler

 InputPath=.\Triangle_Test.idl

 InputName=Triangle_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -207,7 +207,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp
index 58596b0a479..f239c34655e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp
@@ -7,19 +7,19 @@
 CFG=Nested Upcall Triangle Server_A - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server_A.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server_A.mak" CFG="Nested Upcall Triangle Server_A - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Nested Upcall Triangle Server_A - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Nested Upcall Triangle Server_A - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -78,7 +78,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -133,13 +133,13 @@ SOURCE=.\Triangle_Test.idl
 

 !IF  "$(CFG)" == "Nested Upcall Triangle Server_A - Win32 Release"

 

-USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\Triangle_Test.idl

 InputName=Triangle_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -171,13 +171,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Nested Upcall Triangle Server_A - Win32 Debug"

 

-USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"

+USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL Compiler

 InputPath=.\Triangle_Test.idl

 InputName=Triangle_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -207,7 +207,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp
index f3577457378..16547770cca 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp
@@ -7,19 +7,19 @@
 CFG=Nested Upcall Triangle Server_B - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server_B.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server_B.mak" CFG="Nested Upcall Triangle Server_B - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Nested Upcall Triangle Server_B - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Nested Upcall Triangle Server_B - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -78,7 +78,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -133,13 +133,13 @@ SOURCE=.\Triangle_Test.idl
 

 !IF  "$(CFG)" == "Nested Upcall Triangle Server_B - Win32 Release"

 

-USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL compiler

 InputPath=.\Triangle_Test.idl

 InputName=Triangle_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -171,13 +171,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Nested Upcall Triangle Server_B - Win32 Debug"

 

-USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"

+USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO IDL Compiler

 InputPath=.\Triangle_Test.idl

 InputName=Triangle_Test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -207,7 +207,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/OctetSeq/OctetSeq.dsp b/TAO/tests/OctetSeq/OctetSeq.dsp
index 1735ba58424..c5834417d41 100644
--- a/TAO/tests/OctetSeq/OctetSeq.dsp
+++ b/TAO/tests/OctetSeq/OctetSeq.dsp
@@ -127,7 +127,7 @@ InputPath=.\test.idl
 InputName=test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\bin\Release\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -165,7 +165,7 @@ InputPath=.\test.idl
 InputName=test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/Param_Test/client.dsp b/TAO/tests/Param_Test/client.dsp
index a835f7bc23f..fe28f315e70 100644
--- a/TAO/tests/Param_Test/client.dsp
+++ b/TAO/tests/Param_Test/client.dsp
@@ -386,7 +386,7 @@ InputPath=.\param_test.idl
 InputName=param_test

 

 BuildCmds= \

-	tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i $(InputName).idl

+	..\..\..\bin\Release\tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i $(InputName).idl

 

 "$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -425,7 +425,7 @@ InputPath=.\param_test.idl
 InputName=param_test

 

 BuildCmds= \

-	tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl

+	..\..\..\bin\tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl

 

 "$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/Param_Test/server.dsp b/TAO/tests/Param_Test/server.dsp
index a90c5955005..b3c548aaf01 100644
--- a/TAO/tests/Param_Test/server.dsp
+++ b/TAO/tests/Param_Test/server.dsp
@@ -148,7 +148,7 @@ InputPath=.\param_test.idl
 InputName=param_test

 

 BuildCmds= \

-	tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i $(InputName).idl

+	..\..\..\bin\Release\tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i $(InputName).idl

 

 "$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -187,7 +187,7 @@ InputPath=.\param_test.idl
 InputName=param_test

 

 BuildCmds= \

-	tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i $(InputName).idl

+	..\..\..\bin\tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i $(InputName).idl

 

 "$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)