diff options
| author | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-02 19:57:42 +0000 |
|---|---|---|
| committer | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-02 19:57:42 +0000 |
| commit | aa067a0ec61bfdc84729eafd81b82dd0ba2f1a67 (patch) | |
| tree | 0ac0820f33ddc6dab63ed4e798ae32f29733db80 | |
| parent | bd49f66465ff6476edc769839504cf9a7fa4ec2f (diff) | |
| download | ATCD-aa067a0ec61bfdc84729eafd81b82dd0ba2f1a67.tar.gz | |
Wed Jul 02 14:57:00 2003 Justin Michel <michel_j@ociweb.com>
71 files changed, 942 insertions, 260 deletions
diff --git a/ChangeLog b/ChangeLog index a70adc7fe56..52b7668c657 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,52 @@ +Wed Jul 02 14:57:00 2003 Justin Michel <michel_j@ociweb.com> + + * examples/Registry/Registry.mpc + * tests/RMCast/acetest.mpb + * tests/SSL/acetest.mpb + * bin/create_ace_build.pl + * bin/MakeProjectCreator/config/rtnotify.mpb + * bin/MakeProjectCreator/config/valuetype.mpb + * examples/IPC_SAP/SOCK_SAP/sock_sap.mpc + * examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc + * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc + * examples/Mem_Map/IO-tests/IO_Test.cpp + * examples/Mem_Map/IO-tests/test_io.cpp + * examples/OS/Process/OS_Process.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/Reactor/Misc/Reactor_Misc.mpc + * examples/Reactor/Multicast/Reactor_Multicast.mpc + * examples/Service_Configurator/IPC-tests/client/Service_Configurator_IPC_Client.mpc + * examples/Service_Configurator/IPC-tests/server/Service_Configurator_IPC_Server.mpc + * examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc + * examples/Shared_Malloc/Shared_Malloc.mpc + * examples/Shared_Memory/Shared_Memory.mpc + * examples/Smart_Pointers/Smart_Pointers.mpc + * examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc + * examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc + * examples/Threads/Threads.mpc + * examples/Timer_Queue/Timer_Queue.mpc + * tests/acetest.mpb + * tests/tests.mpc + * tests/RMCast/RMCast_Fragment_Test.cpp + * tests/RMCast/RMCast_Membership_Test.cpp + * tests/RMCast/RMCast_Reassembly_Test.cpp + * tests/RMCast/RMCast_Reordering_Test.cpp + * tests/RMCast/RMCast_Retransmission_Test.cpp + * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp + * tests/RMCast/tests.mpc + * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp + * tests/SSL/tests.mpc + + Added some missing project files. + Updated all ACE tests to use the common test library. + Updated ACE test mpc files to use a common base project. + Fixed mpc files for broken examples. + Added base projects rtnotify and valuetype. + Wed Jul 2 13:16:14 UTC 2003 Don Hinton <dhinton@dresystems.com> * ace/config-doxygen.h: diff --git a/TAO/CIAO/CIAO.mwc b/TAO/CIAO/CIAO.mwc new file mode 100644 index 00000000000..fdf3d25c23c --- /dev/null +++ b/TAO/CIAO/CIAO.mwc @@ -0,0 +1,4 @@ +workspace { + ciao + CIDLC/cidlc.mpc +}
\ No newline at end of file diff --git a/TAO/CIAO/CIDLC/parser_examples/examples.mwc b/TAO/CIAO/CIDLC/parser_examples/examples.mwc new file mode 100644 index 00000000000..bb521631565 --- /dev/null +++ b/TAO/CIAO/CIDLC/parser_examples/examples.mwc @@ -0,0 +1,2 @@ +workspace { +}
\ No newline at end of file diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 45af78791d7..2c20e0f2ec3 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,18 @@ +Wed Jul 02 14:57:00 2003 Justin Michel <michel_j@ociweb.com> + + * CIAO.mwc + * CIDLC/cidlc.mpc + * CIDLC/parser_examples/examples.mwc + * examples/OEP/examples.mwc + * examples/handcrafted/examples.mwc + * examples/handcrafted/BasicSP/EC/EC.mpc + * examples/handcrafted/Hello/hello.mpc + * tests/tests.mwc + * tools/tools.mwc + + Added workspaces and updated projects files to use + the latest MPC features. + Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com> * ciao/CCM_Core.mpc: diff --git a/TAO/CIAO/examples/OEP/examples.mwc b/TAO/CIAO/examples/OEP/examples.mwc new file mode 100644 index 00000000000..bb521631565 --- /dev/null +++ b/TAO/CIAO/examples/OEP/examples.mwc @@ -0,0 +1,2 @@ +workspace { +}
\ No newline at end of file diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.mpc index 894491c9600..4fd1cf14840 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.mpc +++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.mpc @@ -71,7 +71,7 @@ project (EC_client) : ciao_client, valuetype { } -project (controller) : ciao_client, valuetype { +project (EC_controller) : ciao_client, valuetype { exename = controller after += EC_stub libs += EC_stub BasicSP_stub diff --git a/TAO/CIAO/examples/handcrafted/Hello/hello.mpc b/TAO/CIAO/examples/handcrafted/Hello/hello.mpc index e83742c1fb2..e790f9a1e27 100644 --- a/TAO/CIAO/examples/handcrafted/Hello/hello.mpc +++ b/TAO/CIAO/examples/handcrafted/Hello/hello.mpc @@ -50,7 +50,7 @@ project(hello_executors) : ciao_component { } } -project (client) : ciao_client { +project (*client) : ciao_client { exename = client after += hello_stub libs += hello_stub @@ -64,7 +64,7 @@ project (client) : ciao_client { } // Client for interacting with the Simple_Component_Server -project (simple_client) : ciao_client { +project (*simple_client) : ciao_client { libpaths += $(CIAO_ROOT)/tools/Simple_Component_Server after += hello_stub Simple_Server_Stbu libpaths += $(CIAO_ROOT)/tools/Simple_Component_Server diff --git a/TAO/CIAO/examples/handcrafted/examples.mwc b/TAO/CIAO/examples/handcrafted/examples.mwc new file mode 100644 index 00000000000..bb521631565 --- /dev/null +++ b/TAO/CIAO/examples/handcrafted/examples.mwc @@ -0,0 +1,2 @@ +workspace { +}
\ No newline at end of file diff --git a/TAO/CIAO/tests/tests.mwc b/TAO/CIAO/tests/tests.mwc new file mode 100644 index 00000000000..bb521631565 --- /dev/null +++ b/TAO/CIAO/tests/tests.mwc @@ -0,0 +1,2 @@ +workspace { +}
\ No newline at end of file diff --git a/TAO/CIAO/tools/tools.mwc b/TAO/CIAO/tools/tools.mwc new file mode 100644 index 00000000000..bb521631565 --- /dev/null +++ b/TAO/CIAO/tools/tools.mwc @@ -0,0 +1,2 @@ +workspace { +}
\ No newline at end of file diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0b101841d0a..d411076ff0c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,34 @@ +Wed Jul 02 14:57:00 2003 Justin Michel <michel_j@ociweb.com> + + * examples/AMH/Sink_Server/Sink_Server.mpc + * examples/RTCORBA/Activity/Activity.cpp + * examples/RTCORBA/Activity/Activity.mpc + * examples/RTCORBA/Activity/main.cpp + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc + * orbsvcs/examples/Notify/Lanes/Lanes.mpc + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h + * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc + * orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc + * performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc + * performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc + * performance-tests/Sequence_Latency/DSI/DSI.mpc + * performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc + * tests/IDL_Test/IDL_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/Param_Test/Param_Test.mpc + + Fixed broken mpc files. + Updated Activity example by splitting it into a separate library. The + example was exporting symbols from an exe. There may be another way + to solve this, but I had to guess at what was originally intended. + Removed extra MT_IIOP_SSL mpc file. + Updated Pluggable_Flow_Protocol test to not use covariant return, since + this isn't supported on VC6, and wasn't necessary in this case. + Wed Jul 2 15:37:36 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> * tao/RTScheduling/TAO_RTScheduler.dsp: @@ -5,6 +36,7 @@ Wed Jul 2 15:37:36 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> Added the /GR option to TAO_RTScheduler.dsp to fix warnings due to run time type identifcation problem. + Wed Jul 2 00:23:18 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> * tao/RTScheduling/Distributable_Thread.cpp: diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc index 02dcbb6fde1..9a2be35cd8f 100644 --- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc +++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc @@ -1,4 +1,4 @@ -project(*st_server): taoserver, strategies { +project(*st_server): taoserver, strategies, valuetype { idlflags += -GH exename = st_server requires += ami @@ -11,7 +11,7 @@ project(*st_server): taoserver, strategies { } } -project(*mt_server): taoserver, strategies { +project(*mt_server): taoserver, strategies, valuetype { idlflags += -GH exename = mt_server requires += ami @@ -25,7 +25,7 @@ project(*mt_server): taoserver, strategies { } } -project(*client): taoclient, strategies { +project(*client): taoclient, strategies, valuetype { idlflags += -GH requires += ami diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index c588655bd47..caa77540618 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -15,14 +15,6 @@ #include "POA_Holder.h" #include "Builder.h" -//***************************************************************// -extern "C" void handler (int) -{ - ACE_Service_Config::reconfig_occurred (1); -} - -//***************************************************************// - Activity::Activity (void) :builder_ (0), barrier_ (0), @@ -426,32 +418,6 @@ Activity::create_started_flag_file (int argc, char *argv[]) } } -int -main (int argc, char *argv[]) -{ - ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_Builder); - - ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP); - - ACE_Timer_Heap timer_queue; - ACE_Reactor::instance ()->set_timer_queue (&timer_queue); - - ACE_TRY_NEW_ENV - { - ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); - return 1; - } - ACE_ENDTRY; - - return 0; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Singleton<Activity, ACE_Null_Mutex>; diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc index dde5d3790d3..eefc37c70c6 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.mpc +++ b/TAO/examples/RTCORBA/Activity/Activity.mpc @@ -1,8 +1,25 @@ -project: namingexe, rt_server { - exename = activity - // todo : This doesn't make any sense for an EXE. What is the - // code really supposed to look like? MPC will not let you add - // dynamicflags to an exe project anyway, so the following is ignored. +project(*Lib) : orbsvcslib, naming, rtportableserver { + sharedname = activity dynamicflags = ACTIVITY_BUILD_DLL + libout = . + Source_Files { + Activity.cpp + Builder.cpp + Job_i.cpp + Periodic_Task.cpp + POA_Holder.cpp + Task_Stats.cpp + Thread_Task.cpp + } +} +project: namingexe, rt_server { + exename = test + after += Activity_Lib + libs += activity + Source_Files { + main.cpp + } + IDL_Files { + } } diff --git a/TAO/examples/RTCORBA/Activity/main.cpp b/TAO/examples/RTCORBA/Activity/main.cpp new file mode 100644 index 00000000000..f2562bd0652 --- /dev/null +++ b/TAO/examples/RTCORBA/Activity/main.cpp @@ -0,0 +1,47 @@ +// $Id$ +#include "Activity.h" + +#include "ace/High_Res_Timer.h" +#include "ace/Synch.h" +#include "ace/Timer_Heap.h" +#include "ace/Service_Config.h" +#include "ace/Arg_Shifter.h" +#include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" +#include "tao/ORB_Core.h" + +#include "Thread_Task.h" +#include "Job_i.h" +#include "POA_Holder.h" +#include "Builder.h" + +extern "C" void handler (int) +{ + ACE_Service_Config::reconfig_occurred (1); +} + +int +main (int argc, char *argv[]) +{ + ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_Builder); + + ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP); + + ACE_Timer_Heap timer_queue; + ACE_Reactor::instance ()->set_timer_queue (&timer_queue); + + ACE_TRY_NEW_ENV + { + ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Caught exception:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index cd9806c2e22..dacfae37557 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, portableserver { +project : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable { exename = ImplRepo_Service Source_Files { Adapter_Activator.cpp @@ -9,7 +9,7 @@ project : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, portable } -project(ImR_Activator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, portableserver { +project(ImR_Activator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, strategies { exename = ImR_Activator Source_Files { ImR_Activator.cpp @@ -26,7 +26,7 @@ project(ImR_Activator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, ior } -project(tao_imr) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, portableserver { +project(tao_imr) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable { exename = tao_imr Source_Files { tao_imr.cpp diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Lanes.mpc b/TAO/orbsvcs/examples/Notify/Lanes/Lanes.mpc index d7e6cc023a6..594f25f77b1 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Lanes.mpc +++ b/TAO/orbsvcs/examples/Notify/Lanes/Lanes.mpc @@ -1,19 +1,19 @@ -project(Supplier): notify { +project(Supplier): notify, rtcorba, rtnotify { exename = Supplier - libs += TAO_RT_Notification TAO_RTCORBA - Source_Files { Supplier.cpp Supplier_Client.cpp + ORB_Objects.cpp + ORB_Run_Task.cpp } } -project(Consumer): notifytest { +project(Consumer): notifytest, rtcorba, rtnotify { exename = Consumer - libs += TAO_RT_Notification TAO_RTCORBA - Source_Files { Consumer.cpp Consumer_Client.cpp + ORB_Objects.cpp + ORB_Run_Task.cpp } } diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index 2a6a7dbb84b..d0fa254af1a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -201,7 +201,7 @@ TimeStamp_Protocol_Factory::match_protocol (const char *flow_string) return 0; } -TimeStamp_Protocol_Object* +TAO_AV_Protocol_Object* TimeStamp_Protocol_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, TAO_AV_Flow_Handler *handler, diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h index 7ee8b1c4f84..baad7d218f9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h @@ -43,10 +43,11 @@ class TAO_AV_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Fac virtual ~TimeStamp_Protocol_Factory (void); virtual int init (int argc, char *argv[]); virtual int match_protocol (const char *flow_string); - virtual TimeStamp_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, - TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Flow_Handler *handler, - TAO_AV_Transport *transport); + // Note : Some platforms still don't support Covariant returns + virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, + TAO_Base_StreamEndPoint *endpoint, + TAO_AV_Flow_Handler *handler, + TAO_AV_Transport *transport); }; ACE_STATIC_SVC_DECLARE (TimeStamp_Protocol_Factory) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc index ecaba4c37da..59a3e82e836 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc @@ -9,16 +9,16 @@ project(*supplier): messaging, rteventexe, naming { } } -project(*consumer): messaging, rteventexe, naming { - after += ECMcastTests_Lib - libs += ECMcastTests - includes += ../Common - exename = consumer - - Source_Files { - consumer.cpp - } -} +//project(*consumer): messaging, rteventexe, naming { +// after += ECMcastTests_Lib +// libs += ECMcastTests +// includes += ../Common +// exename = consumer +// +// Source_Files { +// consumer.cpp +// } +//} project(*gateway-ec): messaging, rteventexe, naming { after += ECMcastTests_Lib diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc deleted file mode 100644 index 18d3f89fc68..00000000000 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc +++ /dev/null @@ -1,16 +0,0 @@ -project(* security server): taoserver { - Source_Files { - Server_Worker.cpp - test_i.cpp - server.cpp - } -} - -project(* security client): taoclient { - Source_Files { - testC.cpp - Client_Worker.cpp - client.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 51fd4a10708..ad9cc95b24d 100644 --- a/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc +++ b/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc @@ -1,4 +1,4 @@ -project(*AMH server): taoserver, strategies { +project(*AMH server): taoserver, strategies, valuetype { idlflags += -GH requires += ami @@ -8,7 +8,7 @@ project(*AMH server): taoserver, strategies { } } -project(*AMH client): taoclient, strategies { +project(*AMH client): taoclient, strategies, valuetype { idlflags += -GH requires += ami diff --git a/TAO/performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc index ddc76182b9b..d86e17a95a5 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc +++ b/TAO/performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc @@ -1,4 +1,4 @@ -project(*AMH sequence server): server, strategies { +project(*AMH sequence server): server, strategies, valuetype { idlflags += -GH requires += ami @@ -8,13 +8,15 @@ project(*AMH sequence server): server, strategies { } } -project(* AMH sequence client): client, strategies { - idlflags += -GH +project(*AMH sequence client): client, strategies, valuetype { requires += ami + after += Single_Threaded_AMH_Sequence_Server Source_Files { TestC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc index 992b6a429fe..ee3d1cc24d2 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc @@ -1,21 +1,18 @@ -project(* sequence server) : server, strategies, dynamicinterface { +project(*sequence server) : server, strategies, dynamicinterface { avoids += minimum_corba - - IDL_Files { - } - Source_Files { Roundtrip.cpp server.cpp } } - -project(* sequence client): client, strategies { +project(*sequence client): client, strategies { avoids += minimum_corba - + after += DSI_Sequence_Server Source_Files { TestC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc index 43ec77f05a1..81d726f9f06 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc @@ -1,4 +1,4 @@ -project(* sequence server) : server, strategies { +project(*sequence server) : server, strategies { avoids += minimum_corba Source_Files { @@ -7,12 +7,14 @@ project(* sequence server) : server, strategies { } } -project(* sequence client): client, strategies { +project(*sequence client): client, strategies { avoids += minimum_corba - + after += Single_Threaded_Sequence_Server Source_Files { TestC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index 390f9343ab3..7a7e4a4bf09 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -1,31 +1,6 @@ project(*Main): taoserver { exename = main - IDL_Files { - anonymous.idl - array.idl - constants.idl - enum_in_struct.idl - full.idl - fwd.idl - generic_object.idl - gperf.idl - included.idl - including.idl - interface.idl - keywords.idl - nested_scope.idl - params.idl - pragma.idl - reopen_include1.idl - reopen_include2.idl - reopened_modules.idl - sequence.idl - typedef.idl - union.idl - repo_id_mod.idl - } - Source_Files { anonymousC.cpp anonymousS.cpp diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc index df56afdcf42..155b5bf3351 100644 --- a/TAO/tests/OBV/Any/OBV_Any.mpc +++ b/TAO/tests/OBV/Any/OBV_Any.mpc @@ -1,15 +1,11 @@ -project(*Server): taoserver { - idlflags += -Gv - +project(*Server): taoserver, valuetype { Source_Files { AnyS_impl.cpp server.cpp } } -project(*Client): taoclient { - idlflags += -Gv - +project(*Client): taoclient, 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 e40b6e9da77..79841a36c34 100644 --- a/TAO/tests/OBV/Factory/OBV_Factory.mpc +++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc @@ -1,6 +1,4 @@ -project(*Server): taoserver { - idlflags += -Gv - +project(*Server): taoserver, valuetype { Source_Files { FactoryC_impl.cpp FactoryS_impl.cpp @@ -8,9 +6,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { - idlflags += -Gv - +project(*Client): taoclient, 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 9c6f5b58de7..8a02e49834c 100644 --- a/TAO/tests/OBV/Forward/OBV_Forward.mpc +++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc @@ -1,15 +1,11 @@ -project(*Server): taoserver { - idlflags += -Gv - +project(*Server): taoserver, valuetype { Source_Files { Test_impl.cpp server.cpp } } -project(*Client): taoclient { - idlflags += -Gv - +project(*Client): taoclient, 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 0c092bbe89c..9cb0606bc0e 100644 --- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc +++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc @@ -1,6 +1,4 @@ -project(*Server): taoserver { - exename = server - +project(*Server): taoserver, valuetype { Source_Files { testS.cpp testC.cpp @@ -9,9 +7,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient { - exename = client - +project(*Client): taoclient, valuetype { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index da8ef0020ab..2ce34cca1d9 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -1,7 +1,6 @@ project(*Server): messaging, taoserver, minimum_corba { Source_Files { param_test_i.cpp - tmplinst.cpp server.cpp } } @@ -10,49 +9,48 @@ project(*Client): messaging, taoserver, minimum_corba, dynamicinterface { exename = client Source_Files { - param_testC.cpp - driver.cpp - options.cpp - results.cpp - helper.cpp - tmplinst.cpp any.cpp + bd_array_seq.cpp bd_long_seq.cpp bd_short_seq.cpp - bd_str_seq.cpp - bd_wstr_seq.cpp bd_string.cpp - bd_wstring.cpp bd_struct_seq.cpp - bd_array_seq.cpp + bd_str_seq.cpp + bd_wstring.cpp + bd_wstr_seq.cpp + big_union.cpp + client.cpp + complex_any.cpp + driver.cpp + except.cpp fixed_array.cpp fixed_struct.cpp + helper.cpp + multdim_array.cpp nested_struct.cpp - objref_struct.cpp objref.cpp + objref_struct.cpp + options.cpp + param_test_i.cpp + recursive_struct.cpp + recursive_union.cpp + results.cpp short.cpp - ulonglong.cpp + small_union.cpp typecode.cpp ub_any_seq.cpp + ub_array_seq.cpp ub_long_seq.cpp ub_objref_seq.cpp ub_short_seq.cpp - ub_str_seq.cpp - ub_wstr_seq.cpp ub_string.cpp - ub_wstring.cpp ub_struct_seq.cpp - ub_array_seq.cpp + ub_str_seq.cpp + ub_wstring.cpp + ub_wstr_seq.cpp + ulonglong.cpp var_array.cpp var_struct.cpp - recursive_struct.cpp - except.cpp - big_union.cpp - small_union.cpp - recursive_union.cpp - multdim_array.cpp - complex_any.cpp - client.cpp } } diff --git a/bin/MakeProjectCreator/config/rtnotify.mpb b/bin/MakeProjectCreator/config/rtnotify.mpb new file mode 100644 index 00000000000..de1d6064e60 --- /dev/null +++ b/bin/MakeProjectCreator/config/rtnotify.mpb @@ -0,0 +1,4 @@ +project : notify, rtcorba { + after += RT_Notification + libs += TAO_RT_Notification +} diff --git a/bin/MakeProjectCreator/config/valuetype.mpb b/bin/MakeProjectCreator/config/valuetype.mpb index a90556421cd..cbe6855afbf 100644 --- a/bin/MakeProjectCreator/config/valuetype.mpb +++ b/bin/MakeProjectCreator/config/valuetype.mpb @@ -1,4 +1,5 @@ project { - after += Valuetype - libs += TAO_Valuetype + idlflags += -Gv + after += Valuetype + libs += TAO_Valuetype } diff --git a/bin/create_ace_build.pl b/bin/create_ace_build.pl index d017bc97dc9..c2f49c2e592 100755 --- a/bin/create_ace_build.pl +++ b/bin/create_ace_build.pl @@ -78,64 +78,67 @@ my(@build_re) = (); print "Creating or updating builds in $starting_dir\n"; -sub is_changed { - my($real, $fake) = @_; - unless (-e $real) { +#### If the $linked file is newer than the real file then +#### backup the real file, and replace it with the linked +#### version. + +sub backup_and_copy_changed { + my($real, $linked) = @_; + my($status_real) = stat($real); + if (! $status_real) { die "ERROR: is_changed() real $real not exist.\n"; } - my($status1) = stat($real); - my($status2) = stat($fake); - my($tm1) = $status1->mtime; + my($status_linked) = stat($linked); - if ($status1->mtime != $status2->mtime) { + if ($status_linked->mtime > $status_real->mtime) { + rename($real, $real . '.bak'); + rename($linked, $real); return 1; } - if ($status1->size != $status2->size) { + + if ($status_real->mtime != $status_linked->mtime) { + unlink($linked); + return 1; + } + if ($status_real->size != $status_linked->size) { + unlink($linked); return 1; } return 0; } sub cab_link { - my($real,$fake,$build_regex) = @_; - my($uif) = ($^O eq 'MSWin32' ? 'link' : 'symlink'); + my($real,$linked,$build_regex) = @_; my($status) = 0; if ($^O eq 'MSWin32') { - my($fixed) = $fake; + my($fixed) = $linked; $fixed =~ s/$build_regex//; push(@nlinks, $fixed); - if (-d "$starting_dir/$fake") { - die "ERROR: cab_link() $fake is a directory.\n"; - } - - #### chdir does NOT work with relative path names. (ActivePerl 5.6 WinXP) - my($curdir) = "$starting_dir/" . dirname($fake); + my($curdir) = "$starting_dir/" . dirname($linked); $status = chdir($curdir); if (! $status) { die "ERROR: cab_link() chdir " . $curdir . " failed.\n"; } - my($base_fake) = basename($fake); + my($base_linked) = basename($linked); - if (-e $base_fake) { - if (is_changed($real, $base_fake)) { - unlink($base_fake); - } else { + if (-e $base_linked) { + if (! backup_and_copy_changed($real, $base_linked)) { return; } } - print "$uif $real $fake\n" if $verbose; - $status = link ($real, $base_fake); + print "link $real $linked\n" if $verbose; + $status = link ($real, $base_linked); chdir($starting_dir); } else { - print "$uif $real $fake\n" if $verbose; - $status = symlink ($real, $fake); + print "$symlink $real $linked\n" if $verbose; + $status = symlink ($real, $linked); } if (!$status) { - die "$0: $real -> $fake failed\n"; + die "$0: $real -> $linked failed\n"; } } @@ -272,6 +275,7 @@ sub wanted { ! /^.*\.icp\z/s && ! /^.*\.ncb\z/s && ! /^.*\.opt\z/s && + ! /^.*\.bak\z/s && ! /^\.cvsignore\z/s && ! /^Makefile.*\z/s ); @@ -291,7 +295,6 @@ print "Found $#files files and directories.\n"; #### foreach $file (@files) { $file =~ s%^./%%g; #### excise leading ./ directory component - #### -d does NOT work with relative path names. (ActivePerl 5.6 WinXP) my($fullname) = "$starting_dir/$file"; for ($idx = 0; $idx <= $#builds; $idx++) { my($build) = $builds[$idx]; @@ -301,7 +304,7 @@ foreach $file (@files) { mkdir ("$starting_dir/$build/$file", $directory_mode); } } else { - unless ((-e "$build/$file") && ($^O ne 'MSWin32')) { + unless (($^O ne 'MSWin32') && (-e "$build/$file")) { $up = '../..'; while ($file =~ m%/%g) { $up .= '/..'; @@ -312,6 +315,8 @@ foreach $file (@files) { } } +print "Finished creating and updating links.\n"; + foreach $build (@builds) { #### #### Find all the symlinks in the build directory, and remove ones @@ -378,15 +383,24 @@ foreach $build (@builds) { #### print "\nCompleted creation of $build/.\n"; - if (! -e "$build/ace/config.h") { +foreach $build (@builds) { + unless (-d "$starting_dir/$build") { + print "Creating $starting_dir/$build\n"; + mkdir ("$starting_dir/$build", $directory_mode); + } + + + if (! -e "$starting_dir/$build/ace/config.h") { print "Be sure to setup $build/ace/config.h"; } if ($^O ne 'MSWin32' && - ! -e "$build/include/makeinclude/platform_macros.GNU") { + ! -e "$starting_dir/$build/include/makeinclude/platform_macros.GNU") { print " and\n$build/include/makeinclude/platform_macros.GNU"; } print ".\n"; } +} + #### EOF diff --git a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc index 8ed8780b6a6..655a4573cda 100644 --- a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc +++ b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc @@ -1,7 +1,7 @@ project(*C_inclient) : aceexe { exename = C-inclient Source_Files { - C_inclient.cpp + C-inclient.cpp } } diff --git a/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc b/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc index efae4a6e180..e9beaff3960 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc +++ b/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc @@ -1,39 +1,39 @@ -project(*client) : aceexe { +project(*client) : aceexe, ssl { exename = client Source_Files { SSL-client.cpp } } -project(*client_simple) : aceexe { +project(*client_simple) : aceexe, ssl { exename = client-simple Source_Files { SSL-client-simple.cpp } } -project(*server) : aceexe { +project(*server) : aceexe, ssl { exename = server Source_Files { SSL-server.cpp } } -project(*server_fancy) : aceexe { +project(*server_fancy) : aceexe, ssl { exename = server-fancy Source_Files { SSL-server-fancy.cpp } } -project(*server_poll) : aceexe { +project(*server_poll) : aceexe, ssl { exename = server-poll Source_Files { SSL-server-poll.cpp } } -project(*server_simple) : aceexe { +project(*server_simple) : aceexe, ssl { exename = server-simple Source_Files { SSL-server-simple.cpp diff --git a/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc b/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc new file mode 100644 index 00000000000..f1e4fe56347 --- /dev/null +++ b/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc @@ -0,0 +1,5 @@ +project : aceexe { + macros += _AFXDLL + pch_header = StdAfx.h + pch_source = StdAfx.cpp +}
\ No newline at end of file diff --git a/examples/Mem_Map/IO-tests/IO_Test.cpp b/examples/Mem_Map/IO-tests/IO_Test.cpp index 4c2ab9c3160..72ab4bf53e5 100644 --- a/examples/Mem_Map/IO-tests/IO_Test.cpp +++ b/examples/Mem_Map/IO-tests/IO_Test.cpp @@ -1,5 +1,7 @@ // $Id$ +#if !defined(_WIN32) + #include "ace/OS.h" #include "ace/Mem_Map.h" #include "ace/Log_Msg.h" @@ -7,6 +9,8 @@ ACE_RCSID(IO_tests, IO_Test, "$Id$") + + IO_Test::IO_Test (const char *name, ACE_Profile_Timer &tm) : name_ (name), tm_ (tm) @@ -30,8 +34,8 @@ Slow_Read_Write_Test::run_test (int iterations, FILE *input_fp, FILE *output_fp) { - int ifd = fileno (input_fp); - int ofd = fileno (output_fp); + ACE_HANDLE ifd = fileno (input_fp); + ACE_HANDLE ofd = fileno (output_fp); this->tm_.start (); @@ -40,7 +44,7 @@ Slow_Read_Write_Test::run_test (int iterations, char c; while (ACE_OS::read (ifd, &c, sizeof c) > 0) - ::write (ofd, &c, sizeof c); + ::write (ofd, &c, sizeof c); ACE_OS::lseek (ifd, 0, SEEK_SET); ACE_OS::lseek (ofd, 0, SEEK_SET); @@ -68,7 +72,7 @@ Stdio_Test::run_test (int iterations, int c; while ((c = getc (input_fp)) != EOF) - putc (c, output_fp); + putc (c, output_fp); ACE_OS::rewind (input_fp); ACE_OS::rewind (output_fp); @@ -101,7 +105,7 @@ Block_Read_Write_Test::run_test (int iterations, while ((n = ACE_OS::read (ifd, buf, sizeof buf)) > 0) - ::write (ofd, buf, n); + ::write (ofd, buf, n); ACE_OS::lseek (ifd, 0, SEEK_SET); ACE_OS::lseek (ofd, 0, SEEK_SET); @@ -133,7 +137,7 @@ Block_Fread_Fwrite_Test::run_test (int iterations, 1, sizeof buf, input_fp)) != 0) - ::fwrite (buf, n, 1, output_fp); + ::fwrite (buf, n, 1, output_fp); ACE_OS::rewind (input_fp); ACE_OS::rewind (output_fp); @@ -167,18 +171,18 @@ Mmap1_Test::run_test (int iterations, this->tm_.start (); while (--iterations >= 0) - { - if (ACE_OS::write (fileno (output_fp), + { + if (ACE_OS::write (fileno (output_fp), src, map_input.size ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "%s", this->name ()), -1); - ACE_OS::lseek (fileno (output_fp), + ACE_OS::lseek (fileno (output_fp), 0, SEEK_SET); - } + } this->tm_.stop (); } @@ -219,7 +223,7 @@ Mmap2_Test::run_test (int iterations, this->tm_.start (); while (--iterations >= 0) - ACE_OS::memcpy (dst, src, size); + ACE_OS::memcpy (dst, src, size); this->tm_.stop (); } @@ -230,3 +234,4 @@ Mmap2_Test::run_test (int iterations, else return 0; } +#endif diff --git a/examples/Mem_Map/IO-tests/test_io.cpp b/examples/Mem_Map/IO-tests/test_io.cpp index 3a1514e476c..2f91fb1e9c8 100644 --- a/examples/Mem_Map/IO-tests/test_io.cpp +++ b/examples/Mem_Map/IO-tests/test_io.cpp @@ -1,6 +1,7 @@ // $Id$ // Test program for different methods of copying files. +#if !defined(_WIN32) #include "ace/OS.h" #include "ace/ACE.h" @@ -124,7 +125,8 @@ run_tests (int iterations, FILE *input_fp, FILE *output_fp) for (i = 0; test_vector[i] != 0; i++) { - if (ACE_OS::ftruncate (fileno (output_fp), 0) == -1) + ACE_HANDLE hfile = fileno (output_fp); + if (ACE_OS::ftruncate (hfile, 0) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%s\n", "ftruncate"), @@ -203,3 +205,9 @@ main (int argc, char *argv[]) cleanup (); return 0; } +#else +int main(int ac, char* av[]) { + // not supported on win32 + return 0; +} +#endif diff --git a/examples/OS/Process/OS_Process.mpc b/examples/OS/Process/OS_Process.mpc index 40b5bee1653..ac5aa940bc3 100644 --- a/examples/OS/Process/OS_Process.mpc +++ b/examples/OS/Process/OS_Process.mpc @@ -1,2 +1,12 @@ -project : aceexe { +project(*imore) : aceexe { + exename = imore + Source_Files { + imore.cpp + } +} +project(*process) : aceexe { + exename = process + Source_Files { + process.cpp + } } 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 40b5bee1653..0bb208a142b 100644 --- a/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc +++ b/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc @@ -1,2 +1,20 @@ -project : aceexe { +project(*receiver) : aceexe, qos { + exename = receiver + Source_Files { + Fill_ACE_Qos.cpp + Qos_Signal_Handler.cpp + Qos_Util.cpp + receiver.cpp + Receiver_Qos_Event_Handler.cpp + } +} +project(*sender) : aceexe, qos { + exename = sender + Source_Files { + Fill_ACE_Qos.cpp + Qos_Signal_Handler.cpp + Qos_Util.cpp + sender.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 40b5bee1653..0bb208a142b 100644 --- a/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc +++ b/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc @@ -1,2 +1,20 @@ -project : aceexe { +project(*receiver) : aceexe, qos { + exename = receiver + Source_Files { + Fill_ACE_Qos.cpp + Qos_Signal_Handler.cpp + Qos_Util.cpp + receiver.cpp + Receiver_Qos_Event_Handler.cpp + } +} +project(*sender) : aceexe, qos { + exename = sender + Source_Files { + Fill_ACE_Qos.cpp + Qos_Signal_Handler.cpp + Qos_Util.cpp + sender.cpp + Sender_Qos_Event_Handler.cpp + } } diff --git a/examples/QOS/Diffserv/QOS_Diffserv.mpc b/examples/QOS/Diffserv/QOS_Diffserv.mpc index 40b5bee1653..14118473e06 100644 --- a/examples/QOS/Diffserv/QOS_Diffserv.mpc +++ b/examples/QOS/Diffserv/QOS_Diffserv.mpc @@ -1,2 +1,12 @@ -project : aceexe { +project(*client) : aceexe, qos { + exename = client + Source_Files { + diffserv_test.cpp + } +} +project(*server) : aceexe, qos { + exename = server + Source_Files { + server.cpp + } } diff --git a/examples/QOS/Simple/QOS_Simple.mpc b/examples/QOS/Simple/QOS_Simple.mpc index 40b5bee1653..0bb208a142b 100644 --- a/examples/QOS/Simple/QOS_Simple.mpc +++ b/examples/QOS/Simple/QOS_Simple.mpc @@ -1,2 +1,20 @@ -project : aceexe { +project(*receiver) : aceexe, qos { + exename = receiver + Source_Files { + Fill_ACE_Qos.cpp + Qos_Signal_Handler.cpp + Qos_Util.cpp + receiver.cpp + Receiver_Qos_Event_Handler.cpp + } +} +project(*sender) : aceexe, qos { + exename = sender + Source_Files { + Fill_ACE_Qos.cpp + Qos_Signal_Handler.cpp + Qos_Util.cpp + sender.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 40b5bee1653..225c0656a1f 100644 --- a/examples/RMCast/Send_File/RMCast_Send_File.mpc +++ b/examples/RMCast/Send_File/RMCast_Send_File.mpc @@ -1,2 +1,12 @@ -project : aceexe { +project(*Sender) : aceexe, rmcast { + exename = sender + Source_Files { + Sender.cpp + } +} +project(*Receiver) : aceexe, rmcast { + exename = receiver + Source_Files { + Receiver.cpp + } } diff --git a/examples/Reactor/Misc/Reactor_Misc.mpc b/examples/Reactor/Misc/Reactor_Misc.mpc index 40b5bee1653..fde79a287e9 100644 --- a/examples/Reactor/Misc/Reactor_Misc.mpc +++ b/examples/Reactor/Misc/Reactor_Misc.mpc @@ -1,2 +1,42 @@ -project : aceexe { +project(*demuxing) : aceexe { + exename = demuxing + Source_Files { + test_demuxing.cpp + } +} +project(*early_timeouts) : aceexe { + exename = early_timeouts + Source_Files { + test_early_timeouts.cpp + } +} +project(*notification) : aceexe { + exename = notification + Source_Files { + notification.cpp + } +} +project(*reactors) : aceexe { + exename = reactors + Source_Files { + test_reactors.cpp + } +} +project(*signals_1) : aceexe { + exename = signals_1 + Source_Files { + test_signals_1.cpp + } +} +project(*signals_2) : aceexe { + exename = signals_2 + Source_Files { + test_signals_2.cpp + } +} +project(*timer_queue) : aceexe { + exename = timer_queue + Source_Files { + test_timer_queue.cpp + } } diff --git a/examples/Reactor/Multicast/Reactor_Multicast.mpc b/examples/Reactor/Multicast/Reactor_Multicast.mpc index 40b5bee1653..4f026fe7d3a 100644 --- a/examples/Reactor/Multicast/Reactor_Multicast.mpc +++ b/examples/Reactor/Multicast/Reactor_Multicast.mpc @@ -1,2 +1,14 @@ -project : aceexe { +project(*client) : aceexe { + exename = client + Source_Files { + client.cpp + Log_Wrapper.cpp + } +} +project(*server) : aceexe { + exename = server + Source_Files { + server.cpp + Log_Wrapper.cpp + } } diff --git a/examples/Registry/Registry.mpc b/examples/Registry/Registry.mpc new file mode 100644 index 00000000000..053dec4545e --- /dev/null +++ b/examples/Registry/Registry.mpc @@ -0,0 +1,12 @@ +project(*iterator) : aceexe { + exename = iterator + Source_Files { + test_registry_iterator.cpp + } +} +project(*update) : aceexe { + exename = update + Source_Files { + test_registry_update.cpp + } +} diff --git a/examples/Service_Configurator/IPC-tests/client/Service_Configurator_IPC_Client.mpc b/examples/Service_Configurator/IPC-tests/client/Service_Configurator_IPC_Client.mpc index 40b5bee1653..325c68529d7 100644 --- a/examples/Service_Configurator/IPC-tests/client/Service_Configurator_IPC_Client.mpc +++ b/examples/Service_Configurator/IPC-tests/client/Service_Configurator_IPC_Client.mpc @@ -1,2 +1,60 @@ -project : aceexe { +project(*local dgram) : aceexe { + exename = localdgram + Source_Files { + local_dgram_client_test.cpp + } +} +project(*local fifo) : aceexe { + exename = localfifo + Source_Files { + local_fifo_client_test.cpp + } +} +project(*local pipe) : aceexe { + exename = localpipe + Source_Files { + local_pipe_client_test.cpp + } +} +project(*local spipe) : aceexe { + exename = localspipe + Source_Files { + local_spipe_client_test.cpp + } +} +project(*local stream) : aceexe { + exename = localstream + Source_Files { + local_stream_client_test.cpp + } +} +project(*remote dgram) : aceexe { + exename = remotedgram + Source_Files { + remote_dgram_client_test.cpp + } +} +project(*remote service directory) : aceexe { + exename = remoteservicedirectory + Source_Files { + remote_service_directory_test.cpp + } +} +project(*remote stream) : aceexe { + exename = remotestream + Source_Files { + remote_stream_client_test.cpp + } +} +project(*remote thr_stream) : aceexe { + exename = remotethr_stream + Source_Files { + remote_thr_stream_client_test.cpp + } +} +project(*broadcast) : aceexe { + exename = remotebroadcast + Source_Files { + broadcast_client_test.cpp + } } diff --git a/examples/Service_Configurator/IPC-tests/server/Service_Configurator_IPC_Server.mpc b/examples/Service_Configurator/IPC-tests/server/Service_Configurator_IPC_Server.mpc index 40b5bee1653..cb0e850c3b1 100644 --- a/examples/Service_Configurator/IPC-tests/server/Service_Configurator_IPC_Server.mpc +++ b/examples/Service_Configurator/IPC-tests/server/Service_Configurator_IPC_Server.mpc @@ -1,2 +1,25 @@ -project : aceexe { +project(*Lib) : acelib { + sharedname = IPC_Tests_Server + dynamicflags += ACE_BUILD_SVC_DLL + Source_Files { + Handle_Broadcast.cpp + Handle_L_CODgram.cpp + Handle_L_Dgram.cpp + Handle_L_FIFO.cpp + Handle_L_Pipe.cpp + Handle_L_SPIPE.cpp + Handle_L_Stream.cpp + Handle_R_Stream.cpp + Handle_Thr_Stream.cpp + Handle_Timeout.cpp + } } + +project(*test) : aceexe { + exename = server + after += Service_Configurator_IPC_Server_Lib + libs += IPC_Tests_Server + Source_Files { + server_test.cpp + } +}
\ No newline at end of file diff --git a/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc b/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc index 40b5bee1653..963cbffd511 100644 --- a/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc +++ b/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc @@ -1,2 +1,15 @@ -project : aceexe { +project(*Timer) : acelib { + sharedname = timer + dynamicflags += ACE_BUILD_SVC_DLL + Source_Files { + Timer_Service.cpp + } +} +project(*Main) : aceexe { + exename = main + after += Service_Configurator_Misc_Timer + libs += timer + Source_Files { + main.cpp + } } diff --git a/examples/Shared_Malloc/Shared_Malloc.mpc b/examples/Shared_Malloc/Shared_Malloc.mpc index 40b5bee1653..089d81ed1d6 100644 --- a/examples/Shared_Malloc/Shared_Malloc.mpc +++ b/examples/Shared_Malloc/Shared_Malloc.mpc @@ -1,2 +1,30 @@ project : aceexe { + exename = malloc + Source_Files { + Malloc.cpp + Options.cpp + test_malloc.cpp + } +} +project(*multiple) : aceexe { + exename = multiple + Source_Files { + Malloc.cpp + Options.cpp + test_multiple_mallocs.cpp + } +} +project(*persistence) : aceexe { + exename = persistence + Source_Files { + test_persistence.cpp + } +} +project(*posind) : aceexe { + exename = posind + Source_Files { + Malloc.cpp + Options.cpp + test_position_independent_malloc.cpp + } } diff --git a/examples/Shared_Memory/Shared_Memory.mpc b/examples/Shared_Memory/Shared_Memory.mpc index 40b5bee1653..967bec6053b 100644 --- a/examples/Shared_Memory/Shared_Memory.mpc +++ b/examples/Shared_Memory/Shared_Memory.mpc @@ -1,2 +1,12 @@ -project : aceexe { +project(*MM) : aceexe { + exename = testmm + Source_Files { + test_MM.cpp + } +} +project(*SV) : aceexe { + exename = testsv + Source_Files { + test_SV.cpp + } } diff --git a/examples/Smart_Pointers/Smart_Pointers.mpc b/examples/Smart_Pointers/Smart_Pointers.mpc index 40b5bee1653..3393c95470c 100644 --- a/examples/Smart_Pointers/Smart_Pointers.mpc +++ b/examples/Smart_Pointers/Smart_Pointers.mpc @@ -1,2 +1,25 @@ -project : aceexe { +project(*Gadget) : aceexe { + exename = gadget + Source_Files { + Gadget.cpp + Gadget_Factory.cpp + Gadget_Impl.cpp + Gadget_Part.cpp + Gadget_Part_Factory.cpp + Gadget_Part_Impl.cpp + gadget_test.cpp + } +} + +project(*Widget) : aceexe { + exename = Widget + Source_Files { + Widget.cpp + Widget_Factory.cpp + Widget_Impl.cpp + Widget_Part.cpp + Widget_Part_Factory.cpp + Widget_Part_Impl.cpp + Widget_test.cpp + } } diff --git a/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc b/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc index 40b5bee1653..4eea8e4af2f 100644 --- a/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc +++ b/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc @@ -1,2 +1,25 @@ -project : aceexe { +project(*MQ Client) : aceexe { + exename = mqclient + Source_Files { + MQ_Client.cpp + } } +project(*MQ Server) : aceexe { + exename = mqserver + Source_Files { + MQ_Server.cpp + } +} +project(*TMQ Client) : aceexe { + exename = tmqclient + Source_Files { + TMQ_Client.cpp + } +} +project(*TMQ Server) : aceexe { + exename = tmqserver + Source_Files { + TMQ_Server.cpp + } +} + diff --git a/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc b/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc index 40b5bee1653..1571b2f7e7b 100644 --- a/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc +++ b/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc @@ -1,2 +1,12 @@ -project : aceexe { +project(*1) : aceexe { + exename = sem1 + Source_Files { + Semaphores_1.cpp + } +} +project(*2) : aceexe { + exename = sem2 + Source_Files { + Semaphores_2.cpp + } } diff --git a/examples/Threads/Threads.mpc b/examples/Threads/Threads.mpc index 40b5bee1653..535c8c17eb9 100644 --- a/examples/Threads/Threads.mpc +++ b/examples/Threads/Threads.mpc @@ -1,2 +1,132 @@ -project : aceexe { +project(*auto_event) : aceexe { + exename = auto_event + Source_Files { + auto_event.cpp + } +} +project(*barrier1) : aceexe { + exename = barrier1 + Source_Files { + barrier1.cpp + } +} +project(*barrier2) : aceexe { + exename = barrier2 + Source_Files { + barrier2.cpp + } +} +project(*cancel) : aceexe { + exename = cancel + Source_Files { + cancel.cpp + } +} +project(*future1) : aceexe { + exename = future1 + Source_Files { + future1.cpp + } +} +project(*future2) : aceexe { + exename = future2 + Source_Files { + future2.cpp + } +} +project(*manual_event) : aceexe { + exename = manual_event + Source_Files { + manual_event.cpp + } +} +project(*process_mutex) : aceexe { + exename = process_mutex + Source_Files { + process_mutex.cpp + } +} +project(*process_semaphore) : aceexe { + exename = process_semaphore + Source_Files { + process_semaphore.cpp + } +} +project(*reader_writer) : aceexe { + exename = reader_writer + Source_Files { + reader_writer.cpp + } +} +project(*recursive_mutex) : aceexe { + exename = recursive_mutex + Source_Files { + recursive_mutex.cpp + } +} +project(*task_five) : aceexe { + exename = task_five + Source_Files { + task_five.cpp + } +} +project(*task_four) : aceexe { + exename = task_four + Source_Files { + task_four.cpp + } +} +project(*task_three) : aceexe { + exename = task_three + Source_Files { + task_three.cpp + } +} +project(*task_two) : aceexe { + exename = task_two + Source_Files { + task_two.cpp + } +} +project(*task_one) : aceexe { + exename = task_one + Source_Files { + task_one.cpp + } +} +project(*thread_manager) : aceexe { + exename = thread_manager + Source_Files { + thread_manager.cpp + } +} +project(*thread_pool) : aceexe { + exename = thread_pool + Source_Files { + thread_pool.cpp + } +} +project(*thread_specific) : aceexe { + exename = thread_specific + Source_Files { + thread_specific.cpp + } +} +project(*token) : aceexe { + exename = token + Source_Files { + token.cpp + } +} +project(*tss1) : aceexe { + exename = tss1 + Source_Files { + tss1.cpp + } +} +project(*tss2) : aceexe { + exename = tss2 + Source_Files { + tss2.cpp + } } diff --git a/examples/Timer_Queue/Timer_Queue.mpc b/examples/Timer_Queue/Timer_Queue.mpc index 40b5bee1653..718cc75278a 100644 --- a/examples/Timer_Queue/Timer_Queue.mpc +++ b/examples/Timer_Queue/Timer_Queue.mpc @@ -1,2 +1,37 @@ -project : aceexe { +project(*Library) : acelib { + sharedname = tqtd + dynamicflags += ACE_BUILD_SVC_DLL + Source_Files { + Async_Timer_Queue_Test.cpp + Driver.cpp + Reactor_Timer_Queue_Test.cpp + Thread_Timer_Queue_Test.cpp + } +} + +project(*Async) : aceexe { + exename = Asynch_Timer_Queue_Test + after += Timer_Queue_Library + libs += tqtd + Source_Files { + main_async.cpp + } +} + +project(*Reactor) : aceexe { + exename = Reactor_Timer_Queue_Test + after += Timer_Queue_Library + libs += tqtd + Source_Files { + main_reactor.cpp + } +} + +project(*Thread) : aceexe { + exename = Thread_Timer_Queue_Test + after += Timer_Queue_Library + libs += tqtd + Source_Files { + main_thread.cpp + } } diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp index 21024458e8e..5ff54679a0c 100644 --- a/tests/RMCast/RMCast_Fragment_Test.cpp +++ b/tests/RMCast/RMCast_Fragment_Test.cpp @@ -44,7 +44,7 @@ private: }; int -ACE_TMAIN (int, ACE_TCHAR *[]) +run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("RMCast_Fragment_Test")); diff --git a/tests/RMCast/RMCast_Membership_Test.cpp b/tests/RMCast/RMCast_Membership_Test.cpp index 8d6a2259b3a..8e6b716cded 100644 --- a/tests/RMCast/RMCast_Membership_Test.cpp +++ b/tests/RMCast/RMCast_Membership_Test.cpp @@ -156,7 +156,7 @@ private: // **************************************************************** int -ACE_TMAIN (int, ACE_TCHAR *[]) +run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("RMCast_Membership_Test")); diff --git a/tests/RMCast/RMCast_Reassembly_Test.cpp b/tests/RMCast/RMCast_Reassembly_Test.cpp index c3a8287e3cf..5d1e1afe855 100644 --- a/tests/RMCast/RMCast_Reassembly_Test.cpp +++ b/tests/RMCast/RMCast_Reassembly_Test.cpp @@ -51,7 +51,7 @@ private: }; int -ACE_TMAIN (int, ACE_TCHAR *[]) +run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("RMCast_Reassembly_Test")); diff --git a/tests/RMCast/RMCast_Reordering_Test.cpp b/tests/RMCast/RMCast_Reordering_Test.cpp index ed257e4fade..e17f8b5cabb 100644 --- a/tests/RMCast/RMCast_Reordering_Test.cpp +++ b/tests/RMCast/RMCast_Reordering_Test.cpp @@ -132,7 +132,7 @@ private: // **************************************************************** int -ACE_TMAIN (int, ACE_TCHAR *[]) +run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("RMCast_Reordering_Test")); diff --git a/tests/RMCast/RMCast_Retransmission_Test.cpp b/tests/RMCast/RMCast_Retransmission_Test.cpp index 4bf6dcee014..1fdaaeeb601 100644 --- a/tests/RMCast/RMCast_Retransmission_Test.cpp +++ b/tests/RMCast/RMCast_Retransmission_Test.cpp @@ -179,7 +179,7 @@ private: // **************************************************************** int -ACE_TMAIN (int, ACE_TCHAR *[]) +run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("RMCast_Retransmission_Test")); diff --git a/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp b/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp index 7eeb9d9a90b..b9bf3a7824c 100644 --- a/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp +++ b/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp @@ -116,7 +116,7 @@ private: // **************************************************************** int -ACE_TMAIN (int, ACE_TCHAR *[]) +run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("RMCast_UDP_Best_Effort_Test")); diff --git a/tests/RMCast/acetest.mpb b/tests/RMCast/acetest.mpb new file mode 100644 index 00000000000..a912fa90813 --- /dev/null +++ b/tests/RMCast/acetest.mpb @@ -0,0 +1,17 @@ +project : aceexe { + + after += Test_Output + libs += Test_Output + + Source_Files { + $(ACE_ROOT)/tests/Main.cpp + } + Header_Files { + } + Resource_Files { + } + Documentation_Files { + } + Inline_Files { + } +}
\ No newline at end of file diff --git a/tests/RMCast/tests.mpc b/tests/RMCast/tests.mpc index 2a858052f43..b7cb30ba329 100644 --- a/tests/RMCast/tests.mpc +++ b/tests/RMCast/tests.mpc @@ -1,39 +1,39 @@ -project(RMCast Fragment Test) : aceexe, rmcast { +project(RMCast Fragment Test) : acetest, rmcast { exename = RMCast_Fragment_Test Source_Files { RMCast_Fragment_Test.cpp } } -project(RMCast Membership Test) : aceexe, rmcast { +project(RMCast Membership Test) : acetest, rmcast { exename = RMCast_Membership_Test Source_Files { RMCast_Membership_Test.cpp } } -project(RMCast Reassembly Test) : aceexe, rmcast { +project(RMCast Reassembly Test) : acetest, rmcast { exename = RMCast_Reassembly_Test Source_Files { RMCast_Reassembly_Test.cpp } } -project(RMCast Reordering Test) : aceexe, rmcast { +project(RMCast Reordering Test) : acetest, rmcast { exename = RMCast_Reordering_Test Source_Files { RMCast_Reordering_Test.cpp } } -project(RMCast Retransmission Test) : aceexe, rmcast { +project(RMCast Retransmission Test) : acetest, rmcast { exename = RMCast_Retransmission_Test Source_Files { RMCast_Retransmission_Test.cpp } } -project(RMCast UDP Best Effort Test) : aceexe, rmcast { +project(RMCast UDP Best Effort Test) : acetest, rmcast { exename = RMCast_UDP_Best_Effort_Test Source_Files { RMCast_UDP_Best_Effort_Test.cpp diff --git a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp index 6a683525195..1e93f2f81c2 100644 --- a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp +++ b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp @@ -296,7 +296,7 @@ worker (void *) } int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +run_main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Thread_Pool_Reactor_SSL_Test")); diff --git a/tests/SSL/acetest.mpb b/tests/SSL/acetest.mpb new file mode 100644 index 00000000000..a912fa90813 --- /dev/null +++ b/tests/SSL/acetest.mpb @@ -0,0 +1,17 @@ +project : aceexe { + + after += Test_Output + libs += Test_Output + + Source_Files { + $(ACE_ROOT)/tests/Main.cpp + } + Header_Files { + } + Resource_Files { + } + Documentation_Files { + } + Inline_Files { + } +}
\ No newline at end of file diff --git a/tests/SSL/tests.mpc b/tests/SSL/tests.mpc index 4c5e2aac4b9..436c4257606 100644 --- a/tests/SSL/tests.mpc +++ b/tests/SSL/tests.mpc @@ -1,4 +1,4 @@ -project(Thread Pool Reactor SSL Test) : aceexe, ssl { +project(Thread Pool Reactor SSL Test) : acetest, ssl { exename = Thread_Pool_Reactor_SSL_Test Source_Files { Thread_Pool_Reactor_SSL_Test.cpp diff --git a/tests/acetest.mpb b/tests/acetest.mpb index 6d08318f689..a912fa90813 100644 --- a/tests/acetest.mpb +++ b/tests/acetest.mpb @@ -1,4 +1,11 @@ project : aceexe { + + after += Test_Output + libs += Test_Output + + Source_Files { + $(ACE_ROOT)/tests/Main.cpp + } Header_Files { } Resource_Files { diff --git a/tests/tests.mpc b/tests/tests.mpc index de843f228fc..d6691bc9979 100644 --- a/tests/tests.mpc +++ b/tests/tests.mpc @@ -1,3 +1,17 @@ +project(Test_Output) : acelib { + sharedname = Test_Output + dynamicflags = TEST_OUTPUT_BUILD_DLL + Source_Files { + Test_Output.cpp + } + Header_Files { + Test_Output_Export.h + test_config.h + } + Resource_Files { + } +} + project(Framework Component DLL) : acelib { sharedname = Framework_Component_DLL dynamicflags = FRAMEWORK_COMPONENT_DLL_BUILD_DLL @@ -48,6 +62,12 @@ project(ACE INIT Test) : acetest { } } +project(ACE Test) : acetest { + Source_Files { + ACE_Test.cpp + } +} + project(Aio Platform Test) : acetest { exename = Aio_Platform_Test Source_Files { @@ -903,7 +923,7 @@ project(Framework Component Test) : acetest { } } -project(FIFO Test) : aceexe { +project(FIFO Test) : acetest { Source_Files { FIFO_Test.cpp } |