ChangeLogTag:Sun Jul 09 21:41:01 2000 Ossama Othman <ossama@uci.edu>

7 files changed, 35 insertions, 22 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 3b97b04412f..edb00158249 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Sun Jul 09 21:41:01 2000  Ossama Othman  <ossama@uci.edu>
+
+	* examples/Content_Server/SMI_Iterator/client.dsp:
+	* examples/Content_Server/SMI_Iterator/server.dsp:
+	* examples/Content_Server/AMI_Iterator/client.dsp:
+	* examples/Content_Server/AMI_Iterator/server.dsp:
+	* examples/Content_Server/AMI_Observer/client.dsp:
+	* examples/Content_Server/AMI_Observer/server.dsp:
+
+	  Fixed preprocessor include path and library path in the
+	  "Release" configuration.  Removed extraneous directories from
+	  both of these paths in all configurations.
+
 Sun Jul 09 19:31:47 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
         * test/Exposed_Policies/Server.dsp:
@@ -471,7 +484,7 @@ Wed Jul  5 20:00:00 2000  Bruce Trask  <brucetrask@aol.com>
           reply send.  Changed TAO_DynamicImplementation::_dispatch so
           that it send the reply after the upcall.
 
-        * tao_idl\be\be_visitor_interface\interface_ss.cpp:
+        * tao_idl/be/be_visitor_interface/interface_ss.cpp:
           Added call to synchronous_upcall_dispatch which will initiate
           the reply for synchronous calls.
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.dsp b/TAO/examples/Content_Server/AMI_Iterator/client.dsp
index 4ed9ace0247..d418b66be9b 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.dsp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\..\ACE_wrappers\TAO\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.dsp b/TAO/examples/Content_Server/AMI_Iterator/server.dsp
index 88b789ebfb9..0475519328b 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.dsp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\ACE_wrappers\TAO\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

diff --git a/TAO/examples/Content_Server/AMI_Observer/client.dsp b/TAO/examples/Content_Server/AMI_Observer/client.dsp
index de12d09059c..3aeae0e8f3b 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.dsp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\..\ACE_wrappers\TAO\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /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:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

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

 

@@ -118,7 +118,7 @@ SOURCE=.\Push_Web_Server.idl
 !IF  "$(CFG)" == "AMI_Observer Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

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

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Push_Web_Server.idl

 InputName=Push_Web_Server

@@ -157,7 +157,7 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "AMI_Observer Client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

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

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Push_Web_Server.idl

 InputName=Push_Web_Server

diff --git a/TAO/examples/Content_Server/AMI_Observer/server.dsp b/TAO/examples/Content_Server/AMI_Observer/server.dsp
index e7c09d82dc2..2a695042250 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.dsp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\ACE_wrappers\TAO\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /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:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

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

 

@@ -97,15 +97,15 @@ SOURCE=.\Push_Iterator_Factory_i.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\server.cpp

+SOURCE=.\Push_Web_ServerC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Push_Web_ServerC.cpp

+SOURCE=.\Push_Web_ServerS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Push_Web_ServerS.cpp

+SOURCE=.\server.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -142,7 +142,7 @@ SOURCE=.\Push_Web_Server.idl
 !IF  "$(CFG)" == "AMI_Observer Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

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

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Push_Web_Server.idl

 InputName=Push_Web_Server

@@ -181,7 +181,7 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "AMI_Observer Server - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

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

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Push_Web_Server.idl

 InputName=Push_Web_Server

diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.dsp b/TAO/examples/Content_Server/SMI_Iterator/client.dsp
index 8aff12187f2..cf5cb173277 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.dsp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\..\ACE_wrappers\TAO\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /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:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

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

 

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.dsp b/TAO/examples/Content_Server/SMI_Iterator/server.dsp
index ad23fd7898d..64897ceb4e5 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.dsp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\ACE_wrappers\TAO\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /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:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

 

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

 

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\ACE_wrappers" /I "..\..\..\ACE_wrappers\TAO\\" /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I "..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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