summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-12 22:58:10 +0000
committermichel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-12 22:58:10 +0000
commitec2bcd7b390ec6c54a9d404e5c675c71892ee8b4 (patch)
treefd350f506c7a46309176e7d773cb5b7a5962c7d3
parent1b130bd06994216696870c1749cca1fc60ee8b00 (diff)
downloadATCD-ec2bcd7b390ec6c54a9d404e5c675c71892ee8b4.tar.gz
Wed Nov 12 16:55:00 2003 Justin Michel <michel_j@ociweb.com>
-rw-r--r--ChangeLog51
-rw-r--r--TAO/ChangeLog286
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc14
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc14
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc13
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc15
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc14
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc14
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc13
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc4
-rw-r--r--TAO/examples/AMH/Sink_Server/Sink_Server.mpc17
-rw-r--r--TAO/examples/AMI/FL_Callback/FL_Callback.mpc16
-rw-r--r--TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc12
-rw-r--r--TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc12
-rw-r--r--TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc12
-rw-r--r--TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc11
-rw-r--r--TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc12
-rw-r--r--TAO/examples/Buffered_AMI/Buffered_AMI.mpc12
-rw-r--r--TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc12
-rw-r--r--TAO/examples/Callback_Quoter/Callback_Quoter.mpc6
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc14
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc15
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc2
-rw-r--r--TAO/examples/Event_Comm/Event_Comm.mpc6
-rw-r--r--TAO/examples/Load_Balancing/Load_Balancing.mpc5
-rw-r--r--TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc4
-rw-r--r--TAO/examples/Logging/Logging.mpc10
-rw-r--r--TAO/examples/OBV/Typed_Events/Typed_Events.mpc9
-rw-r--r--TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc8
-rw-r--r--TAO/examples/POA/DSI/POA_DSI.mpc12
-rw-r--r--TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc12
-rw-r--r--TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc3
-rw-r--r--TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc8
-rw-r--r--TAO/examples/POA/FindPOA/POA_FindPOA.mpc3
-rw-r--r--TAO/examples/POA/Forwarding/POA_Forwarding.mpc16
-rw-r--r--TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc18
-rw-r--r--TAO/examples/POA/Loader/POA_Loader.mpc8
-rw-r--r--TAO/examples/POA/NewPOA/POA_NewPOA.mpc2
-rw-r--r--TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc10
-rw-r--r--TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc9
-rw-r--r--TAO/examples/POA/POA_BiDir/POA_BiDir.mpc3
-rw-r--r--TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc9
-rw-r--r--TAO/examples/POA/RootPOA/RootPOA.mpc6
-rw-r--r--TAO/examples/POA/TIE/POA_TIE.mpc15
-rw-r--r--TAO/examples/Persistent_Grid/Persistent_Grid.mpc10
-rw-r--r--TAO/examples/PluggableUDP/tests/Basic/Basic.mpc5
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/Performance.mpc5
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc5
-rw-r--r--TAO/examples/Simple/chat/chat.mpc6
-rw-r--r--TAO/examples/Simple/time-date/Simple_time_date.mpc35
-rw-r--r--TAO/examples/ior_corbaloc/ior_corbaloc.mpc4
-rw-r--r--TAO/examples/mfc/client.mpc17
-rw-r--r--TAO/examples/mfc/server.mpc15
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h5
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp6
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Options.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/INS_Locator.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h5
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp7
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Options.h2
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc8
-rw-r--r--TAO/orbsvcs/Naming_Service/NT_Naming_Service.h2
-rw-r--r--TAO/orbsvcs/Notify_Service/NT_Notify_Service.h2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.mpc4
-rw-r--r--TAO/orbsvcs/PSS/PSDL.mpc51
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc14
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc6
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc5
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc6
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_tests_Multiple.mpc21
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc17
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc3
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Log_Event.mpc13
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc13
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc13
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc2
-rw-r--r--TAO/orbsvcs/examples/ORT/ORT.mpc41
-rw-r--r--TAO/orbsvcs/examples/PSS/PSS.mpc44
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc17
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc12
-rw-r--r--TAO/orbsvcs/orbsvcs/AV.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosConcurrency.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent.mpc10
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc5
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNotification.mpc10
-rw-r--r--TAO/orbsvcs/orbsvcs/CosProperty.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTrading.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc4
-rw-r--r--TAO/orbsvcs/orbsvcs/ETCL.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP.mpc4
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc4
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc3
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc6
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc5
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc4
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc13
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc8
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Basic.mpc16
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc4
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc2
-rw-r--r--TAO/orbsvcs/tests/Property/Property.mpc7
-rw-r--r--TAO/orbsvcs/tests/Sched/Sched.mpc2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc3
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc4
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/Callback.mpc6
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc13
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc4
-rw-r--r--TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc4
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc2
-rw-r--r--TAO/orbsvcs/tests/Time/Time.mpc3
-rw-r--r--TAO/orbsvcs/tests/Trading/Trading.mpc4
-rw-r--r--TAO/performance-tests/Callback/Callback.mpc9
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc3
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc12
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc6
-rw-r--r--TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc10
-rw-r--r--TAO/performance-tests/Latency/AMI/AMI.mpc13
-rw-r--r--TAO/performance-tests/Latency/DII/DII.mpc5
-rw-r--r--TAO/performance-tests/Latency/DSI/DSI.mpc4
-rw-r--r--TAO/performance-tests/Latency/Deferred/Deferred.mpc5
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc4
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc4
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc4
-rw-r--r--TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc13
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc4
-rw-r--r--TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc2
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc8
-rw-r--r--TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc2
-rw-r--r--TAO/performance-tests/Pluggable/Pluggable.mpc4
-rw-r--r--TAO/performance-tests/Throughput/Throughput.mpc4
-rw-r--r--TAO/tao/RTCORBA/RTCORBA.mpc2
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServer.mpc2
-rw-r--r--TAO/tao/Utils/tao_Utils.mpc8
-rw-r--r--TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc11
-rw-r--r--TAO/tests/AMH_Oneway/AMH_Oneway.mpc11
-rw-r--r--TAO/tests/AMI/AMI.mpc20
-rw-r--r--TAO/tests/AMI_Buffering/AMI_Buffering.mpc20
-rw-r--r--TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc13
-rw-r--r--TAO/tests/Abstract_Interface/Abstract_Interface.mpc12
-rw-r--r--TAO/tests/BiDirectional/BiDirectional.mpc5
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc5
-rw-r--r--TAO/tests/Big_Oneways/Big_Oneways.mpc5
-rw-r--r--TAO/tests/Big_Reply/Big_Reply.mpc5
-rw-r--r--TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc4
-rw-r--r--TAO/tests/Big_Twoways/Big_Twoways.mpc5
-rw-r--r--TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc6
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc15
-rw-r--r--TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc16
-rw-r--r--TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc14
-rw-r--r--TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc20
-rw-r--r--TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc22
-rw-r--r--TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc4
-rw-r--r--TAO/tests/Client_Leaks/Client_Leaks.mpc7
-rw-r--r--TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc4
-rw-r--r--TAO/tests/CodeSets/simple/CodeSets_simple.mpc11
-rw-r--r--TAO/tests/Codec/Codec.mpc2
-rw-r--r--TAO/tests/Collocation/Collocation.mpc3
-rw-r--r--TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc4
-rw-r--r--TAO/tests/Connection_Purging/Connection_Purging.mpc4
-rw-r--r--TAO/tests/Connection_Timeout/Connection_Timeout.mpc4
-rw-r--r--TAO/tests/Crash_On_Write/Crash_On_Write.mpc4
-rw-r--r--TAO/tests/Crashed_Callback/Crashed_Callback.mpc6
-rw-r--r--TAO/tests/DLL_ORB/DLL_ORB.mpc2
-rw-r--r--TAO/tests/DSI_Gateway/DSI_Gateway.mpc8
-rw-r--r--TAO/tests/DynAny_Test/DynAny_Test.mpc2
-rw-r--r--TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc4
-rw-r--r--TAO/tests/FL_Cube/FL_Cube.mpc11
-rw-r--r--TAO/tests/Faults/Faults.mpc18
-rw-r--r--TAO/tests/File_IO/File_IO.mpc4
-rw-r--r--TAO/tests/Forwarding/Forwarding.mpc4
-rw-r--r--TAO/tests/Hello/Hello.mpc4
-rw-r--r--TAO/tests/InterOp-Naming/InterOp-Naming.mpc7
-rw-r--r--TAO/tests/Leader_Followers/Leader_Followers.mpc4
-rw-r--r--TAO/tests/LongUpcalls/LongUpcalls.mpc28
-rw-r--r--TAO/tests/MProfile/MProfile.mpc4
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc4
-rw-r--r--TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc7
-rw-r--r--TAO/tests/MT_BiDir/MT_BiDir.mpc5
-rw-r--r--TAO/tests/MT_Client/MT_Client.mpc4
-rw-r--r--TAO/tests/MT_Server/MT_Server.mpc4
-rw-r--r--TAO/tests/MT_Timeout/MT_Timeout.mpc6
-rw-r--r--TAO/tests/Multiple/Multiple.mpc5
-rw-r--r--TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc4
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc4
-rw-r--r--TAO/tests/Muxing/Muxing.mpc6
-rw-r--r--TAO/tests/Native_Exceptions/Native_Exceptions.mpc4
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc6
-rw-r--r--TAO/tests/NestedUpcall/Simple/Simple.mpc6
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc12
-rw-r--r--TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc6
-rw-r--r--TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc10
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc4
-rw-r--r--TAO/tests/OBV/Any/OBV_Any.mpc4
-rw-r--r--TAO/tests/OBV/Factory/OBV_Factory.mpc4
-rw-r--r--TAO/tests/OBV/Forward/OBV_Forward.mpc4
-rw-r--r--TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc4
-rw-r--r--TAO/tests/ORB_destroy/ORB_destroy.mpc2
-rw-r--r--TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc2
-rw-r--r--TAO/tests/ORB_shutdown/Foo_Bar.mpc2
-rw-r--r--TAO/tests/ORT/ORT.mpc4
-rw-r--r--TAO/tests/Object_Loader/Object_Loader.mpc6
-rw-r--r--TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc4
-rw-r--r--TAO/tests/OctetSeq/OctetSeq.mpc4
-rw-r--r--TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc8
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc6
-rw-r--r--TAO/tests/POA/Current/Current.mpc3
-rw-r--r--TAO/tests/POA/Etherealization/Etherealization.mpc3
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc3
-rw-r--r--TAO/tests/POA/Identity/Identity.mpc3
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc4
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc3
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc3
-rw-r--r--TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc3
-rw-r--r--TAO/tests/POA/POA_Destruction/POA_Destruction.mpc3
-rw-r--r--TAO/tests/POA/Persistent_ID/Persistent_ID.mpc11
-rw-r--r--TAO/tests/POA/Policies/Policies.mpc3
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc3
-rw-r--r--TAO/tests/POA/wait_for_completion/wait_for_completion.mpc3
-rw-r--r--TAO/tests/Param_Test/Param_Test.mpc8
-rw-r--r--TAO/tests/Policies/Policies.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/Portable_Interceptors_AMI.mpc19
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc4
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc4
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc8
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc4
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc4
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc4
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc4
-rw-r--r--TAO/tests/QtTests/QtTests.mpc4
-rw-r--r--TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc1
-rw-r--r--TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc1
-rw-r--r--TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc13
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc2
-rw-r--r--TAO/tests/RTCORBA/Policies/Policies.mpc1
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc11
-rw-r--r--TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc6
-rw-r--r--TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc13
-rw-r--r--TAO/tests/Server_Leaks/Server_Leaks.mpc4
-rw-r--r--TAO/tests/Single_Read/Single_Read.mpc4
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/Smart_Proxies_Benchmark.mpc13
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Smart_Proxies_Collocation.mpc33
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Proxies_On_Demand.mpc14
-rw-r--r--TAO/tests/Smart_Proxies/Policy/Smart_Proxies_Policy.mpc13
-rw-r--r--TAO/tests/Smart_Proxies/Smart_Proxies.mpc8
-rw-r--r--TAO/tests/Stack_Recursion/Stack_Recursion.mpc4
-rw-r--r--TAO/tests/Strategies/Strategies.mpc6
-rw-r--r--TAO/tests/TestUtils/TestUtils.mpc8
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc6
-rw-r--r--TAO/tests/Timeout/Timeout.mpc6
-rw-r--r--TAO/tests/Two_Objects/Two_Objects.mpc4
-rw-r--r--TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc4
-rw-r--r--TAO/utils/IOR-parser/IOR-parser.mpc2
-rw-r--r--TAO/utils/NamingViewer/NamingViewer.mpc3
-rw-r--r--TAO/utils/nslist/nslist.mpc6
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingViewer.mpc2
-rw-r--r--ace/NT_Service.h1
-rw-r--r--ace/QoS/qos.mpc4
-rw-r--r--bin/MakeProjectCreator/config/amh.mpb4
-rw-r--r--bin/MakeProjectCreator/config/ami.mpb4
-rw-r--r--bin/MakeProjectCreator/config/avstreams.mpb2
-rw-r--r--bin/MakeProjectCreator/config/dseventlogadmin.mpb4
-rw-r--r--bin/MakeProjectCreator/config/dsnotifylogadmin.mpb4
-rw-r--r--bin/MakeProjectCreator/config/global.features2
-rw-r--r--bin/MakeProjectCreator/config/mfc.mpb4
-rw-r--r--bin/MakeProjectCreator/config/namingexe.mpb2
-rw-r--r--bin/MakeProjectCreator/config/notification.mpb2
-rw-r--r--bin/MakeProjectCreator/config/notifytest.mpb2
-rw-r--r--bin/MakeProjectCreator/config/psdl.mpb15
-rw-r--r--bin/MakeProjectCreator/config/qos.mpb6
-rw-r--r--bin/MakeProjectCreator/config/rpc.mpb10
-rw-r--r--bin/MakeProjectCreator/config/rt_client.mpb2
-rw-r--r--bin/MakeProjectCreator/config/rt_server.mpb2
-rw-r--r--bin/MakeProjectCreator/config/rteventexe.mpb2
-rw-r--r--bin/MakeProjectCreator/config/rteventlogadmin.mpb4
-rw-r--r--bin/MakeProjectCreator/config/smart_proxies.mpb1
-rw-r--r--bin/MakeProjectCreator/config/ssliop.mpb6
-rw-r--r--bin/MakeProjectCreator/config/taoclient.mpb2
-rw-r--r--bin/MakeProjectCreator/config/wxwindows.mpb4
-rw-r--r--examples/ConfigViewer/ConfigViewer.mpc5
-rw-r--r--examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc17
-rw-r--r--examples/NT_Service/NT_Service.mpc16
-rw-r--r--examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc18
-rw-r--r--examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc18
-rw-r--r--examples/QOS/Diffserv/QOS_Diffserv.mpc2
-rw-r--r--examples/QOS/Simple/QOS_Simple.mpc18
-rw-r--r--examples/RMCast/Send_File/RMCast_Send_File.mpc2
-rw-r--r--examples/Timer_Queue/Timer_Queue.mpc3
-rw-r--r--performance-tests/Misc/Misc.mpc49
-rw-r--r--performance-tests/RPC/RPC.mpc14
-rw-r--r--performance-tests/Server_Concurrency/Leader_Follower/Server_Concurrency_Leader_Follower.mpc11
-rw-r--r--performance-tests/Server_Concurrency/Queue_Based_Workers/Server_Concurrency_Queue_Based_Workers.mpc11
-rw-r--r--performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc6
-rw-r--r--performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc6
-rw-r--r--performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc8
-rw-r--r--performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc4
-rw-r--r--performance-tests/TCP/TCP.mpc2
-rw-r--r--performance-tests/TTCP/ACE-C++/TTCP_ACE_C++.mpc2
-rw-r--r--performance-tests/UDP/UDP.mpc2
321 files changed, 1974 insertions, 670 deletions
diff --git a/ChangeLog b/ChangeLog
index 74cae89f7f5..5e14a4495dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+Wed Nov 12 16:55:00 2003 Justin Michel <michel_j@ociweb.com>
+
+ * ace/NT_Service.h:
+ * ace/QoS/qos.mpc:
+ * bin/MakeProjectCreator/config/amh.mpb:
+ * bin/MakeProjectCreator/config/ami.mpb:
+ * bin/MakeProjectCreator/config/avstreams.mpb:
+ * bin/MakeProjectCreator/config/dseventlogadmin.mpb:
+ * bin/MakeProjectCreator/config/dsnotifylogadmin.mpb:
+ * bin/MakeProjectCreator/config/global.features:
+ * bin/MakeProjectCreator/config/mfc.mpb:
+ * bin/MakeProjectCreator/config/namingexe.mpb:
+ * bin/MakeProjectCreator/config/notification.mpb:
+ * bin/MakeProjectCreator/config/notifytest.mpb:
+ * bin/MakeProjectCreator/config/psdl.mpb:
+ * bin/MakeProjectCreator/config/qos.mpb:
+ * bin/MakeProjectCreator/config/rpc.mpb:
+ * bin/MakeProjectCreator/config/rt_client.mpb:
+ * bin/MakeProjectCreator/config/rt_server.mpb:
+ * bin/MakeProjectCreator/config/rteventexe.mpb:
+ * bin/MakeProjectCreator/config/rteventlogadmin.mpb:
+ * bin/MakeProjectCreator/config/smart_proxies.mpb:
+ * bin/MakeProjectCreator/config/ssliop.mpb:
+ * bin/MakeProjectCreator/config/taoclient.mpb:
+ * bin/MakeProjectCreator/config/wxwindows.mpb:
+ * examples/ConfigViewer/ConfigViewer.mpc:
+ * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc:
+ * examples/NT_Service/NT_Service.mpc:
+ * examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc:
+ * examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc:
+ * examples/QOS/Diffserv/QOS_Diffserv.mpc:
+ * examples/QOS/Simple/QOS_Simple.mpc:
+ * examples/RMCast/Send_File/RMCast_Send_File.mpc:
+ * examples/Timer_Queue/Timer_Queue.mpc:
+ * performance-tests/Misc/Misc.mpc:
+ * performance-tests/RPC/RPC.mpc:
+ * performance-tests/Server_Concurrency/Leader_Follower/Server_Concurrency_Leader_Follower.mpc:
+ * performance-tests/Server_Concurrency/Queue_Based_Workers/Server_Concurrency_Queue_Based_Workers.mpc:
+ * performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc:
+ * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc:
+ * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc:
+ * performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc:
+ * performance-tests/TCP/TCP.mpc:
+ * performance-tests/TTCP/ACE-C++/TTCP_ACE_C++.mpc:
+ * performance-tests/UDP/UDP.mpc:
+
+ Imported many misc MPC file fixes from the OCI repository.
+ Imported new mpc and mpb files from the OCI repository.
+ Added missing #include to ace/NT_Service.h that was used by
+ macros defined in this file.
+
Wed Nov 12 12:43:14 2003 Chad Elliott <elliott_c@ociweb.com>
* bin/MakeProjectCreator/templates/gnu.mpd:
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6ddf9465f34..432933cccb1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,289 @@
+Wed Nov 12 16:55:00 2003 Justin Michel <michel_j@ociweb.com>
+
+ * docs/tutorials/Quoter/AMI/Quoter_AMI.mpc:
+ * docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc:
+ * docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc:
+ * docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc:
+ * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc:
+ * docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc:
+ * docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc:
+ * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc:
+ * docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc:
+ * docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc:
+ * docs/tutorials/Quoter/idl/Quoter_idl.mpc:
+ * examples/AMH/Sink_Server/Sink_Server.mpc:
+ * examples/AMI/FL_Callback/FL_Callback.mpc:
+ * examples/Advanced/ch_12/Advanced_ch_12.mpc:
+ * examples/Advanced/ch_18/Advanced_ch_18.mpc:
+ * examples/Advanced/ch_21/Advanced_ch_21.mpc:
+ * examples/Advanced/ch_3/Advanced_ch_3.mpc:
+ * examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc:
+ * examples/Buffered_AMI/Buffered_AMI.mpc:
+ * examples/Buffered_Oneways/Buffered_Oneways.mpc:
+ * examples/Callback_Quoter/Callback_Quoter.mpc:
+ * examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc:
+ * examples/Content_Server/AMI_Observer/AMI_Observer.mpc:
+ * examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc:
+ * examples/Event_Comm/Event_Comm.mpc:
+ * examples/Load_Balancing/Load_Balancing.mpc:
+ * examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc:
+ * examples/Logging/Logging.mpc:
+ * examples/OBV/Typed_Events/Typed_Events.mpc:
+ * examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
+ * examples/POA/DSI/POA_DSI.mpc:
+ * examples/POA/Default_Servant/POA_Default_Servant.mpc:
+ * examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
+ * examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc:
+ * examples/POA/FindPOA/POA_FindPOA.mpc:
+ * examples/POA/Forwarding/POA_Forwarding.mpc:
+ * examples/POA/Generic_Servant/POA_Generic_Servant.mpc:
+ * examples/POA/Loader/POA_Loader.mpc:
+ * examples/POA/NewPOA/POA_NewPOA.mpc:
+ * examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
+ * examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc:
+ * examples/POA/POA_BiDir/POA_BiDir.mpc:
+ * examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
+ * examples/POA/RootPOA/RootPOA.mpc:
+ * examples/POA/TIE/POA_TIE.mpc:
+ * examples/Persistent_Grid/Persistent_Grid.mpc:
+ * examples/PluggableUDP/tests/Basic/Basic.mpc:
+ * examples/PluggableUDP/tests/Performance/Performance.mpc:
+ * examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc:
+ * examples/Simple/chat/chat.mpc:
+ * examples/Simple/time-date/Simple_time_date.mpc:
+ * examples/ior_corbaloc/ior_corbaloc.mpc:
+ * examples/mfc/client.mpc:
+ * examples/mfc/server.mpc:
+ * orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp:
+ * orbsvcs/ImplRepo_Service/Activator_NT_Service.h:
+ * orbsvcs/ImplRepo_Service/Activator_Options.cpp:
+ * orbsvcs/ImplRepo_Service/Activator_Options.h:
+ * orbsvcs/ImplRepo_Service/INS_Locator.cpp:
+ * orbsvcs/ImplRepo_Service/INS_Locator.h:
+ * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
+ * orbsvcs/ImplRepo_Service/Locator_NT_Service.h:
+ * orbsvcs/ImplRepo_Service/Locator_Options.cpp:
+ * orbsvcs/ImplRepo_Service/Locator_Options.h:
+ * orbsvcs/LoadBalancer/LoadBalancer.mpc:
+ * orbsvcs/Naming_Service/NT_Naming_Service.h:
+ * orbsvcs/Notify_Service/NT_Notify_Service.h:
+ * orbsvcs/Notify_Service/Notify_Service.mpc:
+ * orbsvcs/PSS/PSDL.mpc:
+ * orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc:
+ * orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc:
+ * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc:
+ * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_tests_Multiple.mpc:
+ * orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc:
+ * orbsvcs/examples/Log/Basic/Log_Basic.mpc:
+ * orbsvcs/examples/Log/Event/Log_Event.mpc:
+ * orbsvcs/examples/Log/Notify/Log_Notify.mpc:
+ * orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc:
+ * orbsvcs/examples/Notify/Filter/Notify_Filter.mpc:
+ * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
+ * orbsvcs/examples/ORT/ORT.mpc:
+ * orbsvcs/examples/PSS/PSS.mpc:
+ * orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc:
+ * orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc:
+ * orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc:
+ * orbsvcs/examples/Security/Send_File/Security_Send_File.mpc:
+ * orbsvcs/orbsvcs/AV.mpc:
+ * orbsvcs/orbsvcs/CosConcurrency.mpc:
+ * orbsvcs/orbsvcs/CosEvent.mpc:
+ * orbsvcs/orbsvcs/CosLifeCycle.mpc:
+ * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
+ * orbsvcs/orbsvcs/CosNotification.mpc:
+ * orbsvcs/orbsvcs/CosProperty.mpc:
+ * orbsvcs/orbsvcs/CosTrading.mpc:
+ * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+ * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+ * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+ * orbsvcs/orbsvcs/ETCL.mpc:
+ * orbsvcs/orbsvcs/SSLIOP.mpc:
+ * orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb:
+ * orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc:
+ * orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc:
+ * orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc:
+ * orbsvcs/tests/EC_Mcast/EC_Mcast.mpc:
+ * orbsvcs/tests/EC_Multiple/EC_Multiple.mpc:
+ * orbsvcs/tests/EC_Throughput/EC_Throughput.mpc:
+ * orbsvcs/tests/Event/Performance/eventperftestexe.mpb:
+ * orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc:
+ * orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc:
+ * orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc:
+ * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc:
+ * orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc:
+ * orbsvcs/tests/Miop/McastHello/McastHello.mpc:
+ * orbsvcs/tests/Notify/Basic/Basic.mpc:
+ * orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc:
+ * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc:
+ * orbsvcs/tests/Notify/lib/Notify_lib.mpc:
+ * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc:
+ * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc:
+ * orbsvcs/tests/Property/Property.mpc:
+ * orbsvcs/tests/Sched/Sched.mpc:
+ * orbsvcs/tests/Sched_Conf/Sched_Conf.mpc:
+ * orbsvcs/tests/Security/Big_Request/Big_Request.mpc:
+ * orbsvcs/tests/Security/Callback/Callback.mpc:
+ * orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc:
+ * orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc:
+ * orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc:
+ * orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc:
+ * orbsvcs/tests/Simple_Naming/Simple_Naming.mpc:
+ * orbsvcs/tests/Time/Time.mpc:
+ * orbsvcs/tests/Trading/Trading.mpc:
+ * performance-tests/Callback/Callback.mpc:
+ * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
+ * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
+ * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
+ * performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc:
+ * performance-tests/Latency/AMI/AMI.mpc:
+ * performance-tests/Latency/DII/DII.mpc:
+ * performance-tests/Latency/DSI/DSI.mpc:
+ * performance-tests/Latency/Deferred/Deferred.mpc:
+ * performance-tests/Latency/Single_Threaded/Single_Threaded.mpc:
+ * performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc:
+ * performance-tests/Latency/Thread_Pool/Thread_Pool.mpc:
+ * performance-tests/Memory/IORsize/Memory_IORsize.mpc:
+ * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc:
+ * performance-tests/POA/Create_Reference/Create_Reference.mpc:
+ * performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc:
+ * performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc:
+ * performance-tests/Pluggable/Pluggable.mpc:
+ * performance-tests/Throughput/Throughput.mpc:
+ * tao/RTCORBA/RTCORBA.mpc:
+ * tao/RTPortableServer/RTPortableServer.mpc:
+ * tao/Utils/tao_Utils.mpc:
+ * tests/AMH_Exceptions/AMH_Exceptions.mpc:
+ * tests/AMH_Oneway/AMH_Oneway.mpc:
+ * tests/AMI/AMI.mpc:
+ * tests/AMI_Buffering/AMI_Buffering.mpc:
+ * tests/AMI_Timeouts/AMI_Timeouts.mpc:
+ * tests/Abstract_Interface/Abstract_Interface.mpc:
+ * tests/BiDirectional/BiDirectional.mpc:
+ * tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc:
+ * tests/Big_Oneways/Big_Oneways.mpc:
+ * tests/Big_Reply/Big_Reply.mpc:
+ * tests/Big_Request_Muxing/Big_Request_Muxing.mpc:
+ * tests/Big_Twoways/Big_Twoways.mpc:
+ * tests/Blocking_Sync_None/Blocking_Sync_None.mpc:
+ * tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc:
+ * tests/Bug_1020_Regression/Bug_1020_Regression.mpc:
+ * tests/Bug_1269_Regression/Bug_1269_Regression.mpc:
+ * tests/Bug_1270_Regression/Bug_1270_Regression.mpc:
+ * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
+ * tests/Cache_Growth_Test/Cache_Growth_Test.mpc:
+ * tests/Client_Leaks/Client_Leaks.mpc:
+ * tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc:
+ * tests/CodeSets/simple/CodeSets_simple.mpc:
+ * tests/Codec/Codec.mpc:
+ * tests/Collocation/Collocation.mpc:
+ * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc:
+ * tests/Connection_Purging/Connection_Purging.mpc:
+ * tests/Connection_Timeout/Connection_Timeout.mpc:
+ * tests/Crash_On_Write/Crash_On_Write.mpc:
+ * tests/Crashed_Callback/Crashed_Callback.mpc:
+ * tests/DLL_ORB/DLL_ORB.mpc:
+ * tests/DSI_Gateway/DSI_Gateway.mpc:
+ * tests/DynAny_Test/DynAny_Test.mpc:
+ * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc:
+ * tests/FL_Cube/FL_Cube.mpc:
+ * tests/Faults/Faults.mpc:
+ * tests/File_IO/File_IO.mpc:
+ * tests/Forwarding/Forwarding.mpc:
+ * tests/Hello/Hello.mpc:
+ * tests/InterOp-Naming/InterOp-Naming.mpc:
+ * tests/Leader_Followers/Leader_Followers.mpc:
+ * tests/LongUpcalls/LongUpcalls.mpc:
+ * tests/MProfile/MProfile.mpc:
+ * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc:
+ * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
+ * tests/MT_BiDir/MT_BiDir.mpc:
+ * tests/MT_Client/MT_Client.mpc:
+ * tests/MT_Server/MT_Server.mpc:
+ * tests/MT_Timeout/MT_Timeout.mpc:
+ * tests/Multiple/Multiple.mpc:
+ * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
+ * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc:
+ * tests/Muxing/Muxing.mpc:
+ * tests/Native_Exceptions/Native_Exceptions.mpc:
+ * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
+ * tests/NestedUpcall/Simple/Simple.mpc:
+ * tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc:
+ * tests/Nested_Event_Loop/Nested_Event_Loop.mpc:
+ * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
+ * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc:
+ * tests/OBV/Any/OBV_Any.mpc:
+ * tests/OBV/Factory/OBV_Factory.mpc:
+ * tests/OBV/Forward/OBV_Forward.mpc:
+ * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
+ * tests/ORB_destroy/ORB_destroy.mpc:
+ * tests/ORB_init/Portspan/ORB_Init_Portspan.mpc:
+ * tests/ORB_shutdown/Foo_Bar.mpc:
+ * tests/ORT/ORT.mpc:
+ * tests/Object_Loader/Object_Loader.mpc:
+ * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc:
+ * tests/OctetSeq/OctetSeq.mpc:
+ * tests/Oneway_Buffering/Oneway_Buffering.mpc:
+ * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc:
+ * tests/POA/Current/Current.mpc:
+ * tests/POA/Etherealization/Etherealization.mpc:
+ * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc:
+ * tests/POA/Identity/Identity.mpc:
+ * tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc:
+ * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc:
+ * tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc:
+ * tests/POA/Object_Reactivation/Object_Reactivation.mpc:
+ * tests/POA/POA_Destruction/POA_Destruction.mpc:
+ * tests/POA/Persistent_ID/Persistent_ID.mpc:
+ * tests/POA/Policies/Policies.mpc:
+ * tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc:
+ * tests/POA/wait_for_completion/wait_for_completion.mpc:
+ * tests/Param_Test/Param_Test.mpc:
+ * tests/Policies/Policies.mpc:
+ * tests/Portable_Interceptors/AMI/Portable_Interceptors_AMI.mpc:
+ * tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc:
+ * tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc:
+ * tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc:
+ * tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc:
+ * tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc:
+ * tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc:
+ * tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc:
+ * tests/QtTests/QtTests.mpc:
+ * tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc:
+ * tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc:
+ * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
+ * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc:
+ * tests/RTCORBA/Policies/Policies.mpc:
+ * tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc:
+ * tests/Reliable_Oneways/Reliable_Oneways.mpc:
+ * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
+ * tests/Server_Leaks/Server_Leaks.mpc:
+ * tests/Single_Read/Single_Read.mpc:
+ * tests/Smart_Proxies/Smart_Proxies.mpc:
+ * tests/Smart_Proxies/Benchmark/Smart_Proxies_Benchmark.mpc:
+ * tests/Smart_Proxies/Collocation/Smart_Proxies_Collocation.mpc:
+ * tests/Smart_Proxies/On_Demand/Smart_Proxies_On_Demand.mpc:
+ * tests/Smart_Proxies/Policy/Smart_Proxies_Policy.mpc:
+ * tests/Stack_Recursion/Stack_Recursion.mpc:
+ * tests/Strategies/Strategies.mpc:
+ * tests/TestUtils/TestUtils.mpc:
+ * tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc:
+ * tests/Timeout/Timeout.mpc:
+ * tests/Two_Objects/Two_Objects.mpc:
+ * tests/Xt_Stopwatch/Xt_Stopwatch.mpc:
+ * utils/IOR-parser/IOR-parser.mpc:
+ * utils/NamingViewer/NamingViewer.mpc:
+ * utils/nslist/nslist.mpc:
+ * utils/wxNamingViewer/wxNamingViewer.mpc:
+
+ Imported many misc MPC file fixes from the OCI repository.
+ Imported new mpc and mpb files from the OCI repository.
+ Cleaned up Fuzz warnings in the ImR.
+ Fixed incorrect Mutex type used in ACE_Singleton<> typedefs
+ for most NT services.
+
+
Wed Nov 12 17:09:38 UTC 2003 Don Hinton <dhinton@dresystems.com>
* orbsvcs/orbsvcs/Makefile.RTCosScheduling:
diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
new file mode 100644
index 00000000000..e4f96ae6f96
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
@@ -0,0 +1,14 @@
+project(*client) : taoexe, portableserver, ami {
+ source_files {
+ client.cpp
+ Handler_i.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver, ami {
+ source_files {
+ server.cpp
+ Stock_Factory_i.cpp
+ Stock_i.cpp
+ }
+}
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
new file mode 100644
index 00000000000..471b48ca9bc
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
@@ -0,0 +1,14 @@
+project(*client) : taoexe, portableserver, event, naming {
+ source_files {
+ client.cpp
+ Stock_Consumer.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver, event, naming {
+ source_files {
+ server.cpp
+ Stock_Factory_i.cpp
+ Stock_i.cpp
+ }
+}
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
new file mode 100644
index 00000000000..a4228e9d06d
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
@@ -0,0 +1,13 @@
+project(*client) : taoexe, portableserver, naming {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver, naming {
+ source_files {
+ server.cpp
+ Stock_Factory_i.cpp
+ Stock_i.cpp
+ }
+}
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
new file mode 100644
index 00000000000..fbb51932a09
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
@@ -0,0 +1,15 @@
+project(*client) : taoexe, portableserver, naming, ami {
+ source_files {
+ client.cpp
+ Handler_i.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver, naming, ami {
+ source_files {
+ server.cpp
+ Stock_Factory_i.cpp
+ Stock_i.cpp
+ Stock_Factory_Locator.cpp
+ }
+}
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
new file mode 100644
index 00000000000..0e3f26a3ef8
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
@@ -0,0 +1,14 @@
+project(*client) : taoexe, portableserver, rtevent, naming {
+ source_files {
+ client.cpp
+ Stock_Consumer.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver, rtevent, naming {
+ source_files {
+ server.cpp
+ Stock_Factory_i.cpp
+ Stock_i.cpp
+ }
+}
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
new file mode 100644
index 00000000000..442d69af5c3
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
@@ -0,0 +1,2 @@
+project : taoexe {
+}
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
new file mode 100644
index 00000000000..0e3f26a3ef8
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
@@ -0,0 +1,14 @@
+project(*client) : taoexe, portableserver, rtevent, naming {
+ source_files {
+ client.cpp
+ Stock_Consumer.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver, rtevent, naming {
+ source_files {
+ server.cpp
+ Stock_Factory_i.cpp
+ Stock_i.cpp
+ }
+}
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
new file mode 100644
index 00000000000..5f4f6d3d49c
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -0,0 +1,2 @@
+project : taoexe, portableserver {
+}
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
new file mode 100644
index 00000000000..53c452b5390
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
@@ -0,0 +1,13 @@
+project(*client) : taoexe {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver {
+ source_files {
+ server.cpp
+ Stock_Factory_i.cpp
+ Stock_i.cpp
+ }
+}
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
new file mode 100644
index 00000000000..5f4f6d3d49c
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
@@ -0,0 +1,2 @@
+project : taoexe, portableserver {
+}
diff --git a/TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc b/TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc
new file mode 100644
index 00000000000..8efc325e458
--- /dev/null
+++ b/TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc
@@ -0,0 +1,4 @@
+project(*Lib) : taoexe, portableserver, event, naming {
+ dynamicflags += QUOTER_COMMON_BUILD_DLL
+ idlflags += -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h
+}
diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
index 9a2be35cd8f..b953613a579 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -1,8 +1,4 @@
-project(*st_server): taoserver, strategies, valuetype {
- idlflags += -GH
- exename = st_server
- requires += ami
-
+project(*st_server): taoexe, strategies, valuetype, amh, portableserver {
Source_Files {
st_server.cpp
Base_Server.cpp
@@ -11,11 +7,7 @@ project(*st_server): taoserver, strategies, valuetype {
}
}
-project(*mt_server): taoserver, strategies, valuetype {
- idlflags += -GH
- exename = mt_server
- requires += ami
-
+project(*mt_server): taoexe, strategies, valuetype, amh, portableserver {
Source_Files {
mt_server.cpp
MT_AMH_Server.cpp
@@ -25,10 +17,7 @@ project(*mt_server): taoserver, strategies, valuetype {
}
}
-project(*client): taoclient, strategies, valuetype {
- idlflags += -GH
- requires += ami
-
+project(*client): taoexe, strategies, valuetype, amh, portableserver {
Source_Files {
Client_Task.cpp
TestC.cpp
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index 124e552d238..09ca0591455 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,21 +1,13 @@
-project(*progress): taoserver, strategies, messaging {
- exename = progress
- idlflags -= -Sc
- idlflags += -GC
- requires += fl_reactor ami
-
+project(*progress): taoexe, strategies, messaging, ami, portableserver {
+ requires += fl_reactor
Source_Files {
Progress_i.cpp
progress.cpp
}
}
-project(*peer): taoserver, strategies, messaging {
- exename = peer
- idlflags -= -Sc
- idlflags += -GC
- requires += fl_reactor ami
-
+project(*peer): taoexe, strategies, messaging, ami, portableserver {
+ requires += fl_reactor
Source_Files {
Peer_i.cpp
peer.cpp
diff --git a/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc b/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc
new file mode 100644
index 00000000000..5b7e1d21e12
--- /dev/null
+++ b/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc
@@ -0,0 +1,12 @@
+project(*client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver {
+ source_files {
+ server.cpp
+ icp.cpp
+ }
+}
diff --git a/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc b/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc
new file mode 100644
index 00000000000..43648b2c765
--- /dev/null
+++ b/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc
@@ -0,0 +1,12 @@
+project(*client) : orbsvcsexe, naming {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : orbsvcsexe, portableserver, naming {
+ source_files {
+ server.cpp
+ icp.cpp
+ }
+}
diff --git a/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc b/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc
new file mode 100644
index 00000000000..5b7e1d21e12
--- /dev/null
+++ b/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc
@@ -0,0 +1,12 @@
+project(*client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver {
+ source_files {
+ server.cpp
+ icp.cpp
+ }
+}
diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
new file mode 100644
index 00000000000..9ade7e4ec2e
--- /dev/null
+++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
@@ -0,0 +1,11 @@
+project(*client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver {
+ source_files {
+ server.cpp
+ }
+}
diff --git a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
new file mode 100644
index 00000000000..5b7e1d21e12
--- /dev/null
+++ b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
@@ -0,0 +1,12 @@
+project(*client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver {
+ source_files {
+ server.cpp
+ icp.cpp
+ }
+}
diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
new file mode 100644
index 00000000000..d005ef70457
--- /dev/null
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -0,0 +1,12 @@
+project(*Server): messaging, taoexe, portableserver, ami {
+ Source_Files {
+ test_i.cpp
+ server.cpp
+ }
+}
+
+project(*Client): messaging, taoexe, portableserver, ami {
+ Source_Files {
+ client.cpp
+ }
+}
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
new file mode 100644
index 00000000000..1761190b8e2
--- /dev/null
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
@@ -0,0 +1,12 @@
+project(*Server): taoexe, messaging {
+ Source_Files {
+ test_i.cpp
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, messaging {
+ Source_Files {
+ client.cpp
+ }
+}
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index d71411e1c13..6c75947df9d 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,6 +1,4 @@
project(Callback_Quoter notifier): namingexe {
- exename = notifier
-
Source_Files {
Notifier_i.cpp
Notifier_Input_Handler.cpp
@@ -9,8 +7,6 @@ project(Callback_Quoter notifier): namingexe {
}
project(Callback_Quoter consumer): namingexe {
- exename = consumer
-
Source_Files {
Consumer_Input_Handler.cpp
Consumer_Signal_Handler.cpp
@@ -21,8 +17,6 @@ project(Callback_Quoter consumer): namingexe {
}
project(Callback_Quoter supplier): namingexe {
- exename = supplier
-
Source_Files {
Supplier_i.cpp
Supplier_Timer_Handler.cpp
diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
new file mode 100644
index 00000000000..a1ab650f55c
--- /dev/null
+++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
@@ -0,0 +1,14 @@
+project(*Server): messaging, taoexe, portableserver, ami, namingexe {
+ Source_Files {
+ Content_Iterator_i.cpp
+ Iterator_Factory_i.cpp
+ server.cpp
+ }
+}
+
+project(*Client): messaging, taoexe, portableserver, ami, namingexe {
+ Source_Files {
+ client.cpp
+ Iterator_Handler.cpp
+ }
+}
diff --git a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
new file mode 100644
index 00000000000..e6813c44446
--- /dev/null
+++ b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
@@ -0,0 +1,15 @@
+project(*Server): messaging, taoexe, portableserver, ami, namingexe {
+ Source_Files {
+ Callback_Handler.cpp
+ Push_Iterator_Factory_i.cpp
+ server.cpp
+ }
+}
+
+project(*Client): messaging, taoexe, portableserver, ami, namingexe {
+ Source_Files {
+ client.cpp
+ Callback_i.cpp
+ Push_Iterator_Handler.cpp
+ }
+}
diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
index 627f92f277e..7b791962314 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -7,8 +7,6 @@ project(*Server): namingexe {
}
project(*Client): namingexe {
- exename = client
-
Source_Files {
Web_ServerC.cpp
client.cpp
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index dd25d035714..73864088752 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,6 +1,4 @@
project(*notifier): namingexe {
- exename = notifier
-
Source_Files {
Event_Comm_i.cpp
Notifier_Server.cpp
@@ -9,8 +7,6 @@ project(*notifier): namingexe {
}
project(*consumer): namingexe {
- exename = consumer
-
Source_Files {
Consumer_Input_Handler.cpp
Consumer_Handler.cpp
@@ -20,8 +16,6 @@ project(*consumer): namingexe {
}
project(*supplier): namingexe {
- exename = supplier
-
Source_Files {
Event_Comm_i.cpp
Supplier_Input_Handler.cpp
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index 635e94b0f66..e3fe01d3462 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -15,8 +15,7 @@ project(*server): taoserver {
}
}
-project(*Client): taoserver {
- exename = client
+project(*Client): taoclient, portableserver {
avoids += repo
IDL_Files {
@@ -31,7 +30,7 @@ project(*Client): taoserver {
}
}
-project(*Balancer): taoserver {
+project(*Balancer): taoexe, portableserver {
exename = load_balancer
avoids += repo
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 082a1d6ab18..a1df9442feb 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,4 +1,4 @@
-project(*balancer): taoserver {
+project(*balancer): taoexe, portableserver {
avoids += minimum_corba repo
exename = load_balancer
@@ -26,7 +26,7 @@ project(*server): taoserver {
}
}
-project(*client): taoserver {
+project(*client): taoclient, portableserver {
avoids += minimum_corba repo
exename = client
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index 772fee77d2c..911692e8155 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,7 +1,4 @@
-project(*Service): namingexe {
- exename = Logging_Service
- comps += LifeCycle
-
+project(*Service): namingexe, lifecycle {
Source_Files {
Logger_i.cpp
Logging_Service.cpp
@@ -9,10 +6,7 @@ project(*Service): namingexe {
}
}
-project(*Test): namingexe {
- exename = Logging_Test
- comps += LifeCycle
-
+project(*Test): namingexe, lifecycle {
Source_Files {
Logging_Test.cpp
Logging_Test_i.cpp
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index 07d5ab802d5..e6dff43e0d4 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,6 +1,4 @@
-project(*server): taoserver {
- idlflags += -Gv
-
+project(*server): taoexe, portableserver, valuetype {
Source_Files {
Server_i.cpp
Event_Types_impl.cpp
@@ -9,10 +7,7 @@ project(*server): taoserver {
}
}
-project(*client): taoserver {
- exename = client
- idlflags += -Gv
-
+project(*client): taoexe, portableserver, valuetype {
Source_Files {
Client_i.cpp
Event_Types_impl.cpp
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
new file mode 100644
index 00000000000..4af0d416116
--- /dev/null
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -0,0 +1,8 @@
+project(*Server): taoexe, portableserver {
+ includes += ../Generic_Servant
+ libs += Generic_Servant
+ after += POA_Generic_Servant_Lib
+ Source_Files {
+ server.cpp
+ }
+}
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
new file mode 100644
index 00000000000..836b8dcadeb
--- /dev/null
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -0,0 +1,12 @@
+project(*Client) : taoexe, messaging, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*Server) : taoexe, messaging, portableserver, dynamicinterface {
+ source_files {
+ Database_i.cpp
+ server.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
new file mode 100644
index 00000000000..6c5ebe73de9
--- /dev/null
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -0,0 +1,12 @@
+project(*Client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*Server) : taoexe, portableserver {
+ source_files {
+ File_i.cpp
+ server.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
new file mode 100644
index 00000000000..bbff3a3d483
--- /dev/null
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
@@ -0,0 +1,3 @@
+project: taolib {
+ sharedname = Alt_Resource_Factory
+}
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
new file mode 100644
index 00000000000..4af0d416116
--- /dev/null
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -0,0 +1,8 @@
+project(*Server): taoexe, portableserver {
+ includes += ../Generic_Servant
+ libs += Generic_Servant
+ after += POA_Generic_Servant_Lib
+ Source_Files {
+ server.cpp
+ }
+}
diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
new file mode 100644
index 00000000000..50c37f6f1e7
--- /dev/null
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -0,0 +1,3 @@
+project: taoexe, portableserver {
+}
+
diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
new file mode 100644
index 00000000000..191db373ef8
--- /dev/null
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -0,0 +1,16 @@
+project(*Client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*Server) : taoexe, portableserver {
+ includes += ../Generic_Servant
+ libs += Generic_Servant
+ after += POA_Generic_Servant_Lib
+ source_files {
+ test_i.cpp
+ server.cpp
+ Servant_Activator.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
new file mode 100644
index 00000000000..937bee19aaa
--- /dev/null
+++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -0,0 +1,18 @@
+project(*lib): taolib_with_idl, portableserver {
+ sharedname = Generic_Servant
+ dynamicflags = GENERIC_SERVANT_BUILD_DLL
+ idlflags += -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
+ Source_Files {
+ test_i.cpp
+ }
+}
+
+project(*client): taoexe, portableserver {
+ after += *lib
+ libs += Generic_Servant
+ idl_files {
+ }
+ Source_Files {
+ client.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
new file mode 100644
index 00000000000..ce613af3ebf
--- /dev/null
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -0,0 +1,8 @@
+project(*Server): taoexe, portableserver {
+ Source_Files {
+ server.cpp
+ Servant_Activator.cpp
+ Servant_Locator.cpp
+ Server_Manager.cpp
+ }
+}
diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
new file mode 100644
index 00000000000..5f4f6d3d49c
--- /dev/null
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -0,0 +1,2 @@
+project : taoexe, portableserver {
+}
diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
new file mode 100644
index 00000000000..eb5f6a47137
--- /dev/null
+++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -0,0 +1,10 @@
+project(*Server): taoexe, portableserver {
+ includes += ../Generic_Servant
+ libs += Generic_Servant
+ after += POA_Generic_Servant_Lib
+ Source_Files {
+ server.cpp
+ Servant_Activator.cpp
+ Servant_Locator.cpp
+ }
+}
diff --git a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
new file mode 100644
index 00000000000..fc44e355b33
--- /dev/null
+++ b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
@@ -0,0 +1,9 @@
+project(*Server): taoexe, portableserver {
+ Source_Files {
+ server.cpp
+ Servant_Activator.cpp
+ Servant_Locator.cpp
+ Servant_Manager.cpp
+ Server_Manager.cpp
+ }
+}
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
new file mode 100644
index 00000000000..8a1e41e1aac
--- /dev/null
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -0,0 +1,3 @@
+project: taoexe, portableserver, bidir_giop {
+}
+
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
new file mode 100644
index 00000000000..e0ac4279ecb
--- /dev/null
+++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -0,0 +1,9 @@
+project(*Server): taoexe, portableserver {
+ includes += ../Generic_Servant
+ libs += Generic_Servant
+ after += POA_Generic_Servant_Lib
+ Source_Files {
+ server.cpp
+ }
+}
+
diff --git a/TAO/examples/POA/RootPOA/RootPOA.mpc b/TAO/examples/POA/RootPOA/RootPOA.mpc
new file mode 100644
index 00000000000..667b4aeefa2
--- /dev/null
+++ b/TAO/examples/POA/RootPOA/RootPOA.mpc
@@ -0,0 +1,6 @@
+project(*Server): taoexe, portableserver {
+ Source_Files {
+ RootPOA.cpp
+ }
+}
+
diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc
new file mode 100644
index 00000000000..1fad2772df5
--- /dev/null
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -0,0 +1,15 @@
+project(*Client) : taoexe, portableserver {
+ idlflags -= -Sc
+ source_files {
+ client.cpp
+ testC.cpp
+ }
+}
+
+project(*Server) : taoexe, portableserver {
+ idlflags -= -Sc
+ source_files {
+ test_i.cpp
+ server.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index ed4c9f9a98a..0102ee2f4ea 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver {
+project(*server): taoexe, portableserver {
Source_Files {
Grid_i.cpp
Simple_util.cpp
@@ -6,9 +6,7 @@ project(*server): taoserver {
}
}
-project(*client): taoserver {
- exename = client
-
+project(*client): taoexe, portableserver {
Source_Files {
GridC.cpp
Simple_util.cpp
@@ -17,9 +15,7 @@ project(*client): taoserver {
}
}
-project(*persistent client): taoserver {
- exename = persistent_client
-
+project(*persistent client): taoexe, portableserver {
Source_Files {
GridC.cpp
Simple_util.cpp
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
index 10149161cbe..f018f72a0b9 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
+++ b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, strategies {
+project(*server): taoexe, portableserver, strategies {
idlflags += -Sp -Sd
Source_Files {
@@ -8,9 +8,8 @@ project(*server): taoserver, strategies {
}
}
-project(*client): taoserver, strategies {
+project(*client): taoexe, portableserver, strategies {
idlflags += -Sp -Sd
- exename = client
Source_Files {
client.cpp
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
index 368621c5a6a..a7214a42e77 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
+++ b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, strategies {
+project(*server): taoexe, portableserver, strategies {
idlflags += -Sd -Sp
Source_Files {
@@ -7,9 +7,8 @@ project(*server): taoserver, strategies {
}
}
-project(*client): taoserver, strategies {
+project(*client): taoexe, portableserver, strategies {
idlflags += -Sd -Sp
- exename = client
Source_Files {
client.cpp
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
index db6fa1ec983..f259b1988eb 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, strategies {
+project(*server): taoexe, portableserver, strategies {
idlflags += -Sp -Sd
Source_Files {
@@ -7,9 +7,8 @@ project(*server): taoserver, strategies {
}
}
-project(*client): taoserver, strategies {
+project(*client): taoexe, portableserver, strategies {
idlflags += -Sp -Sd
- exename = client
Source_Files {
client.cpp
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index d4ef4c0e1ad..080d3a062db 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -1,4 +1,4 @@
-project(*server) : taoserver, iortable {
+project(*server) : taoexe, portableserver, iortable {
Source_Files {
Broadcaster_i.cpp
Server_i.cpp
@@ -6,9 +6,7 @@ project(*server) : taoserver, iortable {
}
}
-project(*client): taoserver {
- exename = client
-
+project(*client): taoexe, portableserver {
Source_Files {
Receiver_i.cpp
Client_i.cpp
diff --git a/TAO/examples/Simple/time-date/Simple_time_date.mpc b/TAO/examples/Simple/time-date/Simple_time_date.mpc
new file mode 100644
index 00000000000..f98ca413dc1
--- /dev/null
+++ b/TAO/examples/Simple/time-date/Simple_time_date.mpc
@@ -0,0 +1,35 @@
+project(*lib): orbsvcslib, naming, portableserver {
+ sharedname = Time_Date
+ // The svc conf files assume that the dll is in the current directory
+ libout = .
+ idlflags += -Wb,export_macro=ACE_Svc_Export -Wb,export_include=ace/svc_export.h
+ dynamicflags += ACE_BUILD_SVC_DLL Alt_Resource_Factory_BUILD_DLL
+ Source_Files {
+ Time_Date.cpp
+ Time_Date_i.cpp
+ }
+ Header_Files {
+ Alt_Resource_Factory.h
+ }
+}
+
+project(*server): namingexe {
+ IDL_Files {
+ }
+ Source_Files {
+ server.cpp
+ }
+ header_files {
+ }
+}
+
+project(*client): namingexe {
+ after += *lib
+ libs += Time_Date
+ Source_Files {
+ client.cpp
+ Time_Date_Client_i.cpp
+ }
+ idl_files {
+ }
+}
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index f95447eb087..797d66b9f82 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -6,8 +6,6 @@ project(*server): namingexe {
}
project(*client): namingexe {
- exename = client
-
Source_Files {
ior_corbaloc_client_i.cpp
client.cpp
@@ -15,8 +13,6 @@ project(*client): namingexe {
}
project(*corbaname client): namingexe {
- exename = corbaname_client
-
Source_Files {
status_i.cpp
corbaname_client.cpp
diff --git a/TAO/examples/mfc/client.mpc b/TAO/examples/mfc/client.mpc
index 4458d4b4517..507454e3f1a 100644
--- a/TAO/examples/mfc/client.mpc
+++ b/TAO/examples/mfc/client.mpc
@@ -1,19 +1,4 @@
-project(MFC client): namingexe {
- exename = client
-
- verbatim(gnuace, top) {
- ifneq ($(MAKE),)
- include $(ACE_ROOT)/include/makeinclude/macros.GNU
- TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
- $(TARGETS_NESTED):
- " @echo This will only build on Windows"
- else
- }
-
- verbatim(gnuace, bottom) {
- endif
- }
-
+project(MFC client): namingexe, mfc {
Source_Files {
w32_testC.cpp
client.cpp
diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc
index 5085a3183dd..43b4f2ca2cb 100644
--- a/TAO/examples/mfc/server.mpc
+++ b/TAO/examples/mfc/server.mpc
@@ -1,20 +1,7 @@
-project(MFC Server): namingexe {
+project(MFC Server): namingexe, mfc {
pch_header = StdAfx.h
pch_source = StdAfx.cpp
- verbatim(gnuace, top) {
- ifneq ($(MAKE),)
- include $(ACE_ROOT)/include/makeinclude/macros.GNU
- TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
- $(TARGETS_NESTED):
- " @echo This will only build on Windows"
- else
- }
-
- verbatim(gnuace, bottom) {
- endif
- }
-
Source_Files {
MainFrm.cpp
server.cpp
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index 5a5c784aedd..e8bee6d79a4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -1,6 +1,6 @@
//=============================================================================
/**
- * @file NT_Service.cpp
+ * @file Activator_NT_Service.cpp
*
* $Id$
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
index f20f0a7db9a..1fc289707ed 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
//=============================================================================
/**
- * @file NT_Service.h
+ * @file Activator_NT_Service.h
*
* $Id$
*
@@ -21,7 +21,6 @@
#include "ace/NT_Service.h"
#include "ace/Singleton.h"
-#include "ace/Synch.h"
#include "tao/orbconf.h"
static const char * IMR_ACTIVATOR_SERVICE_NAME = "TAOIMRActivator";
@@ -52,7 +51,7 @@ private:
friend class ACE_Singleton<Activator_NT_Service, MUTEX>;
};
-typedef ACE_Singleton<Activator_NT_Service, ACE_Mutex> SERVICE;
+typedef ACE_Singleton<Activator_NT_Service, Activator_NT_Service::MUTEX> SERVICE;
#endif /* ACE_WIN32 */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index 35d0e4144fe..c6a696b92ca 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -1,6 +1,6 @@
//=============================================================================
/**
- * @file Options.cpp
+ * @file Activator_Options.cpp
*
* $Id$
*
@@ -13,7 +13,7 @@
#include "ace/Arg_Shifter.h"
#include "ace/ARGV.h"
#include "ace/OS_NS_strings.h"
-
+#include "ace/Mutex.h"
ACE_RCSID (ImplRepo_Service,
Options,
@@ -617,7 +617,7 @@ Options::load_registry_options (char*& cmdline, ACE_ARGV& argv)
// If there aren't any saved parameters, then that's ok.
return 0;
}
- TCHAR tmpstr[4096];
+ ACE_TCHAR tmpstr[4096];
DWORD sz = sizeof(tmpstr);
DWORD type = 0;
err = ACE_TEXT_RegQueryValueEx(key, "ORBInitOptions", 0, &type,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
index 252e4311dbb..e9e7cc15466 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * @file Options.h
+ * @file Activator_Options.h
*
* $Id$
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 1139095072c..7dff48ece99 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -1,6 +1,6 @@
//=============================================================================
/**
- * @file Locator.cpp
+ * @file INS_Locator.cpp
*
* $Id$
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
index 2b8a8a35c56..26071a51348 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
//=============================================================================
/**
- * @file Locator.h
+ * @file INS_Locator.h
*
* $Id$
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 04015b883d1..c36d04a647e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -1,3 +1,4 @@
+// $Id$
project(ImR_Locator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, strategies {
exename = ImplRepo_Service
Source_Files {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
index 577dc1e557b..20ba4866584 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
//=============================================================================
/**
- * @file NT_Service.h
+ * @file Locator_NT_Service.h
*
* $Id$
*
@@ -23,7 +23,6 @@
#include "ace/NT_Service.h"
#include "ace/Singleton.h"
-#include "ace/Synch.h"
static const char * IMR_LOCATOR_SERVICE_NAME = "TAOIMRLocator";
static const char * IMR_LOCATOR_DISPLAY_NAME = "TAO Implementation Repository Locator";
@@ -54,7 +53,7 @@ private:
friend class ACE_Singleton<Locator_NT_Service, MUTEX>;
};
-typedef ACE_Singleton<Locator_NT_Service, ACE_Mutex> SERVICE;
+typedef ACE_Singleton<Locator_NT_Service, Locator_NT_Service::MUTEX> SERVICE;
#endif /* ACE_WIN32 */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index de4fff3a6e2..3edfb05de21 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -1,6 +1,6 @@
//=============================================================================
/**
- * @file Options.cpp
+ * @file Locator_Options.cpp
*
* $Id$
*
@@ -14,6 +14,7 @@
#include "ace/Arg_Shifter.h"
#include "ace/ARGV.h"
#include "ace/OS_NS_strings.h"
+#include "ace/Mutex.h"
ACE_RCSID (ImplRepo_Service,
Options,
@@ -378,7 +379,7 @@ Options::load_registry_options (char*& cmdline, ACE_ARGV& argv)
// If there aren't any saved parameters, then that's ok.
return 0;
}
- TCHAR tmpstr[4096];
+ ACE_TCHAR tmpstr[4096];
DWORD sz = sizeof(tmpstr);
DWORD type = 0;
err = ACE_TEXT_RegQueryValueEx(key, "ORBInitOptions", 0, &type,
@@ -395,7 +396,7 @@ Options::load_registry_options (char*& cmdline, ACE_ARGV& argv)
(LPBYTE) tmpstr, &sz);
if (err == ERROR_SUCCESS) {
ACE_ASSERT(type == REG_SZ);
- tmpstr[sz] = TCHAR('\0');
+ tmpstr[sz] = ACE_TCHAR('\0');
this->ior_output_file_ = ACE_CString(tmpstr);
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index fb48823f101..3585e3bb2cd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * @file Options.h
+ * @file Locator_Options.h
*
* $Id$
*
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
index 082968d3200..1d7c4304b8f 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
@@ -1,17 +1,13 @@
-project(CosLoadManager): namingexe, server, core, loadbalancing {
+project(CosLoadManager): namingexe, portableserver, core, loadbalancing {
requires += ami interceptors
- exename = LoadManager
-
Source_Files {
LoadManager.cpp
Signal_Handler.cpp
}
}
-project(CosLoadMonitor): namingexe, server, core, loadbalancing {
+project(CosLoadMonitor): namingexe, portableserver, core, loadbalancing {
requires += ami interceptors
- exename = LoadMonitor
-
Source_Files {
LoadMonitor.cpp
Push_Handler.cpp
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index 5d946fcdbe0..4a04615cae5 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -71,7 +71,7 @@ private:
friend class ACE_Singleton<TAO_NT_Naming_Service, MUTEX>;
};
-typedef ACE_Singleton<TAO_NT_Naming_Service, ACE_Mutex> SERVICE;
+typedef ACE_Singleton<TAO_NT_Naming_Service, TAO_NT_Naming_Service::MUTEX> SERVICE;
#endif /* ACE_WIN32 */
#endif /* TAO_NT_NAMING_SERVER_H */
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
index 9c475b95911..9ec67e151c0 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -71,7 +71,7 @@ private:
friend class ACE_Singleton<TAO_NT_Notify_Service, MUTEX>;
};
-typedef ACE_Singleton<TAO_NT_Notify_Service, ACE_Mutex> SERVICE;
+typedef ACE_Singleton<TAO_NT_Notify_Service, TAO_NT_Notify_Service::MUTEX> SERVICE;
#endif /* ACE_WIN32 */
#endif /* TAO_NT_NOTIFY_SERVER_H */
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 124b7d4c7f0..97acc4d9a36 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -1,4 +1,4 @@
-project : orbsvcsexe, core, notification {
+project : orbsvcsexe, core, notification, naming {
exename = Notify_Service
Source_Files {
Notify_Server.cpp
@@ -9,7 +9,7 @@ project : orbsvcsexe, core, notification {
}
}
-project(NT_Notify_Service) : orbsvcsexe, core, notification {
+project(NT_Notify_Service) : orbsvcsexe, core, notification, naming {
exename = NT_Notify_Service
Source_Files {
Notify_Service.cpp
diff --git a/TAO/orbsvcs/PSS/PSDL.mpc b/TAO/orbsvcs/PSS/PSDL.mpc
new file mode 100644
index 00000000000..79d6e70caad
--- /dev/null
+++ b/TAO/orbsvcs/PSS/PSDL.mpc
@@ -0,0 +1,51 @@
+project : taolib {
+ sharedname = TAO_PSDL
+ dynamicflags += TAO_PSDL_BUILD_DLL
+ source_files {
+ PSDL_Node.cpp
+ PSDL_Interpreter.cpp
+ PSDL_Visitor_Factory.cpp
+ PSDL_Node_Visitor.cpp
+ PSDL_Module_Visitor.cpp
+ PSDL_Type_Dcl_Visitor.cpp
+ PSDL_Struct_Visitor.cpp
+ PSDL_Enum_Type_Visitor.cpp
+ PSDL_Interface_Visitor.cpp
+ PSDL_Exception_Visitor.cpp
+ PSDL_Typecode_Defn.cpp
+ PSDL_Scope.cpp
+ PSDL_Root_Scope.cpp
+ PSDL_Simple_Scope.cpp
+ PSDL_Module_Scope.cpp
+ PSDL_Interface_Scope.cpp
+ PSDL_Struct_Scope.cpp
+ PSDL_Exception_Scope.cpp
+ PSDL_Op_Dcl_Scope.cpp
+ PSDL_Scope_Visitor.cpp
+ PSDL_Stream.cpp
+ PSDL_Extern.cpp
+ PSDL_l.cpp
+ PSDL_y.cpp
+ }
+}
+
+project(*Datastore) : taolib {
+ sharedname = TAO_PSDL_Datastore
+ dynamicflags += TAO_PSDL_BUILD_DLL
+ source_files {
+ PSDL_Code_Gen.cpp
+ PSDL_OctetSeq.cpp
+ PSDL_String.cpp
+ PSDL_Datastore.cpp
+ }
+}
+
+project(*Parser) : taoexe {
+ after += PSDL
+ libs += TAO_PSDL
+ install = .
+ source_files {
+ Dump_Visitor.cpp
+ psdl_tao.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
new file mode 100644
index 00000000000..5f1dd345c3b
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
@@ -0,0 +1,14 @@
+project(*Client) : orbsvcsexe, event {
+ idlflags += -I ../../..
+ source_files {
+ FactoryClient.cpp
+ }
+}
+
+project(*Server) : orbsvcsexe, event {
+ idlflags += -I ../../..
+ source_files {
+ FactoryDriver.cpp
+ CosEventChannelFactory_i.cpp
+ }
+}
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
new file mode 100644
index 00000000000..5ac4d9ecda1
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
@@ -0,0 +1,6 @@
+project : orbsvcsexe, rtevent, event {
+ after += CosEC_RtEC_Based_lib
+ includes += ../lib
+ libs += CosEC_RtEC_Based
+ libpaths += ../lib
+} \ No newline at end of file
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
new file mode 100644
index 00000000000..a0701e83d65
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
@@ -0,0 +1,5 @@
+project : orbsvcslib, event, rtevent, rtsched {
+ sharedname = CosEC_RtEC_Based
+ dynamicflags += TAO_RTEC_COSEC_BUILD_DLL
+}
+
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
new file mode 100644
index 00000000000..4e055fe812c
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
@@ -0,0 +1,6 @@
+project(*Client) : orbsvcsexe, event, rtevent, rtsched {
+ after += CosEC_RtEC_Based_lib
+ includes += ../../lib
+ libs += CosEC_RtEC_Based
+ libpaths += ../../lib
+}
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_tests_Multiple.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_tests_Multiple.mpc
new file mode 100644
index 00000000000..d6b7aa9b5e0
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_tests_Multiple.mpc
@@ -0,0 +1,21 @@
+project(*Consumer) : orbsvcsexe, event, rtevent, rtsched {
+ after += CosEC_RtEC_Based_lib
+ includes += ../../lib
+ libs += CosEC_RtEC_Based
+ libpaths += ../../lib
+ source_files {
+ Consumer.cpp
+ Multiple.cpp
+ }
+}
+
+project(*Supplier) : orbsvcsexe, event, rtevent, rtsched {
+ after += CosEC_RtEC_Based_lib
+ includes += ../../lib
+ libs += CosEC_RtEC_Based
+ libpaths += ../../lib
+ source_files {
+ Supplier.cpp
+ Multiple.cpp
+ }
+}
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
new file mode 100644
index 00000000000..5033c7119db
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
@@ -0,0 +1,17 @@
+project(*Service) : orbsvcsexe, event {
+ Source_Files {
+ Service.cpp
+ }
+}
+
+project(*Consumer) : orbsvcsexe, event {
+ Source_Files {
+ Consumer.cpp
+ }
+}
+
+project(*Supplier) : orbsvcsexe, event {
+ Source_Files {
+ Supplier.cpp
+ }
+}
diff --git a/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc b/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc
new file mode 100644
index 00000000000..e92f4ddd5db
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc
@@ -0,0 +1,3 @@
+project(*Client) : orbsvcsexe, dslogadmin, naming {
+ exename = client
+}
diff --git a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
new file mode 100644
index 00000000000..0342db251bc
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
@@ -0,0 +1,13 @@
+project(*Consumer) : orbsvcsexe, event, dseventlogadmin {
+ exename = consumer
+ source_files {
+ Event_Consumer.cpp
+ }
+}
+
+project(*Supplier) : orbsvcsexe, event, dseventlogadmin {
+ exename = supplier
+ source_files {
+ Event_Supplier.cpp
+ }
+}
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
new file mode 100644
index 00000000000..04db7547923
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
@@ -0,0 +1,13 @@
+project(*Consumer) : orbsvcsexe, notify, dsnotifylogadmin, naming {
+ exename = consumer
+ source_files {
+ Notify_Consumer.cpp
+ }
+}
+
+project(*Supplier) : orbsvcsexe, notify, dsnotifylogadmin, naming {
+ exename = supplier
+ source_files {
+ Notify_Consumer.cpp
+ }
+}
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
new file mode 100644
index 00000000000..29b0ed09c28
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
@@ -0,0 +1,13 @@
+project(*Consumer) : orbsvcsexe, rtevent, naming, rteventlogadmin {
+ exename = consumer
+ source_files {
+ RTEvent_Consumer.cpp
+ }
+}
+
+project(*Supplier) : orbsvcsexe, rtevent, naming, rteventlogadmin {
+ exename = supplier
+ source_files {
+ RTEvent_Supplier.cpp
+ }
+}
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
new file mode 100644
index 00000000000..116a274b7cc
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
@@ -0,0 +1,2 @@
+project : orbsvcsexe, notify, naming {
+}
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
new file mode 100644
index 00000000000..116a274b7cc
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -0,0 +1,2 @@
+project : orbsvcsexe, notify, naming {
+}
diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc
new file mode 100644
index 00000000000..91d46f32abc
--- /dev/null
+++ b/TAO/orbsvcs/examples/ORT/ORT.mpc
@@ -0,0 +1,41 @@
+project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client {
+ source_files {
+ GatewayC.cpp
+ GatewayS.cpp
+ gateway_server.cpp
+ Gateway_i.cpp
+ Object_Factory_i.cpp
+ Gateway_ObjRef_Factory.cpp
+ }
+ idl_files {
+ Gateway.idl
+ }
+}
+
+project(*Server) : orbsvcsexe, dynamicinterface, ifr_client {
+ exename = server
+ after += *Gateway
+ source_files {
+ server.cpp
+ GatewayC.cpp
+ Gateway_ObjRef_Factory.cpp
+ sum_serverC.cpp
+ sum_serverS.cpp
+ sum_server_i.cpp
+ Server_IORInterceptor_ORBInitializer.cpp
+ Server_IORInterceptor.cpp
+ }
+}
+
+project(*Client) : orbsvcsexe, event {
+ after += *Server
+ source_files {
+ client.cpp
+ sum_serverC.cpp
+ }
+ idl_files {
+ sum_server.idl
+ }
+}
+
+
diff --git a/TAO/orbsvcs/examples/PSS/PSS.mpc b/TAO/orbsvcs/examples/PSS/PSS.mpc
new file mode 100644
index 00000000000..c47c4b1992d
--- /dev/null
+++ b/TAO/orbsvcs/examples/PSS/PSS.mpc
@@ -0,0 +1,44 @@
+project(*Simple_Naming) : orbsvcslib, portableserver, psdl {
+ source_files {
+ Simple_NamingC.cpp
+ Simple_NamingS.cpp
+ Simple_Naming_i.cpp
+ Simple_Naming.cpp
+ }
+ idl_files {
+ Simple_Naming.idl
+ }
+}
+
+project(*Server) : orbsvcsexe, portableserver, psdl {
+ after += *Simple_Naming
+ source_files {
+ ServerC.cpp
+ ServerS.cpp
+ Server_i.cpp
+ Simple_NamingS.cpp
+ Simple_NamingC.cpp
+ Simple_Naming_i.cpp
+ server.cpp
+ }
+ idl_files {
+ Server.idl
+ Simple_Naming.idl
+ }
+}
+
+project(*Client) : orbsvcsexe, psdl, portableserver {
+ after += *Server
+ source_files {
+ Simple_NamingS.cpp
+ Simple_NamingC.cpp
+ Simple_Naming_i.cpp
+ ServerC.cpp
+ client.cpp
+ }
+ idl_files {
+ Server.idl
+ Simple_Naming.idl
+ }
+}
+
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc
new file mode 100644
index 00000000000..3b221ef337f
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc
@@ -0,0 +1,2 @@
+project : orbsvcsexe, rtevent, rtsched {
+}
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc
new file mode 100644
index 00000000000..3b221ef337f
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc
@@ -0,0 +1,2 @@
+project : orbsvcsexe, rtevent, rtsched {
+}
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc
new file mode 100644
index 00000000000..fdfdba865b3
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc
@@ -0,0 +1,17 @@
+project(*Service) : orbsvcsexe, rtevent {
+ source_files {
+ Service.cpp
+ }
+}
+
+project(*Supplier) : orbsvcsexe, rtevent {
+ source_files {
+ Supplier.cpp
+ }
+}
+
+project(*Consumer) : orbsvcsexe, rtevent {
+ source_files {
+ Consumer.cpp
+ }
+}
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
new file mode 100644
index 00000000000..6d5c9b7ca05
--- /dev/null
+++ b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
@@ -0,0 +1,12 @@
+project(*Client) : orbsvcsexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*Server) : orbsvcsexe, portableserver {
+ source_files {
+ server.cpp
+ test_i.cpp
+ }
+}
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 2e1c740e937..7346a7b9a53 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -3,6 +3,8 @@ project(AV) : orbsvcslib, core, property, naming, qos {
idlflags += -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h
dynamicflags = TAO_AV_BUILD_DLL
tagchecks += AV
+ pch_header =
+ pch_source =
IDL_Files {
AVStreams.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index f47160d2565..438995fe3a0 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -3,6 +3,8 @@ project(CosConcurrency) : orbsvcslib, core, portableserver {
idlflags += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h
dynamicflags = TAO_CONCURRENCY_BUILD_DLL
tagchecks += Concurrency
+ pch_header =
+ pch_source =
IDL_Files {
CosConcurrencyControl.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index e541b8671b0..a9299738907 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -2,9 +2,17 @@
project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming {
sharedname = TAO_CosEvent
+ // Warning : The idlflags must match exactly those used in CosNotification, because
+ // we don't know which project will actually generate the IDL.
+ // For this reason we also just use the event_export.h and macros for
+ // both services.
idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
+
+ // Set both DLL flags because of the shared idl files
dynamicflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL
- tagchecks = CosEvent
+
+ tagchecks += CosEvent
+ // Add this include path for precompiled headers
includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index 06f723ed0cd..d79f8eb0207 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -3,6 +3,8 @@ project(CosLifeCycle) : orbsvcslib, core, naming {
idlflags += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h
dynamicflags = TAO_LIFECYCLE_BUILD_DLL
tagchecks += LifeCycle
+ pch_header =
+ pch_source =
IDL_Files {
CosLifeCycle.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index 01fe250960a..c38732f666c 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -1,7 +1,6 @@
-project(CosLoadBalancing) : orbsvcslib, core, naming, portablegroup, messaging {
+project : orbsvcslib, core, naming, portablegroup, messaging, ami {
sharedname = TAO_CosLoadBalancing
- requires += ami
- idlflags += -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h
+ idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h
dynamicflags = TAO_LOADBALANCING_BUILD_DLL
tagchecks += CosLoadBalancing
// Add this include path for precompiled headers
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 9dcc7a87261..d7aa70828a8 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,8 +1,14 @@
-project(CosNotification) : orbsvcslib, core, etcl, dynamicany, event {
+project(CosNotification) : orbsvcslib, core, etcl, dynamicany, portableserver {
sharedname = TAO_CosNotification
- idlflags += -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h
+ // Warning : The idlflags must match exactly those used in CosEvent, because
+ // we don't know which project will actually generate the IDL.
+ // For this reason we also just use the event_export.h and macros for
+ // both services.
+ idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
+
// Set both DLL flags because of the shared idl files
dynamicflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL
+
tagchecks += Notify
// Add this include path for precompiled headers
includes += $(TAO_ROOT)/orbsvcs/orbsvcs
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index a47c6481679..4766e31b13e 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -3,6 +3,8 @@ project(CosProperty) : orbsvcslib, core, portableserver {
idlflags += -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h
dynamicflags = TAO_PROPERTY_BUILD_DLL
tagchecks += Property
+ pch_header =
+ pch_source =
IDL_Files {
CosPropertyService.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index c753fd5d062..d4f3c6934e8 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -3,6 +3,8 @@ project(CosTrading) : orbsvcslib, core, dynamicany, svc_utils {
idlflags += -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h
dynamicflags = TAO_TRADING_BUILD_DLL
tagchecks += Trader
+ pch_header =
+ pch_source =
IDL_Files {
CosTrading.idl
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 68105c3bacd..ac8a815b26a 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -3,6 +3,8 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
idlflags += -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=Log/eventlog_export.h
dynamicflags = TAO_EVENTLOG_BUILD_DLL
tagchecks += EventLog
+ pch_header =
+ pch_source =
IDL_Files {
DsEventLogAdmin.idl
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index cb7c4096ea7..6268c56d3d2 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -3,6 +3,8 @@ project(DsLogAdmin) : orbsvcslib, core, etcl, naming, svc_utils, dynamicany {
idlflags += -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h
dynamicflags = TAO_LOG_BUILD_DLL
tagchecks += Log
+ pch_header =
+ pch_source =
IDL_Files {
DsLogAdmin.idl
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index d21224070d7..4bc6ce5daed 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -1,10 +1,12 @@
-project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, notification {
+project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, notification, naming {
after += DsEventLogAdmin
sharedname = TAO_DsNotifyLogAdmin
libs += TAO_DsEventLogAdmin
idlflags += -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h
dynamicflags = TAO_NOTIFYLOG_BUILD_DLL
tagchecks += Log
+ pch_header =
+ pch_source =
IDL_Files {
DsNotifyLogAdmin.idl
diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc
index 9f1c44bce52..6df047e1d0b 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL.mpc
+++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc
@@ -2,6 +2,8 @@ project(ETCL) : orbsvcslib, core {
sharedname = TAO_ETCL
dynamicflags = TAO_ETCL_BUILD_DLL
tagchecks += Notify
+ pch_header =
+ pch_source =
IDL_Files {
}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index 807c986a194..b4c852f5026 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -1,9 +1,11 @@
-project(SSLIOP) : orbsvcslib, corba_messaging, core, security, portableserver, ssl {
+project(SSLIOP) : orbsvcslib, core, security, portableserver, ssl {
requires += interceptors
sharedname = TAO_SSLIOP
idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h
dynamicflags = TAO_SSLIOP_BUILD_DLL
tagchecks += SSLIOP
+ pch_header =
+ pch_source =
IDL_Files {
SSLIOP.idl
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
index c08a6a105cf..cb49cc2358a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -1,4 +1,4 @@
-project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable, corba_messaging {
+project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable {
after += CosEvent_Test_Lib
libs += CECTests
includes += ../lib
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
index 64c4e2cbc93..1925cb18283 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
@@ -1,4 +1,4 @@
-project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver, corba_messaging {
+project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver {
sharedname = CECTests
dynamicflags = CEC_TEST_BUILD_DLL
Header_Files {
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
index b18305d9dfd..9f24bdc487e 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
@@ -1,4 +1,4 @@
-project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging {
exename = ECM_Supplier
Source_Files {
ECM_Data.cpp
@@ -6,7 +6,7 @@ project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging, corba_m
}
}
-project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging {
exename = ECM_Consumer
Source_Files {
ECM_Data.cpp
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
new file mode 100644
index 00000000000..895427c4339
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
@@ -0,0 +1,3 @@
+project(EC_MT_Mcast): rteventexe, messaging {
+ exename = MCast
+}
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
index 54b07f50600..bd03a22d6d4 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
@@ -1,3 +1,3 @@
-project(EC_Mcast): rteventexe, messaging, corba_messaging {
+project(EC_Mcast): rteventexe, messaging {
exename = EC_Mcast
}
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
index 97b1a32b606..7ad66908fb9 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
@@ -1,3 +1,3 @@
-project(EC_Multiple): rteventexe, rtoldevent, rtschedevent, naming, iortable, messaging, corba_messaging {
+project(EC_Multiple): rteventexe, rtoldevent, rtschedevent, naming, iortable, messaging {
exename = EC_Multiple
}
diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
index b2618598556..1256f6edba6 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
+++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
@@ -1,4 +1,4 @@
-project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
exename = ECT_Supplier
comps += Naming RTOLDEvent
@@ -9,7 +9,7 @@ project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messag
}
}
-project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
exename = ECT_Consumer
comps += Naming RTOLDEvent
@@ -20,7 +20,7 @@ project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messag
}
}
-project(ECT Throughput): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
+project(ECT Throughput): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
exename = ECT_Throughput
comps += Naming RTOLDEvent
diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
index 38e54d1ab3c..c9fab7fabf5 100644
--- a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
@@ -1,4 +1,4 @@
-project: messaging, rteventexe, naming, iortable, corba_messaging {
+project: messaging, rteventexe, naming, iortable {
after += Event_Test_Lib
libs += ECTests
includes += ../lib
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
index 3ceeb4c709a..52f12659a37 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
@@ -1,12 +1,11 @@
-project(*server): server, orbsvcsexe, iormanip, ftorb {
+project(*server): portableserver, orbsvcsexe, iormanip, ftorb {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Manager): taoserver, orbsvcsexe, iormanip, ftorb {
- exename = Manager
+project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb {
Source_Files {
testC.cpp
Manager.cpp
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
index 7830e63a8a6..a7d46dbeccb 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
@@ -1,3 +1,3 @@
-project(IOGRTest): taoserver, orbsvcsexe, iormanip, ftorb {
+project(IOGRTest): portableserver, orbsvcsexe, iormanip, ftorb {
exename = IOGRTest
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
index b94dc0ab17c..950ce66679d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, ifr_client {
+project(*server): taoexe, portableserver, ifr_client {
avoids += minimum_corba
Source_Files {
@@ -7,7 +7,7 @@ project(*server): taoserver, ifr_client {
}
}
-project(*client): taoserver, ifr_client, dynamicinterface {
+project(*client): taoexe, portableserver, ifr_client, dynamicinterface {
avoids += minimum_corba
IDL_Files {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
new file mode 100644
index 00000000000..7cd2e4c0241
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
@@ -0,0 +1,13 @@
+project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
+ Source_Files {
+ server.cpp
+ LB_server.cpp
+ Basic.cpp
+ }
+}
+
+project(*client): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
+ Source_Files {
+ client.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
new file mode 100644
index 00000000000..cf940d41f7e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
@@ -0,0 +1,2 @@
+project : orbsvcsexe, dslogadmin, naming, dynamicany, iortable, etcl {
+} \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
index 22511d8ea6d..9f78bcadbf1 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
@@ -1,15 +1,11 @@
-project(*server): server, orbsvcsexe {
- comps += PortableGroup
-
+project(*server): orbsvcsexe, portablegroup, portableserver {
Source_Files {
McastHello.cpp
server.cpp
}
}
-project(*client): client, orbsvcsexe {
- comps += PortableGroup
-
+project(*client): orbsvcsexe, portablegroup, portableserver {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
index b23d1388ccc..b44d9380f30 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
+++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
@@ -1,47 +1,35 @@
project(*Notify ConnectDisconnect): notifytest {
- exename = ConnectDisconnect
-
Source_Files {
ConnectDisconnect.cpp
}
}
-project(*Notify LifeCycle): notifytest {
- exename = LifeCycle
-
+project(*Notify LifeCycle): notifytest, naming {
Source_Files {
LifeCycle.cpp
}
}
-project(*Notify IdAssignment): notifytest {
- exename = IdAssignment
-
+project(*Notify IdAssignment): notifytest, naming {
Source_Files {
IdAssignment.cpp
}
}
project(*Notify Events): notifytest {
- exename = Events
-
Source_Files {
Events.cpp
}
}
project(*Notify AdminProperties): notifytest {
- exename = AdminProperties
-
Source_Files {
AdminProperties.cpp
}
}
project(*Notify Simple): notifytest {
- exename = Simple
-
Source_Files {
Simple.cpp
}
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc
index 5ee6ac4d4f7..108d551895e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc
@@ -1,4 +1,4 @@
-project(*Notify Structured Supplier): notifytest {
+project(*Notify Structured Supplier): notifytest, naming {
exename = Structured_Supplier
Source_Files {
@@ -6,7 +6,7 @@ project(*Notify Structured Supplier): notifytest {
}
}
-project(*Notify Structured Consumer): notifytest {
+project(*Notify Structured Consumer): notifytest, naming {
exename = Structured_Consumer
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc
index d8c014e0cab..e362b11ada8 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc
@@ -1,4 +1,4 @@
-project(*Notify Structured Supplier): notifytest {
+project(*Notify Structured Supplier): notifytest, naming {
exename = Structured_Supplier
Source_Files {
@@ -7,7 +7,7 @@ project(*Notify Structured Supplier): notifytest {
}
}
-project(*Notify Structured Consumer): notifytest {
+project(*Notify Structured Consumer): notifytest, naming {
exename = Structured_Consumer
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index 7e0cd7fbc09..4cc646ec5dc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -1,4 +1,4 @@
-project(NotifyTests_Lib): orbsvcslib, notify {
+project(NotifyTests_Lib): orbsvcslib, notify, naming {
sharedname = NotifyTests
dynamicflags = TAO_NOTIFY_TEST_BUILD_DLL
} \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
index 84a3653adac..f0463d665e5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
@@ -1,3 +1,3 @@
-project(*notify perf RedGreen): notifytest {
+project(*notify perf RedGreen): notifytest, naming {
exename = RedGreen_Test
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
index 144536943a2..740e3e54598 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -1,3 +1,3 @@
-project(*notify perf Throughput): notifytest, strategies, messaging {
+project(*notify perf Throughput): notifytest, strategies, messaging, naming {
exename = Throughput
}
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
index a522e058a80..43c4f1a6890 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,13 +1,12 @@
-project(*server): taoserver, namingexe, property {
+project(*server): namingexe, property {
Source_Files {
server.cpp
}
}
-project(*client): server, namingexe, property {
- exename = client
+project(*client): namingexe, property {
Source_Files {
- server.cpp
+ client.cpp
}
}
diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc
index 867eebf770d..a0ac07993ea 100644
--- a/TAO/orbsvcs/tests/Sched/Sched.mpc
+++ b/TAO/orbsvcs/tests/Sched/Sched.mpc
@@ -1,3 +1,3 @@
-project: taoserver, namingexe, rtsched {
+project: namingexe, rtsched {
exename = Sched
}
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
index e51d0d2888f..ad90edfe6c1 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
@@ -1,5 +1,4 @@
-project: taoserver, namingexe, rtsched {
- exename = Sched_Conf
+project: namingexe, rtsched {
Source_Files {
Sched_Conf.cpp
}
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
index d2151a236e9..b89a22b668a 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -1,11 +1,11 @@
-project(*security server): taoserver, ssl {
+project(*security server): taoexe, portableserver, ssl {
Source_Files {
TX_Object_i.cpp
server.cpp
}
}
-project(*security client): taoclient, ssl {
+project(*security client): taoexe, ssl {
Source_Files {
TX_ObjectC.cpp
client.cpp
diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
index afe593a5d41..a25691b74cf 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
+++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
@@ -1,4 +1,4 @@
-project(*security server): taoserver, ssl {
+project(*security server): taoexe, portableserver, ssl {
IDL_Files {
server.idl
client.idl
@@ -13,9 +13,7 @@ project(*security server): taoserver, ssl {
}
}
-project(*security client): taoserver, ssl {
- exename = client
-
+project(*security client): taoexe, portableserver, ssl {
IDL_Files {
server.idl
client.idl
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
new file mode 100644
index 00000000000..34f47576f33
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
@@ -0,0 +1,13 @@
+project(*server): taoexe, portableserver, ssliop {
+ Source_Files {
+ test_i.cpp
+ server.cpp
+ }
+}
+
+project(*client): taoexe, portableserver, ssliop {
+ Source_Files {
+ client.cpp
+ }
+}
+
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
index 2736c3d344c..00386651f79 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
@@ -1,4 +1,4 @@
-project(*security server): orbsvcsexe, portableserver, ssl {
+project(*security server): orbsvcsexe, portableserver, ssl, ssliop {
Source_Files {
Server_Worker.cpp
test_i.cpp
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
index 2164d5133bb..4e2ea300711 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -1,11 +1,11 @@
-project(*security server): taoserver, orbsvcsexe, security, ssl {
+project(*security server): taoexe, portableserver, orbsvcsexe, security, ssl {
Source_Files {
Foo_i.cpp
server.cpp
}
}
-project(*security client): taoclient, orbsvcsexe, security, ssl {
+project(*security client): taoexe, orbsvcsexe, security, ssl {
Source_Files {
FooC.cpp
client.cpp
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
index f6d5f7a0e8d..d7484d719f8 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
@@ -1,11 +1,11 @@
-project(*security server): taoserver, orbsvcsexe, ssl, security {
+project(*security server): taoexe, portableserver, orbsvcsexe, ssl, security {
Source_Files {
SLevel1_Test_i.cpp
server.cpp
}
}
-project(*security client): taoclient, orbsvcsexe, ssl, security {
+project(*security client): taoexe, orbsvcsexe, ssl, security {
Source_Files {
SLevel1_TestC.cpp
client.cpp
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
index 71352b6ae9c..e96fa11a0d0 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
+++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
@@ -1,6 +1,4 @@
project(*Client) : namingexe {
- exename = client
-
Source_Files {
client.cpp
}
diff --git a/TAO/orbsvcs/tests/Time/Time.mpc b/TAO/orbsvcs/tests/Time/Time.mpc
index 6939095c7fd..f85b4648872 100644
--- a/TAO/orbsvcs/tests/Time/Time.mpc
+++ b/TAO/orbsvcs/tests/Time/Time.mpc
@@ -1,3 +1,2 @@
-project(*client): taoserver, namingexe, time {
- exename = client
+project(*client): namingexe, time {
}
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index 94db6d210e4..fe3b0a0f407 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,6 +1,7 @@
project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany, portableserver {
sharedname = TTest
dynamicflags = TRADING_TEST_BUILD_DLL
+ idlflags += -Wb,export_macro=Trading_Test_Export -Wb,export_include=ttest_export.h
Source_Files {
TT_Info.cpp
@@ -22,7 +23,6 @@ project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany
project(*export test): namingexe, trading, dynamicany {
after += Trading_Test_Lib
libs += TTest
- exename = export_test
IDL_Files {
}
@@ -35,7 +35,6 @@ project(*export test): namingexe, trading, dynamicany {
project(*import test): namingexe, trading, dynamicany {
after += Trading_Test_Lib
libs += TTest
- exename = import_test
IDL_Files {
}
@@ -48,7 +47,6 @@ project(*import test): namingexe, trading, dynamicany {
project(*colocated test): namingexe, trading, dynamicany {
after += Trading_Test_Lib
libs += TTest
- exename = colocated_test
IDL_Files {
}
diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index 6724439b7c4..bec28af7c1c 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -1,6 +1,4 @@
-project(*server): messaging, server, strategies {
- requires += corba_messaging
-
+project(*server): taoexe, messaging, portableserver, strategies {
Source_Files {
Server_i.cpp
server.cpp
@@ -8,10 +6,7 @@ project(*server): messaging, server, strategies {
}
-project(*client): messaging, server, strategies {
- exename = client
- requires += corba_messaging
-
+project(*client): taoexe, messaging, portableserver, strategies {
Source_Files {
Callback_i.cpp
client.cpp
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
index ba7a7ee6bc1..8e109791970 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
@@ -1,5 +1,4 @@
-project(*client): taoserver, strategies, dynamicinterface {
- exename = client
+project(*client): taoexe, portableserver, strategies, dynamicinterface {
after += IDL_Cubit_Server
idlflags += -Gd
avoids += minimum_corba
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
index 322c702a920..537d1437176 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver, strategies {
+project(*Server): taoexe, portableserver, strategies {
idlflags += -Gd
Source_Files {
@@ -11,8 +11,7 @@ project(*Server): taoserver, strategies {
}
}
-project(*client): taoserver, strategies {
- exename = client
+project(*client): taoexe, portableserver, strategies {
idlflags += -Gd
Source_Files {
@@ -23,8 +22,11 @@ project(*client): taoserver, strategies {
}
}
-project(*collocation): taoserver, strategies {
- exename = collocation/collocation_test
+project(*collocation): taoexe, portableserver, strategies {
+ // Note : You can't just prepend collocation/ to the exename
+ // to get it to ouput to that directory. It won't go
+ // to the right place on some platforms. (Windows)
+ exename = collocation_test
idlflags += -Gd
Source_Files {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
index b330bcc57ef..c2f5a68c3ce 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, strategies {
+project(*server): taoexe, portableserver, strategies {
Source_Files {
tmplinst.cpp
Timer.cpp
@@ -9,9 +9,7 @@ project(*server): taoserver, strategies {
}
}
-project(*client): taoserver, strategies {
- exename = client
-
+project(*client): taoexe, portableserver, strategies {
Source_Files {
tmplinst.cpp
Timer.cpp
diff --git a/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc
index ad9cc95b24d..129fd474a4c 100644
--- a/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc
@@ -1,17 +1,11 @@
-project(*AMH server): taoserver, strategies, valuetype {
- idlflags += -GH
- requires += ami
-
+project(*AMH server): taoexe, portableserver, strategies, valuetype, amh {
Source_Files {
Roundtrip.cpp
server.cpp
}
}
-project(*AMH client): taoclient, strategies, valuetype {
- idlflags += -GH
- requires += ami
-
+project(*AMH client): taoexe, strategies, valuetype, amh {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/performance-tests/Latency/AMI/AMI.mpc b/TAO/performance-tests/Latency/AMI/AMI.mpc
index caea1f693ad..015d236a55d 100644
--- a/TAO/performance-tests/Latency/AMI/AMI.mpc
+++ b/TAO/performance-tests/Latency/AMI/AMI.mpc
@@ -1,8 +1,4 @@
-project(*latency server): messaging, taoserver, strategies {
- idlflags -= -Sc
- idlflags += -GC
- requires += ami
-
+project(*latency server): messaging, taoexe, portableserver, strategies, ami {
Source_Files {
Roundtrip.cpp
Server_Task.cpp
@@ -10,12 +6,7 @@ project(*latency server): messaging, taoserver, strategies {
}
}
-project(*latency client): messaging, taoserver, strategies {
- exename = client
- idlflags -= -Sc
- idlflags += -GC
- requires += ami
-
+project(*latency client): messaging, taoexe, portableserver, strategies, ami {
Source_Files {
Roundtrip_Handler.cpp
client.cpp
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index a54b77e76af..a2bc1982d30 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -1,4 +1,4 @@
-project(*latency server): taoserver, strategies {
+project(*latency server): taoexe, portableserver, strategies {
avoids += minimum_corba
Source_Files {
@@ -7,8 +7,7 @@ project(*latency server): taoserver, strategies {
}
}
-project(*latency client): taoserver, strategies, dynamicinterface {
- exename = client
+project(*latency client): taoexe, portableserver, strategies, dynamicinterface {
avoids += minimum_corba
Source_Files {
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index a09345a6fe5..e9c3ed16042 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -1,4 +1,4 @@
-project(*latency server): taoserver, strategies, dynamicinterface {
+project(*latency server): taoexe, portableserver, strategies, dynamicinterface {
avoids += minimum_corba
IDL_Files {
@@ -10,7 +10,7 @@ project(*latency server): taoserver, strategies, dynamicinterface {
}
}
-project(*latency client): taoclient, strategies {
+project(*latency client): taoexe, strategies {
avoids += minimum_corba
Source_Files {
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index 11703566fbe..78e25595b13 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, strategies {
+project(*server): taoexe, portableserver, strategies {
avoids += minimum_corba
Source_Files {
@@ -7,8 +7,7 @@ project(*server): taoserver, strategies {
}
}
-project(*client): taoserver, strategies, dynamicinterface {
- exename = client
+project(*client): taoexe, portableserver, strategies, dynamicinterface {
avoids += minimum_corba
Source_Files {
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
index bcfe645d131..b696c37463b 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, strategies {
+project(*server): taoexe, portableserver, strategies {
avoids += minimum_corba
Source_Files {
@@ -7,7 +7,7 @@ project(*server): taoserver, strategies {
}
}
-project(*client): taoclient, strategies {
+project(*client): taoexe, strategies {
avoids += minimum_corba
Source_Files {
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
index 0d491f6e4b4..494e46161f1 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
@@ -1,11 +1,11 @@
-project(*server): taoserver, strategies {
+project(*server): taoexe, portableserver, strategies {
Source_Files {
Roundtrip.cpp
server.cpp
}
}
-project(*client) : taoclient, strategies {
+project(*client) : taoexe, strategies {
Source_Files {
TestC.cpp
Client_Task.cpp
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
index edf85ac9ddc..48c334a4003 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,4 +1,4 @@
-project(*latency server): taoserver, strategies {
+project(*latency server): taoexe, portableserver, strategies {
Source_Files {
Roundtrip.cpp
Worker_Thread.cpp
@@ -6,7 +6,7 @@ project(*latency server): taoserver, strategies {
}
}
-project(*latency client): taoclient, strategies {
+project(*latency client): taoexe, strategies {
Source_Files {
TestC.cpp
Client_Task.cpp
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
new file mode 100644
index 00000000000..a5bd7d64846
--- /dev/null
+++ b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
@@ -0,0 +1,13 @@
+project(*client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ Foo_i.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver {
+ source_files {
+ server.cpp
+ Memory_Growth.cpp
+ }
+}
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
index f66ba34400d..b79e99e89ff 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
@@ -1,11 +1,11 @@
-project(*server): taoserver {
+project(*server): taoexe, portableserver {
Source_Files {
Memory_Growth.cpp
server.cpp
}
}
-project(*client): taoclient {
+project(*client): taoexe {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index e699ea13391..0f53b8f4329 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -1,3 +1,3 @@
-project: taoserver {
+project: taoexe, portableserver {
exename = create_reference
}
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index 3773b7f6b89..97a879f9db9 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver {
+project(*server): taoexe, portableserver {
Source_Files {
Factory.cpp
Simple.cpp
@@ -6,16 +6,14 @@ project(*server): taoserver {
}
}
-project(*client): taoclient {
+project(*client): taoexe {
Source_Files {
TestC.cpp
client.cpp
}
}
-project(*collocated): taoserver {
- exename = collocated
-
+project(*collocated): taoexe, portableserver {
Source_Files {
Simple.cpp
collocated.cpp
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
index fafea6dc2b4..73b7bfb543c 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
@@ -1,3 +1,3 @@
-project(registration): taoserver {
+project(registration): taoexe, portableserver {
exename = registration
}
diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc
index 11f18462fe0..ab21f784044 100644
--- a/TAO/performance-tests/Pluggable/Pluggable.mpc
+++ b/TAO/performance-tests/Pluggable/Pluggable.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver {
+project(*server): taoexe, portableserver {
Source_Files {
PP_Test_Server.cpp
PP_Test_i.cpp
@@ -6,7 +6,7 @@ project(*server): taoserver {
}
}
-project(*client) : taoclient {
+project(*client) : taoexe {
Source_Files {
PP_TestC.cpp
PP_Test_Client.cpp
diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc
index 87940c2d100..9ea2bbeb06b 100644
--- a/TAO/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/performance-tests/Throughput/Throughput.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, strategies {
+project(*server): taoexe, portableserver, strategies {
Source_Files {
Receiver_Factory.cpp
Receiver.cpp
@@ -6,7 +6,7 @@ project(*server): taoserver, strategies {
}
}
-project(*client):taoclient, strategies {
+project(*client):taoexe, strategies {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc
index e17a9a8f1af..b858224c2a8 100644
--- a/TAO/tao/RTCORBA/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA/RTCORBA.mpc
@@ -3,5 +3,5 @@ project : taolib, core {
sharedname = TAO_RTCORBA
dynamicflags = TAO_RTCORBA_BUILD_DLL
include_dir = tao/RTCORBA
- requires += rt_corba corba_messaging
+ requires += rt_corba
}
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc
index 8f04a095651..fab151a6192 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc
@@ -1,5 +1,5 @@
// $Id$
-project : taolib, core, rtcorba, portableserver, corba_messaging {
+project : taolib, core, rtcorba, portableserver {
sharedname = TAO_RTPortableServer
dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL
include_dir = tao/RTPortableServer
diff --git a/TAO/tao/Utils/tao_Utils.mpc b/TAO/tao/Utils/tao_Utils.mpc
new file mode 100644
index 00000000000..02aa20cfedf
--- /dev/null
+++ b/TAO/tao/Utils/tao_Utils.mpc
@@ -0,0 +1,8 @@
+project : taolib, portableserver {
+ sharedname = TAO_Utils
+ source_files {
+ ORB_Destroyer.cpp
+ Implicit_Deactivator.cpp
+ PolicyList_Destroyer.cpp
+ }
+}
diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
new file mode 100644
index 00000000000..7e636174bd3
--- /dev/null
+++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
@@ -0,0 +1,11 @@
+project(*Server): taoexe, amh, portableserver, strategies {
+ Source_Files {
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, amh, portableserver, strategies {
+ Source_Files {
+ client.cpp
+ }
+}
diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
new file mode 100644
index 00000000000..ed0e2f4dd96
--- /dev/null
+++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
@@ -0,0 +1,11 @@
+project(*client) : taoexe, portableserver, amh {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver, amh, strategies {
+ source_files {
+ server.cpp
+ }
+}
diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc
index 97a8ef209f0..900f98a90dc 100644
--- a/TAO/tests/AMI/AMI.mpc
+++ b/TAO/tests/AMI/AMI.mpc
@@ -1,31 +1,17 @@
-project(*Server): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- requires += ami
-
+project(*Server): messaging, taoexe, portableserver, ami {
Source_Files {
ami_test_i.cpp
server.cpp
}
}
-project(*Client): messaging, taoserver {
- exename = client
- idlflags -= -Sc
- idlflags += -GC
- requires += ami
-
+project(*Client): messaging, taoexe, portableserver, ami {
Source_Files {
client.cpp
}
}
-project(*Simple Client): messaging, taoserver {
- exename = simple_client
- idlflags -= -Sc
- idlflags += -GC
- requires += ami
-
+project(*Simple Client): messaging, taoexe, portableserver, ami {
Source_Files {
simple_client.cpp
}
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index d909d73dcb1..34c525acdc4 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -1,20 +1,11 @@
-project(*Server): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- requires += ami
-
+project(*Server): messaging, taoexe, portableserver, ami {
Source_Files {
AMI_Buffering.cpp
server.cpp
}
}
-project(*Client): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- exename = client
- requires += ami
-
+project(*Client): messaging, taoexe, portableserver, ami {
Source_Files {
Client_Task.cpp
Reply_Handler.cpp
@@ -22,12 +13,7 @@ project(*Client): messaging, taoserver {
}
}
-project(*Admin): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- exename = admin
- requires += ami
-
+project(*Admin): messaging, taoexe, portableserver, ami {
Source_Files {
AMI_Buffering_Admin.cpp
admin.cpp
diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
index 00f6a25e656..abde8207d57 100644
--- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
+++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
@@ -1,8 +1,4 @@
-project(*Server): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- requires += ami
-
+project(*Server): messaging, taoexe, portableserver, ami {
Source_Files {
timeout_i.cpp
timeout_client.cpp
@@ -10,12 +6,7 @@ project(*Server): messaging, taoserver {
}
}
-project(*Client): messaging, taoserver {
- exename = client
- idlflags -= -Sc
- idlflags += -GC
- requires += ami
-
+project(*Client): messaging, taoexe, portableserver, ami {
Source_Files {
timeout_i.cpp
timeout_client.cpp
diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
new file mode 100644
index 00000000000..6a4e0fa93a5
--- /dev/null
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -0,0 +1,12 @@
+project(*client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver {
+ source_files {
+ server.cpp
+ test_i.cpp
+ }
+}
diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index 02a14f75bd1..9200324315c 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -1,12 +1,11 @@
-project(*Server): taoserver, minimum_corba, bidir_giop {
+project(*Server): taoexe, portableserver, minimum_corba, bidir_giop {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoserver, minimum_corba, bidir_giop {
- exename = client
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
Source_Files {
test_i.cpp
client.cpp
diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc
index 02a14f75bd1..9200324315c 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc
+++ b/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc
@@ -1,12 +1,11 @@
-project(*Server): taoserver, minimum_corba, bidir_giop {
+project(*Server): taoexe, portableserver, minimum_corba, bidir_giop {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoserver, minimum_corba, bidir_giop {
- exename = client
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
Source_Files {
test_i.cpp
client.cpp
diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index ab5e4413354..40a3f42babf 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Coordinator.cpp
Session_Control.cpp
@@ -6,8 +6,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoserver {
- exename = client
+project(*Client): taoexe, portableserver {
Source_Files {
Peer.cpp
Session.cpp
diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc
index 03dda1af90a..c813e515df6 100644
--- a/TAO/tests/Big_Reply/Big_Reply.mpc
+++ b/TAO/tests/Big_Reply/Big_Reply.mpc
@@ -1,12 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Big_Reply_i.cpp
server.cpp
}
}
-project(*Client): taoserver {
- exename = client
+project(*Client): taoexe, portableserver {
Source_Files {
Client_Task.cpp
client.cpp
diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index 89f85954cea..93f04a31dab 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver, messaging, corba_messaging {
+project(*Server): taoexe, portableserver, messaging {
Source_Files {
Payload_Receiver.cpp
server.cpp
}
}
-project(*Client): taoclient, messaging, corba_messaging {
+project(*Client): taoexe, messaging {
exename = client
Source_Files {
diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc
index c56ce775286..40a3f42babf 100644
--- a/TAO/tests/Big_Twoways/Big_Twoways.mpc
+++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Coordinator.cpp
Session_Control.cpp
@@ -6,8 +6,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoserver {
- exename = client
+project(*Client): taoexe, portableserver {
Source_Files {
Peer.cpp
Session.cpp
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
index 3a4fc31ac23..f8efa6912bf 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
@@ -1,13 +1,11 @@
-project(*Server): taoserver, messaging, corba_messaging {
+project(*Server): taoexe, portableserver, messaging {
Source_Files {
Blocking_Sync_None.cpp
server.cpp
}
}
-project(*Client): taoclient, messaging, corba_messaging {
- exename = client
-
+project(*Client): taoexe, messaging {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
new file mode 100644
index 00000000000..21794c84bdc
--- /dev/null
+++ b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
@@ -0,0 +1,15 @@
+project(*Server): taoexe, messaging {
+ Source_Files {
+ Echo_Caller.cpp
+ Server_Task.cpp
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, messaging {
+ Source_Files {
+ Echo.cpp
+ Client_Task.cpp
+ client.cpp
+ }
+}
diff --git a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
new file mode 100644
index 00000000000..ff182199ab2
--- /dev/null
+++ b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
@@ -0,0 +1,16 @@
+project(*Server): taoexe, messaging {
+ Source_Files {
+ ORB_Task.cpp
+ Server_i.cpp
+ Server_Task.cpp
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, messaging {
+ Source_Files {
+ Echo.cpp
+ ORB_Task.cpp
+ client.cpp
+ }
+}
diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
new file mode 100644
index 00000000000..db53253b874
--- /dev/null
+++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
@@ -0,0 +1,14 @@
+project(*Server): taoexe, messaging {
+ Source_Files {
+ Echo_Caller.cpp
+ Server_Timer.cpp
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, messaging {
+ Source_Files {
+ Echo.cpp
+ client.cpp
+ }
+}
diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
new file mode 100644
index 00000000000..9cac2bd4573
--- /dev/null
+++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
@@ -0,0 +1,20 @@
+project(*Server): taoexe, messaging {
+ Source_Files {
+ Echo_Caller.cpp
+ Server_Timer.cpp
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, messaging {
+ Source_Files {
+ Echo.cpp
+ client.cpp
+ }
+}
+
+project(*Shutdown): taoexe, messaging {
+ Source_Files {
+ shutdown.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
new file mode 100644
index 00000000000..9ae9ab886b8
--- /dev/null
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -0,0 +1,22 @@
+project(*Server): taoexe, messaging {
+ Source_Files {
+ Server_Thread_Pool.cpp
+ Echo_Caller.cpp
+ ORB_Task.cpp
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, messaging {
+ Source_Files {
+ Echo.cpp
+ ORB_Task.cpp
+ client.cpp
+ }
+}
+
+project(*Shutdown): taoexe, messaging {
+ Source_Files {
+ shutdown.cpp
+ }
+} \ No newline at end of file
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index 224d880b5a4..6518afd3574 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Hello.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index 10d2a8cc2a0..64e3b169164 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Process_Factory.cpp
Startup_Callback.cpp
@@ -7,7 +7,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
TestC.cpp
Client_Task.cpp
@@ -15,8 +15,7 @@ project(*Client): taoclient {
}
}
-project(*Child): taoserver {
- exename = child
+project(*Child): taoexe, portableserver {
Source_Files {
Process.cpp
child.cpp
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
new file mode 100644
index 00000000000..e8db4a343af
--- /dev/null
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
@@ -0,0 +1,4 @@
+project(*) : taolib {
+ sharedname = IBM1047_ISO8859
+ dynamicflags += IBM1047_ISO8859_BUILD_DLL
+} \ No newline at end of file
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
new file mode 100644
index 00000000000..9ade7e4ec2e
--- /dev/null
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -0,0 +1,11 @@
+project(*client) : taoexe, portableserver {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver {
+ source_files {
+ server.cpp
+ }
+}
diff --git a/TAO/tests/Codec/Codec.mpc b/TAO/tests/Codec/Codec.mpc
index 6786698646b..35490fd4e4e 100644
--- a/TAO/tests/Codec/Codec.mpc
+++ b/TAO/tests/Codec/Codec.mpc
@@ -1,4 +1,4 @@
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc
index d785588c6b2..101d32c8094 100644
--- a/TAO/tests/Collocation/Collocation.mpc
+++ b/TAO/tests/Collocation/Collocation.mpc
@@ -21,9 +21,8 @@ project(*Diamond) : taolib_with_idl, portableserver {
}
}
-project(*Server) : strategies, taoserver {
+project(*Server) : strategies, taoexe, portableserver {
after += Collocation_Test_Stub Collocation_Diamond
- exename = Collocation
libs += Collocation_Test_Stub Collocation_Diamond
IDL_Files {
diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
index 224d880b5a4..6518afd3574 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Hello.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index 89dcd95be73..da5509a6e51 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -1,11 +1,11 @@
-project(*Server): strategies, taoserver {
+project(*Server): strategies, taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): strategies, taoclient {
+project(*Client): strategies, taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
index 87afbec141d..4f33e299bdd 100644
--- a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
+++ b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
@@ -1,6 +1,4 @@
-project(*client): messaging, taoserver {
- exename = client
-
+project(*client): messaging, taoexe, portableserver {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index 53f8d946646..4e25be41ef3 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Oneway_Receiver.cpp
Crash_Task.cpp
@@ -6,7 +6,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
index 791650d5867..dc4eb9c7a7a 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -1,13 +1,11 @@
-project(*Server): taoserver, messaging, corba_messaging {
+project(*Server): taoexe, portableserver, messaging {
Source_Files {
Service.cpp
server.cpp
}
}
-project(*Client): taoserver, messaging, corba_messaging {
- exename = client
-
+project(*Client): taoexe, portableserver, messaging {
Source_Files {
Crashed_Callback.cpp
client.cpp
diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc
index 039b402d33f..7137ff9f5a0 100644
--- a/TAO/tests/DLL_ORB/DLL_ORB.mpc
+++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc
@@ -28,7 +28,7 @@ project(*Server) : taoexe {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
IDL_Files {
}
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
index 30596502ace..f868cef553e 100644
--- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
+++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
@@ -1,20 +1,18 @@
-project(*Server): taoserver, messaging, minimum_corba, dynamicinterface {
+project(*Server): taoexe, portableserver, messaging, minimum_corba, dynamicinterface {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient, messaging, minimum_corba, dynamicinterface {
- exename = client
+project(*Client): taoexe, messaging, minimum_corba, dynamicinterface {
Source_Files {
testC.cpp
client.cpp
}
}
-project(*Gateway): taoserver, messaging, minimum_corba, dynamicinterface {
- exename = gateway
+project(*Gateway): taoexe, portableserver, messaging, minimum_corba, dynamicinterface {
Source_Files {
test_dsi.cpp
gateway.cpp
diff --git a/TAO/tests/DynAny_Test/DynAny_Test.mpc b/TAO/tests/DynAny_Test/DynAny_Test.mpc
index 41368fc7d36..073ebe3b272 100644
--- a/TAO/tests/DynAny_Test/DynAny_Test.mpc
+++ b/TAO/tests/DynAny_Test/DynAny_Test.mpc
@@ -1,4 +1,4 @@
-project(*Basic): taoserver, dynamicany {
+project(*Basic): taoexe, portableserver, dynamicany {
exename = basic_test
Source_Files {
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 97ea73757b1..f0de4424210 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -1,10 +1,10 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
timeC.cpp
client.cpp
diff --git a/TAO/tests/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc
new file mode 100644
index 00000000000..4db25c676a5
--- /dev/null
+++ b/TAO/tests/FL_Cube/FL_Cube.mpc
@@ -0,0 +1,11 @@
+project(*client) : taoexe, portableserver, strategies {
+ source_files {
+ client.cpp
+ }
+}
+
+project(*server) : taoexe, portableserver, strategies {
+ source_files {
+ server.cpp
+ }
+}
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 8cb0336f7a0..0b3a8506b6b 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver, minimum_corba {
+project(*Server): taoexe, portableserver, minimum_corba {
IDL_Files {
test.idl
}
@@ -11,9 +11,7 @@ project(*Server): taoserver, minimum_corba {
}
}
-project(*Middle): taoserver, minimum_corba {
- exename = middle
-
+project(*Middle): taoexe, portableserver, minimum_corba {
IDL_Files {
test.idl
}
@@ -26,9 +24,7 @@ project(*Middle): taoserver, minimum_corba {
}
}
-project(*Client): taoserver, minimum_corba {
- exename = client
-
+project(*Client): taoexe, portableserver, minimum_corba {
IDL_Files {
test.idl
}
@@ -41,9 +37,7 @@ project(*Client): taoserver, minimum_corba {
}
}
-project(*Ping): taoserver, minimum_corba {
- exename = ping
-
+project(*Ping): taoexe, portableserver, minimum_corba {
IDL_Files {
ping.idl
}
@@ -56,9 +50,7 @@ project(*Ping): taoserver, minimum_corba {
}
}
-project(*Pong): taoserver, minimum_corba {
- exename = pong
-
+project(*Pong): taoexe, portableserver, minimum_corba {
IDL_Files {
ping.idl
}
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index be22c626b2d..6f258abd277 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver, minimum_corba {
+project(*Server): taoexe, portableserver, minimum_corba {
Source_Files {
File_i.cpp
server.cpp
}
}
-project(*Client): taoclient, minimum_corba {
+project(*Client): taoexe, minimum_corba {
Source_Files {
FileC.cpp
client.cpp
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index 978c8f4a0b9..b216a9badf9 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver, iortable {
+project(*Server): taoexe, portableserver, iortable {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc
index 224d880b5a4..6518afd3574 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Hello.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index f3c8befcfee..a4f937786a8 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -1,5 +1,4 @@
-project(*Server): taoserver, iortable {
- exename = INS_test_server
+project(*Server): taoexe, portableserver, iortable {
Source_Files {
INS_i.cpp
Server_i.cpp
@@ -7,9 +6,7 @@ project(*Server): taoserver, iortable {
}
}
-project(*Client): taoclient {
- exename = INS_test_client
-
+project(*Client): taoexe {
Source_Files {
INSC.cpp
INS_test_client.cpp
diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc
index 89dcd95be73..da5509a6e51 100644
--- a/TAO/tests/Leader_Followers/Leader_Followers.mpc
+++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc
@@ -1,11 +1,11 @@
-project(*Server): strategies, taoserver {
+project(*Server): strategies, taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): strategies, taoclient {
+project(*Client): strategies, taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index bb5e4208dce..d853880a940 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -1,45 +1,25 @@
-project(*Server): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- exename = blocking_server
- requires += ami
-
+project(*Server): messaging, taoexe, portableserver, ami {
Source_Files {
Manager.cpp
blocking_server.cpp
}
}
-project(*Client): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- exename = blocking_client
- requires += ami
-
+project(*Client): messaging, taoexe, portableserver, ami {
Source_Files {
Controller.cpp
blocking_client.cpp
}
}
-project(*AMI Server): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- exename = ami_server
- requires += ami
-
+project(*AMI Server): messaging, taoexe, portableserver, ami {
Source_Files {
AMI_Manager.cpp
ami_server.cpp
}
}
-project(*AMI Client): messaging, taoserver {
- idlflags -= -Sc
- idlflags += -GC
- exename = ami_client
- requires += ami
-
+project(*AMI Client): messaging, taoexe, portableserver, ami {
Source_Files {
Controller.cpp
Manager_Handler.cpp
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc
index 322ca29c620..358f1b89877 100644
--- a/TAO/tests/MProfile/MProfile.mpc
+++ b/TAO/tests/MProfile/MProfile.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver, iormanip {
+project(*Server): taoexe, portableserver, iormanip {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient, iormanip {
+project(*Client): taoexe, iormanip {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
index 014dee61b55..2765c00e610 100644
--- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
+++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver, messaging, iormanip {
+project(*Server): taoexe, portableserver, messaging, iormanip {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient, messaging, iormanip {
+project(*Client): taoexe, messaging, iormanip {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index 70eceb0b291..b0e036335be 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -1,19 +1,18 @@
-project(*Server): taoserver, minimum_corba {
+project(*Server): taoexe, portableserver, minimum_corba {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient, minimum_corba {
+project(*Client): taoexe, minimum_corba {
Source_Files {
testC.cpp
client.cpp
}
}
-project(*Manager): taoserver, minimum_corba, iormanip {
- exename = Manager
+project(*Manager): taoexe, portableserver, minimum_corba, iormanip {
Source_Files {
testC.cpp
Servant_Locator.cpp
diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc
index 887e9a5f9e0..5f5561a2a27 100644
--- a/TAO/tests/MT_BiDir/MT_BiDir.mpc
+++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver, minimum_corba, bidir_giop {
+project(*Server): taoexe, portableserver, minimum_corba, bidir_giop {
Source_Files {
ReceiverC.cpp
SenderC.cpp
@@ -9,8 +9,7 @@ project(*Server): taoserver, minimum_corba, bidir_giop {
}
}
-project(*Client): taoserver, minimum_corba, bidir_giop {
- exename = client
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
Source_Files {
SenderC.cpp
ReceiverC.cpp
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index e58d1769369..4436ffbe817 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index e58d1769369..4436ffbe817 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index ae74fd0a91f..c0131cd5a5e 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -1,4 +1,4 @@
-project(*Server): messaging, taoserver, corba_messaging {
+project(*Server): messaging, taoexe, portableserver {
Source_Files {
Sleep_Service.cpp
Server_Task.cpp
@@ -6,9 +6,7 @@ project(*Server): messaging, taoserver, corba_messaging {
}
}
-project(*Client): messaging, taoserver, corba_messaging {
- exename = client
-
+project(*Client): messaging, taoexe, portableserver {
Source_Files {
TestC.cpp
Client_Task.cpp
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index ab44a516208..863c816dc92 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
idlflags += -Gd
Source_Files {
@@ -8,8 +8,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoserver {
- exename = client
+project(*Client): taoexe, portableserver {
idlflags += -Gd
Source_Files {
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index 1dc4055e416..414e972d2da 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -1,10 +1,10 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
Multiple_InheritanceC.cpp
client.cpp
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index e58d1769369..4436ffbe817 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index 1c5f257faa2..a04a9c62f80 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Receiver.cpp
Server_Task.cpp
@@ -6,9 +6,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoserver {
- exename = client
-
+project(*Client): taoexe, portableserver {
Source_Files {
Client_Task.cpp
client.cpp
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 97a16abeef9..7f7b6b9d7d6 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
idlflags = -Ge 0 -Sc
requires += exceptions
@@ -8,7 +8,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
idlflags = -Ge 0 -Sc
requires += exceptions
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
index 9f73fc1890e..9032c4c6008 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
@@ -1,13 +1,11 @@
-project(*Nested Upcall Server): taoserver {
+project(*Nested Upcall Server): taoexe, portableserver {
Source_Files {
MT_Object_i.cpp
server.cpp
}
}
-project(*Nested Upcall Client): taoserver {
- exename = client
-
+project(*Nested Upcall Client): taoexe, portableserver {
Source_Files {
MT_Object_i.cpp
local_server.cpp
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index 67b662125c4..b9fb881ab38 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -1,13 +1,11 @@
-project(*Nested Upcall Server): taoserver {
+project(*Nested Upcall Server): taoexe, portableserver {
Source_Files {
server_i.cpp
server.cpp
}
}
-project(*Nested Upcall Client): taoserver {
- exename = client
-
+project(*Nested Upcall Client): taoexe, portableserver {
Source_Files {
client_i.cpp
client.cpp
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc
index d1ad918cc67..4271f755345 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc
@@ -1,24 +1,18 @@
-project(*Nested Upcall Server_A): taoserver {
- exename = server_A
-
+project(*Nested Upcall Server_A): taoexe, portableserver {
Source_Files {
Object_A_i.cpp
server_A.cpp
}
}
-project(*Nested Upcall Server_B): taoserver {
- exename = server_B
-
+project(*Nested Upcall Server_B): taoexe, portableserver {
Source_Files {
Object_B_i.cpp
server_B.cpp
}
}
-project(*Nested Upcall Initiator): taoserver {
- exename = initiator
-
+project(*Nested Upcall Initiator): taoexe, portableserver {
Source_Files {
Initiator_i.cpp
initiator.cpp
diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
index 528a51876a4..638ae8e9fe3 100644
--- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
+++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
@@ -1,13 +1,11 @@
-project(*Server): strategies, taoserver {
+project(*Server): strategies, taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): strategies, taoserver {
- exename = client
-
+project(*Client): strategies, taoexe, portableserver {
Source_Files {
test_i.cpp
client.cpp
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index 1bfdec1e5b2..5b12339cd94 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -1,4 +1,4 @@
-project(*Server): messaging, taoserver, corba_messaging {
+project(*Server): messaging, taoexe, portableserver {
Source_Files {
Clock_Ticks.cpp
Server_Peer.cpp
@@ -6,17 +6,13 @@ project(*Server): messaging, taoserver, corba_messaging {
}
}
-project(*Scavenger): messaging, taoserver, corba_messaging {
- exename = scavenger
-
+project(*Scavenger): messaging, taoexe, portableserver {
Source_Files {
scavenger.cpp
}
}
-project(*Client): messaging, taoserver, corba_messaging {
- exename = client
-
+project(*Client): messaging, taoexe, portableserver {
Source_Files {
Clock_Ticks.cpp
Client_Peer.cpp
diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
index e58d1769369..4436ffbe817 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc
index 155b5bf3351..4e172d13d7f 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver, valuetype {
+project(*Server): taoexe, portableserver, valuetype {
Source_Files {
AnyS_impl.cpp
server.cpp
}
}
-project(*Client): taoclient, valuetype {
+project(*Client): taoexe, valuetype {
Source_Files {
AnyC.cpp
client.cpp
diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc
index 79841a36c34..5c0519ffc84 100644
--- a/TAO/tests/OBV/Factory/OBV_Factory.mpc
+++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver, valuetype {
+project(*Server): taoexe, portableserver, valuetype {
Source_Files {
FactoryC_impl.cpp
FactoryS_impl.cpp
@@ -6,7 +6,7 @@ project(*Server): taoserver, valuetype {
}
}
-project(*Client): taoclient, valuetype {
+project(*Client): taoexe, valuetype {
Source_Files {
FactoryC.cpp
FactoryC_impl.cpp
diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc
index 8a02e49834c..29fd036758d 100644
--- a/TAO/tests/OBV/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver, valuetype {
+project(*Server): taoexe, portableserver, valuetype {
Source_Files {
Test_impl.cpp
server.cpp
}
}
-project(*Client): taoclient, valuetype {
+project(*Client): taoexe, valuetype {
Source_Files {
TreeBaseC.cpp
TreeControllerC.cpp
diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
index 9cb0606bc0e..70c68bd3c4a 100644
--- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
+++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver, valuetype {
+project(*Server): taoexe, portableserver, valuetype {
Source_Files {
testS.cpp
testC.cpp
@@ -7,7 +7,7 @@ project(*Server): taoserver, valuetype {
}
}
-project(*Client): taoclient, valuetype {
+project(*Client): taoexe, valuetype {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.mpc b/TAO/tests/ORB_destroy/ORB_destroy.mpc
index 4aa782275ba..bf33974ffad 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.mpc
+++ b/TAO/tests/ORB_destroy/ORB_destroy.mpc
@@ -1,4 +1,4 @@
-project: taoserver {
+project: taoexe, portableserver {
exename = ORB_destroy
}
diff --git a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
index ac968648076..9e604282389 100644
--- a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
+++ b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
@@ -1,3 +1,3 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
}
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.mpc b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
index 0f74dafe49d..13b83e84f4a 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.mpc
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
@@ -1,4 +1,4 @@
-project(ORB Shutdown Server): taoserver {
+project(ORB Shutdown Server): taoexe, portableserver {
Source_Files {
Foo_Bar.cpp
server.cpp
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc
index 1d98de2569c..ea77991372c 100644
--- a/TAO/tests/ORT/ORT.mpc
+++ b/TAO/tests/ORT/ORT.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
requires += interceptors
idlflags += -I$(TAO_ROOT) -Gv
@@ -15,7 +15,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
requires += interceptors
idlflags += -I$(TAO_ROOT) -Gv
diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc
index f34291b9c8e..81d863e1b13 100644
--- a/TAO/tests/Object_Loader/Object_Loader.mpc
+++ b/TAO/tests/Object_Loader/Object_Loader.mpc
@@ -1,4 +1,4 @@
-project(*Test): taolib_with_idl, portableserver, minimum_corba {
+project(*Test): taolib_with_idl, portableserver {
sharedname = Test_DLL
dynamicflags = OLT_BUILD_DLL
@@ -8,9 +8,7 @@ project(*Test): taolib_with_idl, portableserver, minimum_corba {
}
}
-project(*Driver): taoserver {
- exename = driver
-
+project(*Driver): taoexe, portableserver {
Source_Files {
TestC.cpp
driver.cpp
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index e1549964c5e..30bbfcf3b26 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -1,10 +1,10 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index 2c388cb109e..4c6e6ac93ce 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index 73475873cb7..2e24abd2ed8 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -1,4 +1,4 @@
-project(*Server): messaging, taoserver, corba_messaging {
+project(*Server): messaging, taoexe, portableserver {
Source_Files {
Oneway_Buffering.cpp
server.cpp
@@ -13,16 +13,14 @@ project(*Server): messaging, taoserver, corba_messaging {
// have gone on to build the generated files. By depending on *Server,
// only one process is allowed to compile Test.idl and thus the build
// succeeds.
-project(*Client): messaging, taoserver, corba_messaging {
- exename = client
+project(*Client): messaging, taoexe, portableserver {
Source_Files {
TestC.cpp
client.cpp
}
}
-project(*Admin): messaging, taoserver, corba_messaging {
- exename = admin
+project(*Admin): messaging, taoexe, portableserver {
Source_Files {
Oneway_Buffering_Admin.cpp
admin.cpp
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index fd11e657858..efab96b0a7c 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Server_Task.cpp
Sender_i.cpp
@@ -6,9 +6,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoserver {
- exename = client
-
+project(*Client): taoexe, portableserver {
Source_Files {
Client_Task.cpp
Server_Task.cpp
diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc
index 5a360da82df..462f32a40ae 100644
--- a/TAO/tests/POA/Current/Current.mpc
+++ b/TAO/tests/POA/Current/Current.mpc
@@ -1,3 +1,2 @@
-project(POA Current): taoserver {
- exename = Current
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc
index ab5fa6d562e..64db1d3e919 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.mpc
+++ b/TAO/tests/POA/Etherealization/Etherealization.mpc
@@ -1,3 +1,2 @@
-project(POA Etherealization): taoserver, minimum_corba {
- exename = Etherealization
+project(POA*): taoexe, portableserver, minimum_corba {
}
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
index 005c4729836..462f32a40ae 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
@@ -1,3 +1,2 @@
-project(POA Excessive Object Deactivations): taoserver {
- exename = Excessive_Object_Deactivations
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc
index cc20a8ce1c2..462f32a40ae 100644
--- a/TAO/tests/POA/Identity/Identity.mpc
+++ b/TAO/tests/POA/Identity/Identity.mpc
@@ -1,3 +1,2 @@
-project(POA Identity): taoserver {
- exename = Identity
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
index e1fab62dea6..462f32a40ae 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,4 +1,2 @@
-project(POA MT Servant Locator): taoserver {
- exename = MT_Servant_Locator
- avoids += minimum_corba
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
index d5c56e620c6..64db1d3e919 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
@@ -1,3 +1,2 @@
-project(Nested Non Servant Upcalls): server, minimum_corba {
- exename = Nested_Non_Servant_Upcalls
+project(POA*): taoexe, portableserver, minimum_corba {
}
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
index f07dc96ddb7..462f32a40ae 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
@@ -1,3 +1,2 @@
-project(POA Non Servant Upcalls): taoserver {
- exename = Non_Servant_Upcalls
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
index fafe1e95a4d..462f32a40ae 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
@@ -1,3 +1,2 @@
-project(POA Object Reactivation): taoserver {
- exename = Object_Reactivation
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
index c0b69b2d352..462f32a40ae 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
@@ -1,3 +1,2 @@
-project(POA Destruction): taoserver {
- exename = POA_Destruction
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
new file mode 100644
index 00000000000..5750a6ef70e
--- /dev/null
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -0,0 +1,11 @@
+project(POA_server*): taoexe, portableserver {
+ Source_Files {
+ server.cpp
+ }
+}
+
+project(POA_client*): taoexe, portableserver {
+ Source_Files {
+ client.cpp
+ }
+}
diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc
index 6f40c6c3bf5..462f32a40ae 100644
--- a/TAO/tests/POA/Policies/Policies.mpc
+++ b/TAO/tests/POA/Policies/Policies.mpc
@@ -1,3 +1,2 @@
-project(POA Policies): taoserver {
- exename = Policies
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
index 1ad01c3e08a..64db1d3e919 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
@@ -1,3 +1,2 @@
-project(POA Single Threaded POA): taoserver, minimum_corba {
- exename = Single_Threaded_POA
+project(POA*): taoexe, portableserver, minimum_corba {
}
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
index 2dbe599e6c5..462f32a40ae 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
@@ -1,3 +1,2 @@
-project(POA Wait For Completion): taoserver {
- exename = wait_for_completion
+project(POA*): taoexe, portableserver {
}
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 2ce34cca1d9..1c2dd5eb448 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -1,11 +1,11 @@
-project(*Server): messaging, taoserver, minimum_corba {
+project(*Server): messaging, taoexe, portableserver, minimum_corba {
Source_Files {
param_test_i.cpp
server.cpp
}
}
-project(*Client): messaging, taoserver, minimum_corba, dynamicinterface {
+project(*Client): messaging, taoexe, portableserver, minimum_corba, dynamicinterface {
exename = client
Source_Files {
@@ -54,9 +54,7 @@ project(*Client): messaging, taoserver, minimum_corba, dynamicinterface {
}
}
-project(*Anyop): messaging, taoserver, minimum_corba {
- exename = anyop
-
+project(*Anyop): messaging, taoexe, portableserver, minimum_corba {
Source_Files {
param_testC.cpp
anyop.cpp
diff --git a/TAO/tests/Policies/Policies.mpc b/TAO/tests/Policies/Policies.mpc
index 1cc73b82cae..f5c2422f4fa 100644
--- a/TAO/tests/Policies/Policies.mpc
+++ b/TAO/tests/Policies/Policies.mpc
@@ -1,3 +1,3 @@
-project(Policies Manipulation): taoserver, messaging, corba_messaging {
+project(Policies Manipulation): taoexe, portableserver, messaging {
exename = Manipulation
}
diff --git a/TAO/tests/Portable_Interceptors/AMI/Portable_Interceptors_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/Portable_Interceptors_AMI.mpc
new file mode 100644
index 00000000000..ae1e44f85ea
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/AMI/Portable_Interceptors_AMI.mpc
@@ -0,0 +1,19 @@
+project(*Client) : messaging, taoserver, ami {
+ exename = client
+ source_files {
+ client.cpp
+ Client_Interceptor.cpp
+ Client_ORBInitializer.cpp
+ Echo_Handler.cpp
+ }
+}
+
+project(*server) : messaging, taoserver, ami {
+ exename = server
+ source_files {
+ server.cpp
+ Server_Interceptor.cpp
+ Server_ORBInitializer.cpp
+ Echo.cpp
+ }
+}
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc
index e4f0e303723..f6298fd0458 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
requires += interceptors
Source_Files {
test_i.cpp
@@ -10,7 +10,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
requires += interceptors
Source_Files {
testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc
index 92270661896..87b8e20460e 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
requires += interceptors
Source_Files {
test_i.cpp
@@ -8,7 +8,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
requires += interceptors
Source_Files {
testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc
index 8d10ec51ac9..5d98c8157f3 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc
@@ -1,6 +1,6 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver, valuetype {
requires += interceptors
- idlflags += -Gv -DCORBA3 -I$(TAO_ROOT)
+ idlflags += -DCORBA3 -I$(TAO_ROOT)
Source_Files {
test_i.cpp
@@ -10,9 +10,9 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe, valuetype {
requires += interceptors
- idlflags += -Gv -DCORBA3 -I$(TAO_ROOT)
+ idlflags += -DCORBA3 -I$(TAO_ROOT)
Source_Files {
testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc
index 53d67e4e809..4fce1c9fefd 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
requires += interceptors
idlflags += -I$(TAO_ROOT)
@@ -10,7 +10,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
requires += interceptors
idlflags += -I$(TAO_ROOT)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc
index 70e52a9fbbb..a150c98af4d 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
requires += interceptors
Source_Files {
test_i.cpp
@@ -9,7 +9,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
requires += interceptors
Source_Files {
testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc
index 4ad9a912846..7f63da0e733 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
requires += interceptors
Source_Files {
test_i.cpp
@@ -9,7 +9,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
requires += interceptors
Source_Files {
testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc
index 5f177c1bdf8..200d3638eec 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
requires += interceptors
Source_Files {
test_i.cpp
@@ -8,7 +8,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
requires += interceptors
Source_Files {
testC.cpp
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 3bee72029bc..ebeee755b53 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,4 +1,4 @@
-project(*server): taoserver, qt_moc {
+project(*server): taoexe, portableserver, qt_moc {
requires += qt
MOC_Files {
@@ -12,7 +12,7 @@ project(*server): taoserver, qt_moc {
}
}
-project(*client): taoclient, qt_moc {
+project(*client): taoexe, qt_moc {
requires += qt
MOC_Files {
diff --git a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
index e0864c00140..e4911706a77 100644
--- a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
+++ b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
@@ -1,5 +1,4 @@
project(*Server): rt_server {
- exename = Collocation
}
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc b/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
index 0b55ef2d169..e4911706a77 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
@@ -1,5 +1,4 @@
project(*Server): rt_server {
- exename = Destroy_Thread_Pool
}
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
new file mode 100644
index 00000000000..d3416abfdbb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -0,0 +1,13 @@
+project(*client) : taoexe, portableserver, rtcorba {
+ source_files {
+ client.cpp
+ Custom_Network_Priority_Mapping.cpp
+ }
+}
+
+project(*server) : taoexe, rtportableserver, rtcorba {
+ source_files {
+ server.cpp
+ Custom_Network_Priority_Mapping.cpp
+ }
+}
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 10138dbe166..3f3c8f2babe 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -4,7 +4,7 @@ project(*Server): rt_server {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
requires += rt_corba
Source_Files {
testC.cpp
diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc
index 6033396b49d..fa3be0d5055 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.mpc
+++ b/TAO/tests/RTCORBA/Policies/Policies.mpc
@@ -1,3 +1,2 @@
project(RTCORBA Policies Server): rt_server {
- exename = Policies
}
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc
new file mode 100644
index 00000000000..08e506244c8
--- /dev/null
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc
@@ -0,0 +1,11 @@
+project(*Server): rt_server, strategies, portableserver {
+ Source_Files {
+ server.cpp
+ }
+}
+
+project(*Client): rt_client, strategies, portableserver {
+ Source_Files {
+ client.cpp
+ }
+}
diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
index 438e4e09db1..73e733e9c68 100644
--- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
+++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
@@ -1,4 +1,4 @@
-project(*Server): messaging, taoserver, corba_messaging {
+project(*Server): messaging, taoexe, portableserver {
Source_Files {
Oneway_Receiver.cpp
Shutdown_Helper.cpp
@@ -6,9 +6,7 @@ project(*Server): messaging, taoserver, corba_messaging {
}
}
-project(*Client): messaging, taoserver, corba_messaging {
- exename = client
-
+project(*Client): messaging, taoexe, portableserver {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
new file mode 100644
index 00000000000..c8d2a7cb1f9
--- /dev/null
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -0,0 +1,13 @@
+project(*Server): taoexe, portableserver {
+ Source_Files {
+ Test_i.cpp
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, portableserver {
+ Source_Files {
+ client.cpp
+ }
+}
+
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 499071ddcb3..82ad65d131d 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
Ping_Service.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index e58d1769369..4436ffbe817 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -1,11 +1,11 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxies_Benchmark.mpc b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxies_Benchmark.mpc
new file mode 100644
index 00000000000..1a29d2f2189
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxies_Benchmark.mpc
@@ -0,0 +1,13 @@
+project(*Server): taoexe, portableserver, smart_proxies {
+ Source_Files {
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, portableserver, smart_proxies {
+ Source_Files {
+ client.cpp
+ Smart_Proxy_Impl.cpp
+ }
+}
+
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxies_Collocation.mpc b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxies_Collocation.mpc
new file mode 100644
index 00000000000..f1f48381757
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxies_Collocation.mpc
@@ -0,0 +1,33 @@
+project(*TestStubsLib): taolib_with_idl, smart_proxies {
+ sharedname = Coll_Test_Stubs
+ dynamicflags += MY_STUB_BUILD_DLL
+ idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Gd
+ Source_Files {
+ DiamondC.cpp
+ Smart_Proxy_Impl.cpp
+ }
+}
+
+project(*DiamondLib) : taolib_with_idl, smart_proxies, portableserver {
+ sharedname = Diamond
+ after += *TestStubsLib
+ libs += Coll_Test_Stubs
+ dynamicflags += DIAMOND_BUILD_DLL
+ idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
+ source_files {
+ Diamond_i.cpp
+ DiamondS.cpp
+ }
+}
+
+project(*Test): taoexe, smart_proxies, portableserver {
+ after += *TestStubsLib *DiamondLib
+ libs += Coll_Test_Stubs Diamond
+ Source_Files {
+ Coll_Tester.cpp
+ main.cpp
+ }
+ idl_files {
+ }
+}
+
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxies_On_Demand.mpc b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxies_On_Demand.mpc
new file mode 100644
index 00000000000..b55d6bd96a0
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxies_On_Demand.mpc
@@ -0,0 +1,14 @@
+project(*Server): taoexe, portableserver, smart_proxies {
+ Source_Files {
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, portableserver, smart_proxies {
+ Source_Files {
+ client.cpp
+ Smart_Proxy_Impl.cpp
+ Smart_Test_Factory.cpp
+ }
+}
+
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxies_Policy.mpc b/TAO/tests/Smart_Proxies/Policy/Smart_Proxies_Policy.mpc
new file mode 100644
index 00000000000..1a29d2f2189
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxies_Policy.mpc
@@ -0,0 +1,13 @@
+project(*Server): taoexe, portableserver, smart_proxies {
+ Source_Files {
+ server.cpp
+ }
+}
+
+project(*Client): taoexe, portableserver, smart_proxies {
+ Source_Files {
+ client.cpp
+ Smart_Proxy_Impl.cpp
+ }
+}
+
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
index bbb78b1f3ef..6c8ecaede49 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
+++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
@@ -1,14 +1,10 @@
-project(*Server): taoserver, smart_proxies {
- idlflags += -Gsp
-
+project(*Server): taoexe, portableserver, smart_proxies {
Source_Files {
server.cpp
}
}
-project(*Client): taoclient, smart_proxies {
- idlflags += -Gsp
-
+project(*Client): taoexe, portableserver, smart_proxies {
Source_Files {
testC.cpp
Smart_Proxy_Impl.cpp
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index d96e5e4b220..335c4bf0c21 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
TestC.cpp
TestS.cpp
@@ -8,7 +8,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
TestC.cpp
client.cpp
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index 2ae7a5561bb..d89026dd5d3 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -1,13 +1,11 @@
-project(*Server): strategies, messaging, taoserver {
+project(*Server): strategies, messaging, taoexe, portableserver {
Source_Files {
simple_test_i.cpp
server.cpp
}
}
-project(*Client): strategies, messaging, taoserver {
- exename = client
-
+project(*Client): strategies, messaging, taoexe, portableserver {
Source_Files {
simple_testC.cpp
client.cpp
diff --git a/TAO/tests/TestUtils/TestUtils.mpc b/TAO/tests/TestUtils/TestUtils.mpc
new file mode 100644
index 00000000000..5f8f2e3aef4
--- /dev/null
+++ b/TAO/tests/TestUtils/TestUtils.mpc
@@ -0,0 +1,8 @@
+// This project looks like it's only for vxworks using gmake
+// For now it's defined empty, because there's no convenient
+// way to make it only build for gnuace.
+project : taolib {
+ sharedname = TestUtils
+ source_files {
+ }
+}
diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
index 1e078cbf4c0..a3356b286b7 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
+++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
@@ -1,13 +1,11 @@
-project(*Server): messaging, taoserver, corba_messaging {
+project(*Server): messaging, taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): messaging, taoserver, corba_messaging {
- exename = client
-
+project(*Client): messaging, taoexe, portableserver {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index 44561e11012..0ebaf2030a1 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -1,13 +1,11 @@
-project(*Server): taoserver, corba_messaging {
+project(*Server): taoexe, portableserver {
Source_Files {
test_i.cpp
server.cpp
}
}
-project(*Client): messaging, taoserver, corba_messaging {
- exename = client
-
+project(*Client): messaging, taoexe, portableserver {
Source_Files {
testC.cpp
client.cpp
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index 3a5c5263bf9..76b9b360684 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
worker.cpp
First_i.cpp
@@ -8,7 +8,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
Two_ObjectsC.cpp
client.cpp
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index 7ddf8fbd920..505602b723b 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -1,4 +1,4 @@
-project(*Server): taoserver {
+project(*Server): taoexe, portableserver {
Source_Files {
test_i.cpp
Stopwatch_display.cpp
@@ -7,7 +7,7 @@ project(*Server): taoserver {
}
}
-project(*Client): taoclient {
+project(*Client): taoexe {
Source_Files {
testC.cpp
Control.cpp
diff --git a/TAO/utils/IOR-parser/IOR-parser.mpc b/TAO/utils/IOR-parser/IOR-parser.mpc
new file mode 100644
index 00000000000..859bea8225a
--- /dev/null
+++ b/TAO/utils/IOR-parser/IOR-parser.mpc
@@ -0,0 +1,2 @@
+project : aceexe {
+} \ No newline at end of file
diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc
new file mode 100644
index 00000000000..b8f9164100b
--- /dev/null
+++ b/TAO/utils/NamingViewer/NamingViewer.mpc
@@ -0,0 +1,3 @@
+project : taoexe, portableserver, naming, mfc {
+
+} \ No newline at end of file
diff --git a/TAO/utils/nslist/nslist.mpc b/TAO/utils/nslist/nslist.mpc
index ba904294d47..1cc22024e00 100644
--- a/TAO/utils/nslist/nslist.mpc
+++ b/TAO/utils/nslist/nslist.mpc
@@ -1,22 +1,16 @@
project(nsadd): namingexe {
- exename = nsadd
-
Source_Files {
nsadd.cpp
}
}
project(nsdel): namingexe {
- exename = nsdel
-
Source_Files {
nsdel.cpp
}
}
project(nslist): namingexe {
- exename = nslist
-
Source_Files {
nslist.cpp
}
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewer.mpc b/TAO/utils/wxNamingViewer/wxNamingViewer.mpc
new file mode 100644
index 00000000000..3c8477113f3
--- /dev/null
+++ b/TAO/utils/wxNamingViewer/wxNamingViewer.mpc
@@ -0,0 +1,2 @@
+project : taoexe, naming, portableserver, wxwindows {
+} \ No newline at end of file
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index 56ea40859cd..aaa225eb4a8 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -28,6 +28,7 @@
#include "ace/OS_Log_Msg_Attributes.h"
#include "ace/Service_Object.h"
#include "ace/Task.h"
+#include "ace/OS_NS_errno.h" // needed for those using our macros
// ACE_NT_SERVICE_START_TIMEOUT is an estimate of the number of
// milliseconds your service will take to start. Default is 5
diff --git a/ace/QoS/qos.mpc b/ace/QoS/qos.mpc
index 8ba562cd5d5..e313366b1b9 100644
--- a/ace/QoS/qos.mpc
+++ b/ace/QoS/qos.mpc
@@ -6,4 +6,8 @@ project(QoS) : acelib, core {
sharedname = ACE_QoS
dynamicflags = ACE_QoS_BUILD_DLL
include_dir = ace/QoS
+
+ specific(borland, nmake, em3, vc6, vc7, vc71) {
+ macros += ACE_HAS_WINSOCK2_GQOS
+ }
}
diff --git a/bin/MakeProjectCreator/config/amh.mpb b/bin/MakeProjectCreator/config/amh.mpb
new file mode 100644
index 00000000000..f527b9c0966
--- /dev/null
+++ b/bin/MakeProjectCreator/config/amh.mpb
@@ -0,0 +1,4 @@
+project {
+ requires += ami // There is no separate
+ idlflags += -GH
+} \ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/ami.mpb b/bin/MakeProjectCreator/config/ami.mpb
new file mode 100644
index 00000000000..7be57dae050
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ami.mpb
@@ -0,0 +1,4 @@
+project : messaging {
+ requires += ami
+ idlflags += -GC
+} \ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/avstreams.mpb b/bin/MakeProjectCreator/config/avstreams.mpb
index e69cc514776..33f5fa008ef 100644
--- a/bin/MakeProjectCreator/config/avstreams.mpb
+++ b/bin/MakeProjectCreator/config/avstreams.mpb
@@ -1,4 +1,4 @@
-project: property, naming, qos {
+project: property, naming {
after += AV
libs += TAO_AV
comps += AV
diff --git a/bin/MakeProjectCreator/config/dseventlogadmin.mpb b/bin/MakeProjectCreator/config/dseventlogadmin.mpb
new file mode 100644
index 00000000000..c63484e5474
--- /dev/null
+++ b/bin/MakeProjectCreator/config/dseventlogadmin.mpb
@@ -0,0 +1,4 @@
+project : dslogadmin {
+ after += DsEventLogAdmin
+ libs += TAO_DsEventLogAdmin
+}
diff --git a/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb b/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
new file mode 100644
index 00000000000..3b8fc5e45f1
--- /dev/null
+++ b/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
@@ -0,0 +1,4 @@
+project : dslogadmin {
+ after += DsNotifyLogAdmin
+ libs += TAO_DsNotifyLogAdmin
+}
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index 71e6213b4f3..c851e5713a1 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -25,3 +25,5 @@ qt = 0
wxwindows = 0
zlib = 0
zzip = 0
+mfc = 0
+rpc = 0
diff --git a/bin/MakeProjectCreator/config/mfc.mpb b/bin/MakeProjectCreator/config/mfc.mpb
new file mode 100644
index 00000000000..7e857eb8269
--- /dev/null
+++ b/bin/MakeProjectCreator/config/mfc.mpb
@@ -0,0 +1,4 @@
+project {
+ requires += mfc
+ macros += _AFX_DLL ACE_HAS_MFC
+} \ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/namingexe.mpb b/bin/MakeProjectCreator/config/namingexe.mpb
index 8ced70aa732..e18ab7cdded 100644
--- a/bin/MakeProjectCreator/config/namingexe.mpb
+++ b/bin/MakeProjectCreator/config/namingexe.mpb
@@ -1,2 +1,2 @@
-project : taoserver, orbsvcsexe, naming {
+project : orbsvcsexe, naming {
}
diff --git a/bin/MakeProjectCreator/config/notification.mpb b/bin/MakeProjectCreator/config/notification.mpb
index c7a5bbb32a6..f1c58fdd419 100644
--- a/bin/MakeProjectCreator/config/notification.mpb
+++ b/bin/MakeProjectCreator/config/notification.mpb
@@ -1,4 +1,4 @@
-project : event, etcl, dynamicany {
+project : etcl, dynamicany, portableserver {
after += CosNotification
libs += TAO_CosNotification
comps += Notify
diff --git a/bin/MakeProjectCreator/config/notifytest.mpb b/bin/MakeProjectCreator/config/notifytest.mpb
index b5884fa3a61..b635f81090c 100644
--- a/bin/MakeProjectCreator/config/notifytest.mpb
+++ b/bin/MakeProjectCreator/config/notifytest.mpb
@@ -1,4 +1,4 @@
-project: orbsvcsexe, notify {
+project: orbsvcsexe, notify, naming {
after += NotifyTests_Lib
libs += NotifyTests
includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib
diff --git a/bin/MakeProjectCreator/config/psdl.mpb b/bin/MakeProjectCreator/config/psdl.mpb
new file mode 100644
index 00000000000..bd46c45fc08
--- /dev/null
+++ b/bin/MakeProjectCreator/config/psdl.mpb
@@ -0,0 +1,15 @@
+project {
+ after += PSDL_Parser PSDL PSDL_Datastore
+ libs += TAO_PSDL TAO_PSDL_Datastore
+
+ Define_Custom(PSDL) {
+ command = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao
+ libpath = $(ACE_ROOT)/lib
+ inputext = .psdl
+ source_outputext = .cpp
+ header_outputext = .h
+ inline_outputext = .i
+ // unlike idl, the psdl compiler doesn't seem to generate *S.* files.
+ pre_extension = C
+ }
+} \ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/qos.mpb b/bin/MakeProjectCreator/config/qos.mpb
index 7e3b9eb695b..65b4395e2af 100644
--- a/bin/MakeProjectCreator/config/qos.mpb
+++ b/bin/MakeProjectCreator/config/qos.mpb
@@ -1,5 +1,7 @@
-project : acelib {
- requires += qos
+feature(qos) {
after += QoS
libs += ACE_QoS
+ specific(borland, nmake, em3, vc6, vc7, vc71) {
+ macros += ACE_HAS_WINSOCK2_GQOS
+ }
}
diff --git a/bin/MakeProjectCreator/config/rpc.mpb b/bin/MakeProjectCreator/config/rpc.mpb
new file mode 100644
index 00000000000..aa785bcc027
--- /dev/null
+++ b/bin/MakeProjectCreator/config/rpc.mpb
@@ -0,0 +1,10 @@
+project {
+ requires += rpc
+ Define_Custom(rpcgen) {
+ command = rpcgen
+ inputext = .x
+ source_outputext = .c
+ header_outputext = .h
+ pre_extension = _svc,_clnt
+ }
+} \ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/rt_client.mpb b/bin/MakeProjectCreator/config/rt_client.mpb
index 5516e757658..80ad73a63d6 100644
--- a/bin/MakeProjectCreator/config/rt_client.mpb
+++ b/bin/MakeProjectCreator/config/rt_client.mpb
@@ -1,2 +1,2 @@
-project : taoclient, rtcorba {
+project : taoexe, rtcorba {
}
diff --git a/bin/MakeProjectCreator/config/rt_server.mpb b/bin/MakeProjectCreator/config/rt_server.mpb
index 5173aa9f018..496389c03dd 100644
--- a/bin/MakeProjectCreator/config/rt_server.mpb
+++ b/bin/MakeProjectCreator/config/rt_server.mpb
@@ -1,2 +1,2 @@
-project : taoserver, rtportableserver, rtcorba {
+project : taoexe, rtportableserver, rtcorba {
}
diff --git a/bin/MakeProjectCreator/config/rteventexe.mpb b/bin/MakeProjectCreator/config/rteventexe.mpb
index 7d053241fd3..80d7ce202ce 100644
--- a/bin/MakeProjectCreator/config/rteventexe.mpb
+++ b/bin/MakeProjectCreator/config/rteventexe.mpb
@@ -1,2 +1,2 @@
-project: server, orbsvcsexe, rtevent {
+project: orbsvcsexe, rtevent, portableserver {
}
diff --git a/bin/MakeProjectCreator/config/rteventlogadmin.mpb b/bin/MakeProjectCreator/config/rteventlogadmin.mpb
new file mode 100644
index 00000000000..4550d75c958
--- /dev/null
+++ b/bin/MakeProjectCreator/config/rteventlogadmin.mpb
@@ -0,0 +1,4 @@
+project : dseventlogadmin {
+ after += RTEventLogAdmin
+ libs += TAO_RTEventLogAdmin
+}
diff --git a/bin/MakeProjectCreator/config/smart_proxies.mpb b/bin/MakeProjectCreator/config/smart_proxies.mpb
index 3f9625ab049..18bcd4b798b 100644
--- a/bin/MakeProjectCreator/config/smart_proxies.mpb
+++ b/bin/MakeProjectCreator/config/smart_proxies.mpb
@@ -2,4 +2,5 @@ project : taolib {
after += SmartProxies
libs += TAO_SmartProxies
requires += smart_proxies
+ idlflags += -Gsp
}
diff --git a/bin/MakeProjectCreator/config/ssliop.mpb b/bin/MakeProjectCreator/config/ssliop.mpb
new file mode 100644
index 00000000000..26c49789cff
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ssliop.mpb
@@ -0,0 +1,6 @@
+project: security, portableserver, ssl {
+ after += SSLIOP
+ libs += TAO_SSLIOP
+ comps += SSLIOP
+ tagchecks += SSLIOP
+}
diff --git a/bin/MakeProjectCreator/config/taoclient.mpb b/bin/MakeProjectCreator/config/taoclient.mpb
index c8223942568..9921a773191 100644
--- a/bin/MakeProjectCreator/config/taoclient.mpb
+++ b/bin/MakeProjectCreator/config/taoclient.mpb
@@ -1,3 +1,3 @@
-project(taoclient) : taoexe {
+project : taoexe {
exename = client
} \ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/wxwindows.mpb b/bin/MakeProjectCreator/config/wxwindows.mpb
new file mode 100644
index 00000000000..b6dff174a44
--- /dev/null
+++ b/bin/MakeProjectCreator/config/wxwindows.mpb
@@ -0,0 +1,4 @@
+project {
+ requires += wxwindows
+ macros += __WXMSW__
+} \ No newline at end of file
diff --git a/examples/ConfigViewer/ConfigViewer.mpc b/examples/ConfigViewer/ConfigViewer.mpc
index 858a373f9a8..bcb154f4f5e 100644
--- a/examples/ConfigViewer/ConfigViewer.mpc
+++ b/examples/ConfigViewer/ConfigViewer.mpc
@@ -1,3 +1,4 @@
-project : aceexe {
- requires += wxwindows
+project : aceexe, wxwindows {
+ pch_header = stdafx.h
+ pch_source = stdafx.cpp
} \ No newline at end of file
diff --git a/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc b/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
index 179434d74fa..3e677394438 100644
--- a/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
+++ b/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
@@ -1,19 +1,4 @@
-project : aceexe {
- macros += _AFXDLL
+project : aceexe, mfc {
pch_header = StdAfx.h
pch_source = StdAfx.cpp
-
- verbatim(gnuace, top) {
- ifneq ($(MAKE),)
- include $(ACE_ROOT)/include/makeinclude/macros.GNU
- TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
- $(TARGETS_NESTED):
- " @echo Log_Msg_MFC will only build on Windows"
- else
- }
-
- verbatim(gnuace, bottom) {
- endif
- }
-
}
diff --git a/examples/NT_Service/NT_Service.mpc b/examples/NT_Service/NT_Service.mpc
new file mode 100644
index 00000000000..85779fa03ae
--- /dev/null
+++ b/examples/NT_Service/NT_Service.mpc
@@ -0,0 +1,16 @@
+project : aceexe {
+
+ verbatim(gnuace, top) {
+ ifneq ($(MAKE),)
+ include $(ACE_ROOT)/include/makeinclude/macros.GNU
+ TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+ $(TARGETS_NESTED):
+ " @echo NT_Service will only build on Windows"
+ else
+ }
+
+ verbatim(gnuace, bottom) {
+ endif
+ }
+
+} \ No newline at end of file
diff --git a/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc b/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc
index 0bb208a142b..f294070d4a9 100644
--- a/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc
+++ b/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc
@@ -1,20 +1,22 @@
project(*receiver) : aceexe, qos {
exename = receiver
+ requires += qos
Source_Files {
- Fill_ACE_Qos.cpp
- Qos_Signal_Handler.cpp
- Qos_Util.cpp
+ Fill_ACE_QoS.cpp
+ QoS_Signal_Handler.cpp
+ QoS_Util.cpp
receiver.cpp
- Receiver_Qos_Event_Handler.cpp
+ Receiver_QoS_Event_Handler.cpp
}
}
project(*sender) : aceexe, qos {
exename = sender
+ requires += qos
Source_Files {
- Fill_ACE_Qos.cpp
- Qos_Signal_Handler.cpp
- Qos_Util.cpp
+ Fill_ACE_QoS.cpp
+ QoS_Signal_Handler.cpp
+ QoS_Util.cpp
sender.cpp
- Sender_Qos_Event_Handler.cpp
+ Sender_QoS_Event_Handler.cpp
}
}
diff --git a/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc b/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc
index 0bb208a142b..f294070d4a9 100644
--- a/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc
+++ b/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc
@@ -1,20 +1,22 @@
project(*receiver) : aceexe, qos {
exename = receiver
+ requires += qos
Source_Files {
- Fill_ACE_Qos.cpp
- Qos_Signal_Handler.cpp
- Qos_Util.cpp
+ Fill_ACE_QoS.cpp
+ QoS_Signal_Handler.cpp
+ QoS_Util.cpp
receiver.cpp
- Receiver_Qos_Event_Handler.cpp
+ Receiver_QoS_Event_Handler.cpp
}
}
project(*sender) : aceexe, qos {
exename = sender
+ requires += qos
Source_Files {
- Fill_ACE_Qos.cpp
- Qos_Signal_Handler.cpp
- Qos_Util.cpp
+ Fill_ACE_QoS.cpp
+ QoS_Signal_Handler.cpp
+ QoS_Util.cpp
sender.cpp
- Sender_Qos_Event_Handler.cpp
+ Sender_QoS_Event_Handler.cpp
}
}
diff --git a/examples/QOS/Diffserv/QOS_Diffserv.mpc b/examples/QOS/Diffserv/QOS_Diffserv.mpc
index 14118473e06..7b3618ca683 100644
--- a/examples/QOS/Diffserv/QOS_Diffserv.mpc
+++ b/examples/QOS/Diffserv/QOS_Diffserv.mpc
@@ -1,11 +1,13 @@
project(*client) : aceexe, qos {
exename = client
+ requires += qos
Source_Files {
diffserv_test.cpp
}
}
project(*server) : aceexe, qos {
exename = server
+ requires += qos
Source_Files {
server.cpp
}
diff --git a/examples/QOS/Simple/QOS_Simple.mpc b/examples/QOS/Simple/QOS_Simple.mpc
index 0bb208a142b..f294070d4a9 100644
--- a/examples/QOS/Simple/QOS_Simple.mpc
+++ b/examples/QOS/Simple/QOS_Simple.mpc
@@ -1,20 +1,22 @@
project(*receiver) : aceexe, qos {
exename = receiver
+ requires += qos
Source_Files {
- Fill_ACE_Qos.cpp
- Qos_Signal_Handler.cpp
- Qos_Util.cpp
+ Fill_ACE_QoS.cpp
+ QoS_Signal_Handler.cpp
+ QoS_Util.cpp
receiver.cpp
- Receiver_Qos_Event_Handler.cpp
+ Receiver_QoS_Event_Handler.cpp
}
}
project(*sender) : aceexe, qos {
exename = sender
+ requires += qos
Source_Files {
- Fill_ACE_Qos.cpp
- Qos_Signal_Handler.cpp
- Qos_Util.cpp
+ Fill_ACE_QoS.cpp
+ QoS_Signal_Handler.cpp
+ QoS_Util.cpp
sender.cpp
- Sender_Qos_Event_Handler.cpp
+ Sender_QoS_Event_Handler.cpp
}
}
diff --git a/examples/RMCast/Send_File/RMCast_Send_File.mpc b/examples/RMCast/Send_File/RMCast_Send_File.mpc
index 173c470233f..225c0656a1f 100644
--- a/examples/RMCast/Send_File/RMCast_Send_File.mpc
+++ b/examples/RMCast/Send_File/RMCast_Send_File.mpc
@@ -1,12 +1,10 @@
project(*Sender) : aceexe, rmcast {
- requires += rmcast
exename = sender
Source_Files {
Sender.cpp
}
}
project(*Receiver) : aceexe, rmcast {
- requires += rmcast
exename = receiver
Source_Files {
Receiver.cpp
diff --git a/examples/Timer_Queue/Timer_Queue.mpc b/examples/Timer_Queue/Timer_Queue.mpc
index f518d6ba6a7..718cc75278a 100644
--- a/examples/Timer_Queue/Timer_Queue.mpc
+++ b/examples/Timer_Queue/Timer_Queue.mpc
@@ -13,7 +13,6 @@ project(*Async) : aceexe {
exename = Asynch_Timer_Queue_Test
after += Timer_Queue_Library
libs += tqtd
- after += Timer_Queue_Library
Source_Files {
main_async.cpp
}
@@ -23,7 +22,6 @@ project(*Reactor) : aceexe {
exename = Reactor_Timer_Queue_Test
after += Timer_Queue_Library
libs += tqtd
- after += Timer_Queue_Library
Source_Files {
main_reactor.cpp
}
@@ -33,7 +31,6 @@ project(*Thread) : aceexe {
exename = Thread_Timer_Queue_Test
after += Timer_Queue_Library
libs += tqtd
- after += Timer_Queue_Library
Source_Files {
main_thread.cpp
}
diff --git a/performance-tests/Misc/Misc.mpc b/performance-tests/Misc/Misc.mpc
new file mode 100644
index 00000000000..ff65abb992f
--- /dev/null
+++ b/performance-tests/Misc/Misc.mpc
@@ -0,0 +1,49 @@
+project(*basic_perf) : aceexe {
+ Source_Files {
+ basic_func.cpp
+ basic_perf.cpp
+ }
+}
+
+project(*childbirth_time) : aceexe {
+ Source_Files {
+ childbirth_time.cpp
+ }
+}
+
+project(*context_switch_time) : aceexe {
+ Source_Files {
+ context_switch_time.cpp
+ }
+}
+
+project(*test_mutex) : aceexe {
+ Source_Files {
+ test_mutex.cpp
+ }
+}
+
+project(*test_naming) : aceexe {
+ Source_Files {
+ test_naming.cpp
+ }
+}
+
+project(*test_singleton) : aceexe {
+ Source_Files {
+ test_singleton.cpp
+ }
+}
+
+project(*preempt) : aceexe {
+ Source_Files {
+ preempt.cpp
+ }
+}
+
+// May need to add an ace_obsolete_guard_class feature
+//project(*test_guard) : aceexe {
+// Source_Files {
+// test_guard.cpp
+// }
+//}
diff --git a/performance-tests/RPC/RPC.mpc b/performance-tests/RPC/RPC.mpc
new file mode 100644
index 00000000000..3c0562ae928
--- /dev/null
+++ b/performance-tests/RPC/RPC.mpc
@@ -0,0 +1,14 @@
+project(*client) : aceexe, rpc {
+ source_files {
+ client.cpp
+ ping_clnt.c
+ }
+}
+
+project(*server) : aceexe, rpc {
+ exename = server
+ source_files {
+ server.c
+ ping_svc.c
+ }
+} \ No newline at end of file
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Server_Concurrency_Leader_Follower.mpc b/performance-tests/Server_Concurrency/Leader_Follower/Server_Concurrency_Leader_Follower.mpc
new file mode 100644
index 00000000000..2b88981629f
--- /dev/null
+++ b/performance-tests/Server_Concurrency/Leader_Follower/Server_Concurrency_Leader_Follower.mpc
@@ -0,0 +1,11 @@
+project : aceexe {
+ source_files {
+ leader_follower.cpp
+ }
+}
+
+project(*RT_CORBA) : aceexe {
+ source_files {
+ RT_CORBA_Leader_Follower.cpp
+ }
+} \ No newline at end of file
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Server_Concurrency_Queue_Based_Workers.mpc b/performance-tests/Server_Concurrency/Queue_Based_Workers/Server_Concurrency_Queue_Based_Workers.mpc
new file mode 100644
index 00000000000..c0e977d6631
--- /dev/null
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/Server_Concurrency_Queue_Based_Workers.mpc
@@ -0,0 +1,11 @@
+project : aceexe {
+ source_files {
+ workers.cpp
+ }
+}
+
+project(*RTCorba) : aceexe {
+ source_files {
+ RT_CORBA_Workers.cpp
+ }
+} \ No newline at end of file
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
new file mode 100644
index 00000000000..de0a2119b12
--- /dev/null
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc
@@ -0,0 +1,6 @@
+project : aceexe {
+ after += Synch_Lib
+ libs += Synch_Lib
+ libpaths += ../Synch_Lib
+ includes += ..
+} \ No newline at end of file
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
new file mode 100644
index 00000000000..de0a2119b12
--- /dev/null
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc
@@ -0,0 +1,6 @@
+project : aceexe {
+ after += Synch_Lib
+ libs += Synch_Lib
+ libpaths += ../Synch_Lib
+ includes += ..
+} \ No newline at end of file
diff --git a/performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc b/performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc
new file mode 100644
index 00000000000..7755a02f4fa
--- /dev/null
+++ b/performance-tests/Synch-Benchmarks/Synch_Benchmarks.mpc
@@ -0,0 +1,8 @@
+project : aceexe {
+ after += Synch_Lib
+ libs += Synch_Lib
+ libpaths += Synch_Lib
+ source_files {
+ synch_driver.cpp
+ }
+} \ No newline at end of file
diff --git a/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc b/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc
new file mode 100644
index 00000000000..af64e837ba2
--- /dev/null
+++ b/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Benchmarks_Synch_Lib.mpc
@@ -0,0 +1,4 @@
+project(Synch_Lib) : aceexe {
+ sharedname = Synch_Lib
+ dynamicflags += SYNCHLIB_BUILD_DLL
+} \ No newline at end of file
diff --git a/performance-tests/TCP/TCP.mpc b/performance-tests/TCP/TCP.mpc
new file mode 100644
index 00000000000..859bea8225a
--- /dev/null
+++ b/performance-tests/TCP/TCP.mpc
@@ -0,0 +1,2 @@
+project : aceexe {
+} \ No newline at end of file
diff --git a/performance-tests/TTCP/ACE-C++/TTCP_ACE_C++.mpc b/performance-tests/TTCP/ACE-C++/TTCP_ACE_C++.mpc
new file mode 100644
index 00000000000..859bea8225a
--- /dev/null
+++ b/performance-tests/TTCP/ACE-C++/TTCP_ACE_C++.mpc
@@ -0,0 +1,2 @@
+project : aceexe {
+} \ No newline at end of file
diff --git a/performance-tests/UDP/UDP.mpc b/performance-tests/UDP/UDP.mpc
new file mode 100644
index 00000000000..859bea8225a
--- /dev/null
+++ b/performance-tests/UDP/UDP.mpc
@@ -0,0 +1,2 @@
+project : aceexe {
+} \ No newline at end of file