*** empty log message ***

9 files changed, 185 insertions, 87 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index a7697ba2ca8..ded353898de 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,23 @@
+Fri Mar 20 00:36:16 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* tao/poa.cpp (dispatch_servant_i): The POA Current was not being
+ 	  setup correctly.  It was used before it was created. Fix was to
+ 	  change the order of things in dispatch_servant_i() and restored
+ 	  pre_invoke() to its original state.
+
+	* tests/POA/Generic_Servant/client.cpp (main): Make sure the
+ 	  client does not crash if the user does not provide an IOR.
+
+	* tests/POA/Generic_Servant/MyFooServant.h (MyFooServant): Added
+ 	  export macro so that the class gets properly included in the
+ 	  DLL.
+
+	* TAO_IDL/GenExportH.BAT: Changed %1% to %1.
+
+	* tests/POA/Generic_Servant/generic_servant_export.h: The server
+ 	  lib will now be created as a DLL instead of as a static library.
+  	  New file was added to get the exports right.
+
 Thu Mar 19 18:42:20 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* TAO_IDL/be/be_visitor_attribute.cpp (visit_attribute): Undefined
diff --git a/TAO/TAO_IDL/GenExportH.BAT b/TAO/TAO_IDL/GenExportH.BAT
index f60e420b3f0..2c56945b0ac 100755
--- a/TAO/TAO_IDL/GenExportH.BAT
+++ b/TAO/TAO_IDL/GenExportH.BAT
@@ -8,39 +8,39 @@ REM
 REM Author: Nanbor Wang <nanbor@cs.wustl.edu>
 REM
 
-if "%1%" == "" goto emptyexport
+if "%1" == "" goto emptyexport
 Echo // Definition for Win32 Export directives.
 Echo // This file is generated automatically by
 Echo // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
 Echo // ------------------------------
-Echo #if !defined (%1%_EXPORT_H)
-Echo #define %1%_EXPORT_H
+Echo #if !defined (%1_EXPORT_H)
+Echo #define %1_EXPORT_H
 Echo.
 Echo #include "ace/OS.h"
 Echo.
-Echo #if defined (%1%_HAS_DLL) 
-Echo #  if (%1%_HAS_DLL == 1)
-Echo #    if defined (%1%_BUILD_DLL)
-Echo #      define %1%_Export ACE_Proper_Export_Flag
-Echo #      define %1%_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-Echo #      define %1%_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
+Echo #if defined (%1_HAS_DLL) 
+Echo #  if (%1_HAS_DLL == 1)
+Echo #    if defined (%1_BUILD_DLL)
+Echo #      define %1_Export ACE_Proper_Export_Flag
+Echo #      define %1_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+Echo #      define %1_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
 Echo #    else
-Echo #      define %1%_Export ACE_Proper_Import_Flag
-Echo #      define %1%_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-Echo #      define %1%_SINGLETON_INSTANTIATION(T)
-Echo #    endif /* %1%_BUILD_DLL */
+Echo #      define %1_Export ACE_Proper_Import_Flag
+Echo #      define %1_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+Echo #      define %1_SINGLETON_INSTANTIATION(T)
+Echo #    endif /* %1_BUILD_DLL */
 Echo #  else 
-Echo #    define %1%_Export
-Echo #    define %1%_SINGLETON_DECLARATION(T)
-Echo #    define %1%_SINGLETON_INSTANTIATION(T)
-Echo #  endif   /* ! %1%_HAS_DLL == 1 */
+Echo #    define %1_Export
+Echo #    define %1_SINGLETON_DECLARATION(T)
+Echo #    define %1_SINGLETON_INSTANTIATION(T)
+Echo #  endif   /* ! %1_HAS_DLL == 1 */
 Echo #else
-Echo #  define %1%_Export
-Echo #  define %1%_SINGLETON_DECLARATION(T)
-Echo #  define %1%_SINGLETON_INSTANTIATION(T)
-Echo #endif     /* %1%_HAS_DLL */
+Echo #  define %1_Export
+Echo #  define %1_SINGLETON_DECLARATION(T)
+Echo #  define %1_SINGLETON_INSTANTIATION(T)
+Echo #endif     /* %1_HAS_DLL */
 Echo.
-Echo #endif     /* %1%_EXPORT_H */
+Echo #endif     /* %1_EXPORT_H */
 Echo            // End of auto generated file.
 goto endrun
 :emptyexport
