diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-13 04:11:50 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-13 04:11:50 +0000 |
| commit | d2510c220db6dd71318391b0d90df696cfc37ffa (patch) | |
| tree | 26fc2556f76697ce186883153526d123bb458fed | |
| parent | e58bf0f642defb1ac6ee8e2938ba4608fa057e2e (diff) | |
| download | ATCD-d2510c220db6dd71318391b0d90df696cfc37ffa.tar.gz | |
ChangeLogTag:Mon Jun 12 20:45:18 2000 Darrell Brunsch <brunsch@uci.edu>
24 files changed, 859 insertions, 224 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4c869f7bc5f..85192b23eca 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,53 @@ +Mon Jun 12 20:45:18 2000 Darrell Brunsch <brunsch@uci.edu> + + * TAO-INSTALL.html: + + So going back to figuring out how to provide the easiest way + to build the relevant stuff. So going back on my services.dsw + change, I made TAOACE.dsw the big master dsw file for all the + libraries and services that can be used by CORBA apps. + + * orbsvcs/services.dsw: (removed) + + Well, she lasted a good 4 days. Since TAOACE now has these + files, this really isn't needed anymore. + + * TAOACE.dsw: + * TAOACE_Static.dsw: + + Beefed up these projects a bit more. They now have all + the orbsvcs libraries and all the services. So these should + be your one-stop compilation place for ACE/TAO. Well, unless + you want the examples and tests and stuff (see + msvc_auto_compile.pl for that). + + * TAO_IDL/tao_idl_static.dsp: + * examples/Simple/time/client_static.dsp: + * examples/Simple/time/server_static.dsp: + * orbsvcs/orbsvcs/AV_Static.dsp: + * orbsvcs/orbsvcs/CosConcurrency_Static.dsp: + * orbsvcs/orbsvcs/CosEvent_Static.dsp: + * orbsvcs/orbsvcs/CosLifeCycle_Static.dsp: + * orbsvcs/orbsvcs/CosNaming_Static.dsp: + * orbsvcs/orbsvcs/CosNotification_Static.dsp: + * orbsvcs/orbsvcs/CosProperty_Static.dsp: + * orbsvcs/orbsvcs/CosTime_Static.dsp: + * orbsvcs/orbsvcs/CosTrading_Static.dsp: + * orbsvcs/orbsvcs/DsLogAdmin_Static.dsp: + * orbsvcs/orbsvcs/LoadBalancing_Static.dsp: + * orbsvcs/orbsvcs/RTEvent_Static.dsp: + * orbsvcs/orbsvcs/RTOLDEvent_Static.dsp: + * orbsvcs/orbsvcs/RTSchedEvent_Static.dsp: + * orbsvcs/orbsvcs/RTSched_Static.dsp: + * orbsvcs/orbsvcs/Svc_Utils_Static.dsp: + * tao/TAO_Static.dsp: + + Fixed to build again. Mainly missing ACE_OS_HAS_DLL=0. + + * orbsvcs/orbsvcs/orbsvcs.dsw: + + Added some missing dependencies. + Mon Jun 12 13:24:43 2000 Ossama Othman <ossama@uci.edu> * orbsvcs/tests/LoadBalancing/client.dsp: diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html index e0506b7df61..6f1d68799bd 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -42,14 +42,14 @@ <P>Any UNIX/POSIX/Win32 variation is a potential target platform for ACE. If you have <A -HREF="http://www.cs.wustl.edu/~schmidt/docs/ACE-porting.html">porting +HREF="../docs/ACE-porting.html">porting questions</A> or have a problem compiling the ACE wrappers on the platforms shown above please send email to either <A HREF="news:comp.soft-sys.ace">ACE Newsgroup</A> or the <A HREF="mailto:ace-users@cs.wustl.edu">ACE mailing list</A> and we'll try to help you fix the problems. You can also submit bug reports and enhancement requests in our -<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/usage-bugzilla.html">bug tracking system</a>.<P> +<a href="../docs/usage-bugzilla.html">bug tracking system</a>.<P> TAO can be obtained <A HREF="http://www.cs.wustl.edu/~schmidt/TAO-obtain.html">electronically</A> @@ -70,7 +70,7 @@ likely unpredictable and erroneous results. <P> <OL> <LI>Set <CODE>ACE_ROOT</CODE> environment variable as outlined in - the <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">ACE + the <a href="../ACE-INSTALL.html">ACE installation notes</A>.<P> <LI>Build and install ACE under <CODE>$ACE_ROOT</CODE>.<P> @@ -130,7 +130,7 @@ GNU Make can be obtained from various places in source form.<P> If you are building TAO for a VxWorks target, please see the detailed instructions for building and installing ACE and TAO in <a -href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html#vxworks">$ACE_ROOT/ACE-INSTALL.html</a>.<p> +href="../ACE-INSTALL.html#vxworks">$ACE_ROOT/ACE-INSTALL.html</a>.<p> Cross-compiling TAO is not much different than building it for self-host. The one major difference is that TAO's IDL compiler must @@ -196,7 +196,7 @@ be found in the <a href="docs/compiler.html#idl_env">TAO_IDL documentation.</a>< <P>It is also advisable to set either the <CODE>ACE_ROOT</CODE> environment variable as outlined in the -<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">ACE +<a href="../ACE-INSTALL.html">ACE installation notes</A> or the <code>TAO_ROOT</code> environment variable. This is only required if you are planning to use the <orb.idl> standard include in your IDL code. Notice that some of the TAO services @@ -209,7 +209,7 @@ href="http://www.torus-software.com/corba/">CORBA Page</a> which contains very helpful information on setting MSVC project settings for TAO applications.</P> -Remember to <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">set +Remember to <a href="../ACE-INSTALL.html">set up ACE</A> before building TAO. <H4>Visual C++ 5.0/6.0</H4> @@ -244,21 +244,9 @@ files in the correct place.</P> <H4><A NAME="taoace">TAOACE.dsw and other collection dsw files</A></H4> <P>TAOACE.dsw is a Visual C++ 5.0/6.0 workspace that loads the projects -ACE, TAO, TAO_IDL (the compiler), gperf, the Naming Service executable, and -the orbsvcs libraries needed by the Naming Service. </P> - -<P>TAOACE.dsw does not compile all the libraries and services though. For -this you'll also need to load <CODE>orbsvcs\orbsvcs\orbsvcs.dsw</CODE> and -<CODE>orbsvcs\services.dsw</CODE>. Like TAOACE, these workspaces have -dependencies set up between their processes, so they get compiled in the -right order (but you still need to make sure that you compile TAOACE before -orbsvcs, and orbsvcs before services).</P> - -<P>The difference between orbsvcs and services is that orbsvcs.dsw produces -the libraries for use of the services within executables, whereas -services.dsw creates separate executables for some of the services. With -orbsvcs you get the ability to have colocated services, and with services -you get stand-alone services.</P> +ACE, TAO, TAO_IDL (the compiler), gperf, the orb services libraries, and +the standalone executables (such as Naming Service, etc.). It can be +used to build all the files needed to build/run TAO applications.</P> <H4>Borland C++ Builder</H4> <P> @@ -283,18 +271,18 @@ C/C++ settings under Input.</P> <H4>Creating Static Libraries (*.lib)</H4> <P>TAO, orbsvcs, TAO_IDL, and the Simple Test all have extra project files -for static library builds. TAOACE_static.dsw contains all these projects, -and is set up much like <A HREF="#taoace">TAOACE.dsw</A>. To use the static -libraries in a project, make sure to the following settings are used in -the Project Settings.</P> +for static library builds. TAOACE_static.dsw contains some of these projects, +and is set up much like <A HREF="#taoace">TAOACE.dsw</A>, except that there +are not as many static projects as their are dynamic projects and their +isn't the same dependencies set up.</P> + +<P> To use the static libraries in a project, make sure to the following +settings are used in the Project Settings.</P> <UL> <LI><strong>C/C++ | General:</strong> Add the Preprocessor Definitions - <CODE>TAO_HAS_DLL=0</CODE>, <CODE>ACE_HAS_DLL=0</CODE> and - <CODE>__ACE_INLINE__=0</CODE> - <LI><strong>C/C++ | Code Generation:</strong> Change Run-time - library to <CODE>Debug Multithreaded</CODE> (or - <CODE>Multithreaded</CODE> for Release) + <CODE>ACE_HAS_DLL=0</CODE>, <CODE>ACE_OS_HAS_DLL=0</CODE> and whatever + other libraries that are included (such as <CODE>TAO_HAS_DLL=0</CODE>) <LI><strong>Link:</strong> Link with the static libs, such as TAOs.lib or TAOsd.lib </UL> diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw index 9775174947a..d8171a86fc7 100644 --- a/TAO/TAOACE.dsw +++ b/TAO/TAOACE.dsw @@ -15,6 +15,138 @@ Package=<4> ###############################################################################
+Project: "AV"=.\orbsvcs\orbsvcs\AV.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosProperty
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosTrading
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Concurrency_Service"=.\orbsvcs\Concurrency_Service\Concurrency_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosConcurrency
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "CosConcurrency"=.\orbsvcs\orbsvcs\CosConcurrency.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "CosEvent"=.\orbsvcs\orbsvcs\CosEvent.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "CosEvent_Service"=.\orbsvcs\CosEvent_Service\CosEvent_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "CosLifeCycle"=.\orbsvcs\orbsvcs\CosLifeCycle.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "CosNaming"=.\orbsvcs\orbsvcs\CosNaming.dsp - Package Owner=<4>
Package=<5>
@@ -30,6 +162,225 @@ Package=<4> ###############################################################################
+Project: "CosNotification"=.\orbsvcs\orbsvcs\CosNotification.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosTrading
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "CosProperty"=.\orbsvcs\orbsvcs\CosProperty.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "CosTime"=.\orbsvcs\orbsvcs\CosTime.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "CosTrading"=.\orbsvcs\orbsvcs\CosTrading.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "DsLogAdmin"=.\orbsvcs\orbsvcs\DsLogAdmin.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosTrading
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Svc Utils
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Dump_Schedule"=.\orbsvcs\Dump_Schedule\Dump_Schedule.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Event_Service"=.\orbsvcs\Event_Service\Event_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTOLDEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSchedEvent
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ImplRepo_Service"=.\orbsvcs\ImplRepo_Service\implrepo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ACE DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Svc Utils
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "LifeCycle_Service"=.\orbsvcs\LifeCycle_Service\LifeCycle_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosLifeCycle
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosTrading
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "LoadBalancing"=.\orbsvcs\orbsvcs\LoadBalancing.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "NT_Naming_Service"=.\orbsvcs\Naming_Service\NT_Naming_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "Naming_Service"=.\orbsvcs\Naming_Service\Naming_Service.dsp - Package Owner=<4>
Package=<5>
@@ -45,6 +396,141 @@ Package=<4> ###############################################################################
+Project: "Notify_Service"=.\orbsvcs\Notify_Service\Notify_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNotification
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "RTEvent"=.\orbsvcs\orbsvcs\RTEvent.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Svc Utils
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "RTOLDEvent"=.\orbsvcs\orbsvcs\RTOLDEvent.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "RTSched"=.\orbsvcs\orbsvcs\RTSched.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Svc Utils
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "RTSchedEvent"=.\orbsvcs\orbsvcs\RTSchedEvent.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO_IDL Compiler
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Scheduling_Service"=.\orbsvcs\Scheduling_Service\Scheduling_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "Svc Utils"=.\orbsvcs\orbsvcs\Svc_Utils.dsp - Package Owner=<4>
Package=<5>
@@ -96,6 +582,27 @@ Package=<4> ###############################################################################
+Project: "Trading_Service"=.\orbsvcs\Trading_Service\Trading_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name CosNaming
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name CosTrading
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Svc Utils
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "gperf"=..\apps\gperf\src\gperf.dsp - Package Owner=<4>
Package=<5>
@@ -126,6 +633,18 @@ Package=<4> ###############################################################################
+Project: "tao_imr"=.\orbsvcs\ImplRepo_Service\tao_imr.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Global:
Package=<5>
diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw index a45a8865a4b..70518a8e82a 100644 --- a/TAO/TAOACE_Static.dsw +++ b/TAO/TAOACE_Static.dsw @@ -15,7 +15,139 @@ Package=<4> ###############################################################################
-Project: "ORB Services Static"=.\orbsvcs\orbsvcs\orbsvcs_static.dsp - Package Owner=<4>
+Project: "AV_Static"=.\orbsvcs\orbsvcs\AV_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "CosConcurrency_Static"=.\orbsvcs\orbsvcs\CosConcurrency_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "CosEvent_Static"=.\orbsvcs\orbsvcs\CosEvent_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "CosLifeCycle_Static"=.\orbsvcs\orbsvcs\CosLifeCycle_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "CosNaming_Static"=.\orbsvcs\orbsvcs\CosNaming_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "CosNotification_Static"=.\orbsvcs\orbsvcs\CosNotification_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "CosProperty_Static"=.\orbsvcs\orbsvcs\CosProperty_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "CosTime_Static"=.\orbsvcs\orbsvcs\CosTime_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "CosTrading_Static"=.\orbsvcs\orbsvcs\CosTrading_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "DsLogAdmin_Static"=.\orbsvcs\orbsvcs\DsLogAdmin_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "LoadBalancing_Static"=.\orbsvcs\orbsvcs\LoadBalancing_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Naming Service Static"=.\orbsvcs\Naming_Service\Naming_Server_static.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -24,10 +156,19 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name ACE static library
+ Project_Dep_Name ACE LIB
End Project Dependency
Begin Project Dependency
- Project_Dep_Name TAO Static
+ Project_Dep_Name CosNaming_Static
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name gperf
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Svc_Utils_Static
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TAO LIB
End Project Dependency
Begin Project Dependency
Project_Dep_Name TAO_IDL Compiler Static
@@ -36,6 +177,66 @@ Package=<4> ###############################################################################
+Project: "RTEvent_Static"=.\orbsvcs\orbsvcs\RTEvent_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "RTOLDEvent_Static"=.\orbsvcs\orbsvcs\RTOLDEvent_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "RTSchedEvent_Static"=.\orbsvcs\orbsvcs\RTSchedEvent_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "RTSched_Static"=.\orbsvcs\orbsvcs\RTSched_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Svc_Utils_Static"=.\orbsvcs\orbsvcs\Svc_Utils_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "TAO LIB"=.\tao\TAO_Static.dsp - Package Owner=<4>
Package=<5>
@@ -44,6 +245,18 @@ Package=<5> Package=<4>
{{{
+}}}
+
+###############################################################################
+
+Project: "TAO_IDL Compiler Static"=.\TAO_IDL\tao_idl_static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
Begin Project Dependency
Project_Dep_Name ACE LIB
End Project Dependency
@@ -51,7 +264,7 @@ Package=<4> ###############################################################################
-Project: "TAO_IDL Compiler Static"=.\TAO_IDL\tao_idl_static.dsp - Package Owner=<4>
+Project: "gperf"=..\apps\gperf\src\gperf.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -60,15 +273,27 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name ACE static library
+ Project_Dep_Name ACE LIB
End Project Dependency
Begin Project Dependency
- Project_Dep_Name ACE LIB
+ Project_Dep_Name gperf_lib
End Project Dependency
}}}
###############################################################################
+Project: "gperf_lib"=..\apps\gperf\src\gperf_lib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Global:
Package=<5>
diff --git a/TAO/TAO_IDL/tao_idl_static.dsp b/TAO/TAO_IDL/tao_idl_static.dsp index 566c635cc7d..c55ecaec9ce 100644 --- a/TAO/TAO_IDL/tao_idl_static.dsp +++ b/TAO/TAO_IDL/tao_idl_static.dsp @@ -68,7 +68,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 "include" /I "be_include" /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "../../" /D "_CONSOLE" /D "_MBCS" /D "ACE_NO_INLINE" /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/TAO/examples/Simple/time/client_static.dsp b/TAO/examples/Simple/time/client_static.dsp index d4bda16e5fb..43500e58eb1 100644 --- a/TAO/examples/Simple/time/client_static.dsp +++ b/TAO/examples/Simple/time/client_static.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "client"
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D TAO_NAMING_HAS_DLL=0 /D TAO_SVC_UTILS_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D TAO_NAMING_HAS_DLL=0 /D TAO_SVC_UTILS_HAS_DLL=0 /D "ACE_NO_INLINE" /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-# ADD LINK32 acesd.lib TAOsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 advapi32.lib acesd.lib TAOsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "Simple Time Client Static - Win32 Static Release"
@@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "client"
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D TAO_NAMING_HAS_DLL=0 /D TAO_SVC_UTILS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D TAO_NAMING_HAS_DLL=0 /D TAO_SVC_UTILS_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-# ADD LINK32 TAO_CosNamings.lib TAO_Svc_Utilss.lib TAOs.lib aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 TAO_CosNamings.lib TAO_Svc_Utilss.lib TAOs.lib aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ENDIF
diff --git a/TAO/examples/Simple/time/server_static.dsp b/TAO/examples/Simple/time/server_static.dsp index 4ec0ffc2bda..63d7d87ff97 100644 --- a/TAO/examples/Simple/time/server_static.dsp +++ b/TAO/examples/Simple/time/server_static.dsp @@ -2,7 +2,7 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 Static (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=Simple Time Server Static - Win32 Static Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -17,8 +17,8 @@ CFG=Simple Time Server Static - Win32 Static Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Simple Time Server Static - Win32 Static Debug" (based on "Win32 Static (x86) Console Application")
-!MESSAGE "Simple Time Server Static - Win32 Static Release" (based on "Win32 Static (x86) Console Application")
+!MESSAGE "Simple Time Server Static - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple Time Server Static - Win32 Static Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "server"
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D TAO_NAMING_HAS_DLL=0 /D TAO_SVC_UTILS_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D TAO_NAMING_HAS_DLL=0 /D TAO_SVC_UTILS_HAS_DLL=0 /D "ACE_NO_INLINE" /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-# ADD LINK32 advapi32.lib user32.lib acesd.lib TAOsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 user32.lib advapi32.lib acesd.lib TAOsd.lib TAO_CosNamingsd.lib TAO_Svc_Utilssd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ELSEIF "$(CFG)" == "Simple Time Server Static - Win32 Static Release"
@@ -71,7 +71,7 @@ LINK32=link.exe # PROP Target_Dir "server"
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D TAO_NAMING_HAS_DLL=0 /D TAO_SVC_UTILS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D TAO_NAMING_HAS_DLL=0 /D TAO_SVC_UTILS_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-# ADD LINK32 TAO_CosNamings.lib TAO_Svc_Utilss.lib TAOs.lib aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 TAO_CosNamings.lib TAO_Svc_Utilss.lib TAOs.lib aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
!ENDIF
diff --git a/TAO/orbsvcs/orbsvcs/AV_Static.dsp b/TAO/orbsvcs/orbsvcs/AV_Static.dsp index d4842d16163..f0668bc4ffc 100644 --- a/TAO/orbsvcs/orbsvcs/AV_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/AV_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\AV"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_AV_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_AV_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency_Static.dsp b/TAO/orbsvcs/orbsvcs/CosConcurrency_Static.dsp index 961a388c13c..474a57db5b0 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\CosConcurrency"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_CONCURRENCY_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_CONCURRENCY_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Static.dsp b/TAO/orbsvcs/orbsvcs/CosEvent_Static.dsp index 8455b53d357..51cde34f1a0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/CosEvent_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\CosEvent"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_EVENT_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_EVENT_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle_Static.dsp b/TAO/orbsvcs/orbsvcs/CosLifeCycle_Static.dsp index 73b8f6aa3ff..ee5905dcac8 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\CosLifeCycle"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_LIFECYCLE_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_LIFECYCLE_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty_Static.dsp b/TAO/orbsvcs/orbsvcs/CosProperty_Static.dsp index 7cc41a8b298..9b193e462dc 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/CosProperty_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\CosProperty"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_PROPERTY_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_PROPERTY_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/CosTime_Static.dsp b/TAO/orbsvcs/orbsvcs/CosTime_Static.dsp index 5cfe65ad712..a7ff81976a8 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/CosTime_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\CosTime"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_TIME_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_TIME_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading_Static.dsp b/TAO/orbsvcs/orbsvcs/CosTrading_Static.dsp index 41132571a0c..cfc1ee7b260 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/CosTrading_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\CosTrading"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_TRADING_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_TRADING_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin_Static.dsp b/TAO/orbsvcs/orbsvcs/DsLogAdmin_Static.dsp index b76b7e7cca8..e1bbb28ad28 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\DsLogAdmin"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_LOG_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_LOG_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp b/TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp index b6e2738e5b8..1ead4a7af67 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\LoadBalancing"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_LOADBALANCING_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_LOADBALANCING_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Static.dsp b/TAO/orbsvcs/orbsvcs/RTEvent_Static.dsp index a39c4e717ee..4956d76fd21 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/RTEvent_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\RTEvent"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_RTEVENT_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_RTEVENT_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent_Static.dsp b/TAO/orbsvcs/orbsvcs/RTOLDEvent_Static.dsp index 7cb46eed839..6185d54275d 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\RTOLDEvent"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_RTOLDEVENT_HAS_DLL=0 /D TAO_RTEVENT_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_RTOLDEVENT_HAS_DLL=0 /D TAO_RTEVENT_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent_Static.dsp b/TAO/orbsvcs/orbsvcs/RTSchedEvent_Static.dsp index 479e5082d56..ca5a8dec075 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\RTSchedEvent"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_RTSCHEDEVENT_HAS_DLL=0 /D TAO_RTEVENT_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_RTSCHEDEVENT_HAS_DLL=0 /D TAO_RTEVENT_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/RTSched_Static.dsp b/TAO/orbsvcs/orbsvcs/RTSched_Static.dsp index 1f4e9646230..5ebca360ad9 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/RTSched_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\RTSched"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_RTSCHED_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_RTSCHED_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils_Static.dsp b/TAO/orbsvcs/orbsvcs/Svc_Utils_Static.dsp index 89090dbe725..2e313cb7347 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug\Svc_Utils"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_SVC_UTILS_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D TAO_SVC_UTILS_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsw b/TAO/orbsvcs/orbsvcs/orbsvcs.dsw index c0aa31f9162..2ffb3fe913f 100644 --- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsw +++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsw @@ -200,6 +200,12 @@ Package=<5> Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name RTEvent
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name RTSched
+ End Project Dependency
}}}
###############################################################################
diff --git a/TAO/orbsvcs/services.dsw b/TAO/orbsvcs/services.dsw deleted file mode 100644 index fefbd44bd4b..00000000000 --- a/TAO/orbsvcs/services.dsw +++ /dev/null @@ -1,161 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Concurrency_Service"=.\Concurrency_Service\Concurrency_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "CosEvent_Service"=.\CosEvent_Service\CosEvent_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Dump_Schedule"=.\Dump_Schedule\Dump_Schedule.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Event_Service"=.\Event_Service\Event_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ImplRepo_Service"=.\ImplRepo_Service\implrepo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "LifeCycle_Service"=.\LifeCycle_Service\LifeCycle_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "NT_Naming_Service"=.\Naming_Service\NT_Naming_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Naming_Service"=.\Naming_Service\Naming_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Notify_Service"=.\Notify_Service\Notify_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Scheduling_Service"=.\Scheduling_Service\Scheduling_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Trading_Service"=.\Trading_Service\Trading_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "tao_imr"=.\ImplRepo_Service\tao_imr.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index e89f7a26979..557a581c847 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LIB\Debug"
# 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 TAO_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../" /I "../" /D TAO_HAS_DLL=0 /D "_WINDOWS" /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -215,6 +215,10 @@ SOURCE=.\DynUnion_i.cpp # End Source File
# Begin Source File
+SOURCE=.\Encodable.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Environment.cpp
# End Source File
# Begin Source File
@@ -463,6 +467,10 @@ SOURCE=.\POAS.cpp # End Source File
# Begin Source File
+SOURCE=.\Policy_Factory.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Policy_Manager.cpp
# End Source File
# Begin Source File
|