diff --git a/TAO/tao/poa.cpp b/TAO/tao/poa.cpp
index f9b599d9974..9c4fa7f8ff8 100644
--- a/TAO/tao/poa.cpp
+++ b/TAO/tao/poa.cpp
@@ -2484,6 +2484,12 @@ TAO_POA::dispatch_servant_i (const TAO_ObjectKey &key,
   // const char *operation = req.operation ();
   const char *operation = req.op_name ();
 
+  // Setup for POA Current
+  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
+  TAO_POA_Current current_context;
+  // Set the current context and remember the old one
+  TAO_POA_Current *previous_context = orb_core->poa_current (&current_context);
+
   PortableServer::Servant servant = this->locate_poa_and_servant_i (key,
                                                                     operation,
                                                                     id_out,
@@ -2493,12 +2499,13 @@ TAO_POA::dispatch_servant_i (const TAO_ObjectKey &key,
     return;
 
   // Setup for upcall
-  TAO_POA_Current upcall_context (poa, key, id.in (), servant);
-  TAO_POA_Current *previous_context;
-  poa->pre_invoke (upcall_context,
-                   previous_context,
+  poa->pre_invoke (key,
+                   id.in (),
+		   servant,
+                   &current_context,
                    env);
-
+  
+  // Upcall
   servant->_dispatch (req,
                       context,
                       env);
@@ -2506,30 +2513,35 @@ TAO_POA::dispatch_servant_i (const TAO_ObjectKey &key,
   // Cleanup from upcall
   poa->post_invoke (servant,
                     operation,
-                    previous_context,
+                    &current_context,
                     env);
+  
+  // Reset old context
+  orb_core->poa_current (previous_context);
+
 }
 
 void
-TAO_POA::pre_invoke (TAO_POA_Current &upcall_context,
-                     TAO_POA_Current *&previous_context,
+TAO_POA::pre_invoke (const TAO_ObjectKey &key,
+                     const PortableServer::ObjectId &id,
+		     PortableServer::Servant servant,
+                     TAO_POA_Current *poa_current,
                      CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (env);
 
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  previous_context = orb_core->poa_current (&upcall_context);
+  poa_current->POA_impl (this);
+  poa_current->object_key (key);
+  poa_current->object_id (id);
+  poa_current->servant (servant);
 }
 
 void
 TAO_POA::post_invoke (PortableServer::Servant servant,
                       const char *operation,
-                      TAO_POA_Current *previous_context,
+                      TAO_POA_Current *poa_current,
                       CORBA::Environment &env)
 {
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  TAO_POA_Current *poa_current = orb_core->poa_current (previous_context);
-
   PortableServer::ServantLocator::Cookie cookie = poa_current->locator_cookie ();
 
   if (cookie != 0)
diff --git a/TAO/tao/poa.h b/TAO/tao/poa.h
index 965285fd9d1..7feb78a5fff 100644
--- a/TAO/tao/poa.h
+++ b/TAO/tao/poa.h
@@ -619,13 +619,15 @@ protected:
                                    void *context,
                                    CORBA::Environment &env);
 
-  virtual void pre_invoke (TAO_POA_Current &upcall_context,
-                           TAO_POA_Current *&previous_context,
+  virtual void pre_invoke (const TAO_ObjectKey &key,
+                           const PortableServer::ObjectId &id,
+                           PortableServer::Servant servant,
+                           TAO_POA_Current *poa_current,
                            CORBA::Environment &env);
 
   virtual void post_invoke (PortableServer::Servant servant,
                             const char *operation,
-                            TAO_POA_Current *previous_context,
+                            TAO_POA_Current *poa_current,
                             CORBA::Environment &env);
 
   virtual CORBA::Boolean persistent (void);
diff --git a/TAO/tests/POA/Generic_Servant/MyFooServant.h b/TAO/tests/POA/Generic_Servant/MyFooServant.h
index 008bbcf788f..f91aa7c3aec 100644
--- a/TAO/tests/POA/Generic_Servant/MyFooServant.h
+++ b/TAO/tests/POA/Generic_Servant/MyFooServant.h
@@ -18,7 +18,7 @@
 
 #include "FooS.h"
 
-class MyFooServant : public POA_Foo
+class GENERIC_SERVANT_Export MyFooServant : public POA_Foo
 {
 public:
   // constructor - takes a POA and a value parameter
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
index e7223605efa..18b75d1e86f 100644
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ b/TAO/tests/POA/Generic_Servant/client.cpp
@@ -49,7 +49,7 @@ parse_args (int argc, char **argv)
 
   if (IOR == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Please specify the IOR for the servant"), -1);
+                       "Please specify the IOR for the servant\n"), -1);
 
   // Indicates successful parsing of command line.
   return 0;
@@ -100,7 +100,9 @@ main (int argc, char **argv)
     }
 
   // Initialize options based on command-line arguments.
-  parse_args (argc, argv);
+  int parse_args_result = parse_args (argc, argv);
+  if (parse_args_result != 0)
+    return parse_args_result;
 
   // Get an object reference from the argument string.
   CORBA::Object_var object = orb->string_to_object (IOR, env);
diff --git a/TAO/tests/POA/Generic_Servant/client.dsp b/TAO/tests/POA/Generic_Servant/client.dsp
index 2733f8d3542..4ee9d087ee9 100644
--- a/TAO/tests/POA/Generic_Servant/client.dsp
+++ b/TAO/tests/POA/Generic_Servant/client.dsp
@@ -95,26 +95,28 @@ SOURCE=.\Foo.idl
 

 # Begin Custom Build

 InputPath=.\Foo.idl

+InputName=Foo

 

 BuildCmds= \

-	..\..\..\tao_idl\tao_idl Foo.idl

+	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

+ -Wb,export_include=generic_servant_export.h $(InputName).idl

 

-"FooS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"FooC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

@@ -122,26 +124,28 @@ BuildCmds= \
 

 # Begin Custom Build

 InputPath=.\Foo.idl

+InputName=Foo

 

 BuildCmds= \

-	..\..\..\tao_idl\tao_idl Foo.idl

+	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

+ -Wb,export_include=generic_servant_export.h $(InputName).idl

 

-"FooS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"FooS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

diff --git a/TAO/tests/POA/Generic_Servant/generic_servant_export.h b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
new file mode 100644
index 00000000000..ad0e36483ab
--- /dev/null
+++ b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
@@ -0,0 +1,33 @@
+// Definition for Win32 Export directives.
+// This file is generated automatically by
+// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
+// ------------------------------
+#if !defined (GENERIC_SERVANT_EXPORT_H)
+#define GENERIC_SERVANT_EXPORT_H
+
+#include "ace/OS.h"
+
+#if defined (GENERIC_SERVANT_HAS_DLL)
+#  if (GENERIC_SERVANT_HAS_DLL == 1)
+#    if defined (GENERIC_SERVANT_BUILD_DLL)
+#      define GENERIC_SERVANT_Export ACE_Proper_Export_Flag
+#      define GENERIC_SERVANT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#      define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
+#    else
+#      define GENERIC_SERVANT_Export ACE_Proper_Import_Flag
+#      define GENERIC_SERVANT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#      define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
+#    endif /* GENERIC_SERVANT_BUILD_DLL */
+#  else
+#    define GENERIC_SERVANT_Export
+#    define GENERIC_SERVANT_SINGLETON_DECLARATION(T)
+#    define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
+#  endif   /* ! GENERIC_SERVANT_HAS_DLL == 1 */
+#else
+#  define GENERIC_SERVANT_Export
+#  define GENERIC_SERVANT_SINGLETON_DECLARATION(T)
+#  define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
+#endif     /* GENERIC_SERVANT_HAS_DLL */
+
+#endif     /* GENERIC_SERVANT_EXPORT_H */
+           // End of auto generated file.
diff --git a/TAO/tests/POA/Generic_Servant/server.dsp b/TAO/tests/POA/Generic_Servant/server.dsp
index c2c99772337..78b16995046 100644
--- a/TAO/tests/POA/Generic_Servant/server.dsp
+++ b/TAO/tests/POA/Generic_Servant/server.dsp
@@ -2,7 +2,7 @@
 # Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

 CFG=server - Win32 Debug

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

@@ -17,56 +17,77 @@ CFG=server - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

 

 !IF  "$(CFG)" == "server - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Output_Dir "server__"

+# PROP BASE Intermediate_Dir "server__"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

+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:windows /dll /machine:I386

+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "server - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "server_0"

+# PROP BASE Intermediate_Dir "server_0"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

+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:windows /dll /debug /machine:I386 /pdbtype:sept

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

+# SUBTRACT LINK32 /pdb:none

+# Begin Special Build Tool

+SOURCE=$(InputPath)

+PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\

+ ..\On_Demand_Activation

+PostBuild_Cmds=copy server.dll ..\Explicit_Activation	copy server.dll\

+ ..\On_Demand_Activation

+# End Special Build Tool

 

 !ENDIF 

 

@@ -82,26 +103,28 @@ SOURCE=.\Foo.idl
 

 # Begin Custom Build

 InputPath=.\Foo.idl

+InputName=Foo

 

 BuildCmds= \

-	..\..\..\tao_idl\tao_idl Foo.idl

+	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

+ -Wb,export_include=generic_servant_export.h $(InputName).idl

 

-"FooS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"FooC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

@@ -109,26 +132,28 @@ BuildCmds= \
 

 # Begin Custom Build

 InputPath=.\Foo.idl

+InputName=Foo

 

 BuildCmds= \

-	..\..\..\tao_idl\tao_idl Foo.idl

+	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

+ -Wb,export_include=generic_servant_export.h $(InputName).idl

 

-"FooS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"FooS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"FooC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build