diff options
| author | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-25 16:09:27 +0000 |
|---|---|---|
| committer | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-25 16:09:27 +0000 |
| commit | fccbe0e94f74f898f7d5cc709f617f51dce33bee (patch) | |
| tree | 4aeedd6e44108cb39fd15d255d14519806d6992e | |
| parent | 730c9c0d360dace01feb0c5509cb0af121ce2e17 (diff) | |
| download | ATCD-fccbe0e94f74f898f7d5cc709f617f51dce33bee.tar.gz | |
Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com>
535 files changed, 3793 insertions, 2753 deletions
diff --git a/ACEXML/ACEXML.mwc b/ACEXML/ACEXML.mwc index 3bcd3bd09c4..9fdb8c9ec46 100644 --- a/ACEXML/ACEXML.mwc +++ b/ACEXML/ACEXML.mwc @@ -1,7 +1,7 @@ -workspace (ACEXML) { - common +workspace { parser + common apps - examples tests + examples } diff --git a/ACEXML/common/common.mpc b/ACEXML/common/common.mpc index 814e10d88cc..dbfe1ca2bb8 100644 --- a/ACEXML/common/common.mpc +++ b/ACEXML/common/common.mpc @@ -1,4 +1,4 @@ project(ACEXML): acelib { - sharedname = ACEXML - dllflags += ACEXML_BUILD_DLL + sharedname = ACEXML + dynamicflags += ACEXML_BUILD_DLL } diff --git a/ACEXML/parser/parser/parser.mpc b/ACEXML/parser/parser/parser.mpc index 6816ce41cf2..bcbbc10f0e7 100644 --- a/ACEXML/parser/parser/parser.mpc +++ b/ACEXML/parser/parser/parser.mpc @@ -1,7 +1,6 @@ project(ACEXML_Parser): acelib { - sharedname = ACEXML_Parser - depends += ACEXML - libs += ACEXML - libpaths += $(ACE_ROOT)/ACEXML/common - dllflags += ACEXML_PARSER_BUILD_DLL + sharedname = ACEXML_Parser + after += ACEXML + libs += ACEXML + dynamicflags += ACEXML_PARSER_BUILD_DLL } diff --git a/ASNMP/asnmp.mwc b/ASNMP/asnmp.mwc new file mode 100644 index 00000000000..4fbc8a7876c --- /dev/null +++ b/ASNMP/asnmp.mwc @@ -0,0 +1,7 @@ +workspace { + agent + asnmp + examples + mibs + tests +} diff --git a/ChangeLog b/ChangeLog index 504c38d5bce..4fd543f05ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,201 @@ +Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com> + + * nightly.mwc: + * ACEXML/ACEXML.mwc: + * ACEXML/common/common.mpc: + * ACEXML/parser/parser/parser.mpc: + * ASNMP/asnmp.mwc: + * Kokyu/Kokyu.mpc: + * ace/ace.mpc: + * ace/ace.mwc: + * ace/QoS/qos.mpc: + * ace/RMCast/rmcast.mpc: + * ace/SSL/ssl.mpc: + * apps/apps.mwc: + * apps/gperf/src/gperf.mpc: + * apps/mkcsregdb/mkcsregdb.mpc: + * bin/create_ace_build.pl: + * bin/MakeProjectCreator/README + * bin/MakeProjectCreator/config/acedefaults.mpb: + * bin/MakeProjectCreator/config/aceexe.mpb: + * bin/MakeProjectCreator/config/acelib.mpb: + * bin/MakeProjectCreator/config/acexml.mpb: + * bin/MakeProjectCreator/config/avstreams.mpb: + * bin/MakeProjectCreator/config/avstreamsexe.mpb: + * bin/MakeProjectCreator/config/bidir_giop.mpb: + * bin/MakeProjectCreator/config/ciao_client.mpb: + * bin/MakeProjectCreator/config/ciao_component.mpb: + * bin/MakeProjectCreator/config/ciao_servant.mpb: + * bin/MakeProjectCreator/config/ciao_server.mpb: + * bin/MakeProjectCreator/config/client.mpb: + * bin/MakeProjectCreator/config/concurrency.mpb: + * bin/MakeProjectCreator/config/dslogadmin.mpb: + * bin/MakeProjectCreator/config/dynamicany.mpb: + * bin/MakeProjectCreator/config/dynamicinterface.mpb: + * bin/MakeProjectCreator/config/etcl.mpb: + * bin/MakeProjectCreator/config/event.mpb: + * bin/MakeProjectCreator/config/ftorb.mpb: + * bin/MakeProjectCreator/config/global.features + * bin/MakeProjectCreator/config/global.mpb: + * bin/MakeProjectCreator/config/ifr_client.mpb: + * bin/MakeProjectCreator/config/ifrservice.mpb: + * bin/MakeProjectCreator/config/iorinterceptor.mpb: + * bin/MakeProjectCreator/config/iormanip.mpb: + * bin/MakeProjectCreator/config/iortable.mpb: + * bin/MakeProjectCreator/config/lifecycle.mpb: + * bin/MakeProjectCreator/config/loadbalancing.mpb: + * bin/MakeProjectCreator/config/messaging.mpb: + * bin/MakeProjectCreator/config/messaging_only.mpb: + * bin/MakeProjectCreator/config/naming.mpb: + * bin/MakeProjectCreator/config/namingexe.mpb: + * bin/MakeProjectCreator/config/notification.mpb: + * bin/MakeProjectCreator/config/notify.mpb: + * bin/MakeProjectCreator/config/notifytest.mpb: + * bin/MakeProjectCreator/config/objreftemplate.mpb: + * bin/MakeProjectCreator/config/orbsvcs_output.mpb: + * bin/MakeProjectCreator/config/orbsvcsexe.mpb: + * bin/MakeProjectCreator/config/orbsvcslib.mpb: + * bin/MakeProjectCreator/config/portablegroup.mpb: + * bin/MakeProjectCreator/config/portableserver.mpb: + * bin/MakeProjectCreator/config/property.mpb: + * bin/MakeProjectCreator/config/qos.mpb: + * bin/MakeProjectCreator/config/qt_moc.mpb: + * bin/MakeProjectCreator/config/rmcast.mpb: + * bin/MakeProjectCreator/config/rt_client.mpb: + * bin/MakeProjectCreator/config/rt_server.mpb: + * bin/MakeProjectCreator/config/rtcorba.mpb: + * bin/MakeProjectCreator/config/rtcorbacommon.mpb: + * bin/MakeProjectCreator/config/rtcorbaevent.mpb: + * bin/MakeProjectCreator/config/rtevent.mpb: + * bin/MakeProjectCreator/config/rteventexe.mpb: + * bin/MakeProjectCreator/config/rtoldevent.mpb: + * bin/MakeProjectCreator/config/rtportableserver.mpb: + * bin/MakeProjectCreator/config/rtsched.mpb: + * bin/MakeProjectCreator/config/rtschedevent.mpb: + * bin/MakeProjectCreator/config/security.mpb: + * bin/MakeProjectCreator/config/server.mpb: + * bin/MakeProjectCreator/config/smart_proxies.mpb: + * bin/MakeProjectCreator/config/ssl.mpb: + * bin/MakeProjectCreator/config/strategies.mpb: + * bin/MakeProjectCreator/config/svc_utils.mpb: + * bin/MakeProjectCreator/config/tao_output.mpb: + * bin/MakeProjectCreator/config/taoclient.mpb: + * bin/MakeProjectCreator/config/taoexe.mpb: + * bin/MakeProjectCreator/config/taolib.mpb: + * bin/MakeProjectCreator/config/taolib_with_idl.mpb: + * bin/MakeProjectCreator/config/taoserver.mpb: + * bin/MakeProjectCreator/config/taoversion.mpb: + * bin/MakeProjectCreator/config/time.mpb: + * bin/MakeProjectCreator/config/trading.mpb: + * bin/MakeProjectCreator/config/typecodefactory.mpb: + * bin/MakeProjectCreator/config/valuetype.mpb: + * bin/MakeProjectCreator/modules/ProjectCreator.pm: + * bin/MakeProjectCreator/modules/TemplateParser.pm: + * bin/MakeProjectCreator/modules/VA4ProjectCreator.pm: + * bin/MakeProjectCreator/modules/VC6ProjectCreator.pm: + * bin/MakeProjectCreator/templates/bor.mpd: + * bin/MakeProjectCreator/templates/bordll.mpt: + * bin/MakeProjectCreator/templates/borexe.mpt: + * bin/MakeProjectCreator/templates/em3vcp.mpd: + * bin/MakeProjectCreator/templates/em3vcpdll.mpt: + * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt: + * bin/MakeProjectCreator/templates/em3vcplib.mpt: + * bin/MakeProjectCreator/templates/em3vcplibexe.mpt: + * bin/MakeProjectCreator/templates/gnu.mpd: + * bin/MakeProjectCreator/templates/gnudll.mpt: + * bin/MakeProjectCreator/templates/gnuexe.mpt: + * bin/MakeProjectCreator/templates/make.mpd: + * bin/MakeProjectCreator/templates/makedll.mpt: + * bin/MakeProjectCreator/templates/makeexe.mpt: + * bin/MakeProjectCreator/templates/nmake.mpd: + * bin/MakeProjectCreator/templates/nmakedll.mpt: + * bin/MakeProjectCreator/templates/nmakeexe.mpt: + * bin/MakeProjectCreator/templates/va4icc.mpd: + * bin/MakeProjectCreator/templates/va4iccdll.mpt: + * bin/MakeProjectCreator/templates/va4iccdllexe.mpt: + * bin/MakeProjectCreator/templates/va4icclib.mpt: + * bin/MakeProjectCreator/templates/va4icclibexe.mpt: + * bin/MakeProjectCreator/templates/vc6dsp.mpd: + * bin/MakeProjectCreator/templates/vc6dspdll.mpt: + * bin/MakeProjectCreator/templates/vc6dspdllexe.mpt: + * bin/MakeProjectCreator/templates/vc6dsplib.mpt: + * bin/MakeProjectCreator/templates/vc6dsplibexe.mpt: + * bin/MakeProjectCreator/templates/vc7.mpd: + * bin/MakeProjectCreator/templates/vc7dll.mpt: + * bin/MakeProjectCreator/templates/vc7exe.mpt: + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/Process_Win32.pm: + * examples/example_base.mpb: + * examples/examples.mwc: + * examples/ASX/CCM_App/ASX_CCM_App.mpc: + * examples/ASX/Message_Queue/ASX_Message_Queue.mpc: + * examples/C++NPv1/C++NPv1.mpc: + * examples/C++NPv2/C++NPv2.mpc: + * examples/ConfigViewer/ConfigViewer.mpc: + * examples/Connection/blocking/Connection_Blocking.mpc: + * examples/Connection/misc/Connection_Misc.mpc: + * examples/Connection/non_blocking/Connection_Non_Blocking.mpc: + * examples/DLL/DLL.mpc: + * examples/Export/Export.mpc: + * examples/IOStream/client/IOStream_Client.mpc: + * examples/IOStream/server/IOStream_Server.mpc: + * examples/IPC_SAP/ATM_SAP/atm_sap.mpc: + * examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc: + * examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc: + * examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc: + * examples/IPC_SAP/FILE_SAP/file_sap_client.mpc: + * examples/IPC_SAP/SOCK_SAP/sock_sap.mpc: + * examples/IPC_SAP/SPIPE_SAP/SPIPE_SAP.mpc: + * examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc: + * examples/IPC_SAP/TLI_SAP/TLI_SAP.mpc: + * examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc: + * examples/Log_Msg/Log_Msg.mpc: + * examples/Logger/Acceptor-server/Logger_Acceptor_Server.mpc: + * examples/Logger/client/Logger_client.mpc: + * examples/Logger/simple-server/Logger_Simple_Server.mpc: + * examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc: + * examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc: + * examples/Misc/Misc.mpc: + * examples/Naming/Naming.mpc: + * 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/Dgram/Reactor_Dgram.mpc: + * examples/Reactor/FIFO/Reactor_FIFO.mpc: + * examples/Reactor/Misc/Reactor_Misc.mpc: + * examples/Reactor/Multicast/Reactor_Multicast.mpc: + * examples/Reactor/Ntalker/Reactor_Ntalker.mpc: + * examples/Reactor/Proactor/Proactor.mpc: + * examples/Reactor/WFMO_Reactor/WFMO_Reactor.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: + * examples/Web_Crawler/Web_Crawler.mpc: + * performance-tests/perf.mwc: + * tests/acetest.mpb: + * tests/tests.mpc: + * tests/tests.mwc: + * tests/RMCast/tests.mpc: + * tests/SSL/tests.mpc: + + Updated MPC with the latest features and changes from OCI's repo. Created + new mpb base projects to make mpc files as simple as possible, and updated + existing mpb base projects. Added and updated mpc files to use the latest + features and make use of base projects. + Added the create_ace_build.pl script that is more MPC friendly and works + on Windows. + Removed unused nightly.mwc. + Wed Jun 25 10:20:15 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * THANKS: Added missing doc_group folks at Vanderbilt. diff --git a/Kokyu/Kokyu.mpc b/Kokyu/Kokyu.mpc index 684029092b7..d7cde5e1894 100644 --- a/Kokyu/Kokyu.mpc +++ b/Kokyu/Kokyu.mpc @@ -1,7 +1,6 @@ project : Kokyulib, core { - depends = ace sharedname = Kokyu - dllflags = KOKYU_BUILD_DLL + dynamicflags = KOKYU_BUILD_DLL libout = .. - include_dir = ace + // include_dir = $(ACE_ROOT)/ace } diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 5afa6f5fe81..45af78791d7 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,38 @@ +Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com> + + * ciao/CCM_Core.mpc: + * examples/OEP/BasicSP/BasicSP.mpc: + * examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc: + * examples/OEP/BasicSP/BMDevice/BMDevice.mpc: + * examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc: + * examples/OEP/BasicSP/EC/EC.mpc: + * examples/OEP/Display/HUDisplay.mpc: + * examples/OEP/Display/GPS/GPS.mpc: + * examples/OEP/Display/NavDisplay/NavDisplay.mpc: + * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: + * examples/OEP/Display/RateGen/RateGen.mpc: + * examples/handcrafted/BasicSP/BasicSP.mpc: + * examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc: + * examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc: + * examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc: + * examples/handcrafted/BasicSP/EC/EC.mpc: + * examples/handcrafted/Display/HUDisplay.mpc: + * examples/handcrafted/Display/GPS/GPS.mpc: + * examples/handcrafted/Display/NavDisplay/NavDisplay.mpc: + * examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc: + * examples/handcrafted/Display/RateGen/RateGen.mpc: + * examples/handcrafted/Hello/hello.mpc: + * tools/Assembly_Deployer/Assembly_Deployer.mpc: + * tools/ComponentServer/ComponentServer.mpc: + * tools/Daemon/Daemon.mpc: + * tools/ServerActivator/ServerActivator.mpc: + * tools/Simple_Component_Server/Simple_Component_Server.mpc: + * tools/XML_Helpers/XMLHelpers.mpc: + + Added and updated mpc files to use the latest + features and make use of base projects. + + Tue Jun 24 15:42:46 2003 Nanbor Wang <nanbor@cs.wustl.edu> * bin/generate_component_mpc.pl: Updated mpc file generator to diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc index e9fc227a679..09b97d6f03d 100644 --- a/TAO/CIAO/ciao/CCM_Core.mpc +++ b/TAO/CIAO/ciao/CCM_Core.mpc @@ -1,10 +1,7 @@ -project (CIAO_Client) : taolib_with_idl { - depends += IFR_Client +project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client { sharedname = CIAO_Client - libs += TAO TAO_IFR_Client TAO_Valuetype - idlflags += -I $(TAO_ROOT) -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" - dllflags = CIAO_CLIENT_BUILD_DLL - libpaths += $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao/Valuetype + idlflags += -I $(TAO_ROOT) -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export + dynamicflags = CIAO_CLIENT_BUILD_DLL IDL_Files { CCM_Base.idl @@ -22,14 +19,12 @@ project (CIAO_Client) : taolib_with_idl { } } -project (CIAO_Container) : taolib_with_idl { - depends += CIAO_Client PortableServer Security +project (CIAO_Container) : orbsvcslib, portableserver, security, iorinterceptor, objreftemplate, valuetype { + after += CIAO_Client sharedname = CIAO_Container - libs += TAO TAO_PortableServer TAO_IORInterceptor TAO_ObjRefTemplate TAO_Valuetype TAO_IFR_Client TAO_Security CIAO_Client - idlflags += -I $(TAO_ROOT) -I $(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Container_Export.h -Wb,export_macro=CIAO_CONTAINER_Export -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" - dllflags = CIAO_CONTAINER_BUILD_DLL - includes += $(TAO_ROOT)/orbsvcs/orbsvcs - libpaths += $(TAO_ROOT)/tao/PortableServer $(TAO_ROOT)/tao/IORInterceptor $(TAO_ROOT)/tao/ObjRefTemplate $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao/Valuetype $(TAO_ROOT)/orbsvcs/orbsvcs + libs += CIAO_Client + idlflags += -Wb,export_include=CIAO_Container_Export.h -Wb,export_macro=CIAO_CONTAINER_Export + dynamicflags = CIAO_CONTAINER_BUILD_DLL IDL_Files { CCM_Transaction.idl @@ -50,15 +45,13 @@ project (CIAO_Container) : taolib_with_idl { } } -project (CIAO_Server) :taolib_with_idl { - depends += CIAO_Container +project (CIAO_Server) : orbsvcslib, portableserver, iorinterceptor, objreftemplate, valuetype, ifr_client, security { + after += CIAO_Container sharedname = CIAO_Server - libs += TAO TAO_PortableServer TAO_IORInterceptor TAO_ObjRefTemplate TAO_Valuetype TAO_IFR_Client TAO_Security CIAO_Client - idlflags += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" + libs += CIAO_Client + idlflags += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export - dllflags = CIAO_SERVER_BUILD_DLL - includes += $(TAO_ROOT)/orbsvcs/orbsvcs - libpaths += $(TAO_ROOT)/tao/PortableServer $(TAO_ROOT)/tao/IORInterceptor $(TAO_ROOT)/tao/ObjRefTemplate $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao/Valuetype $(TAO_ROOT)/orbsvcs/orbsvcs + dynamicflags = CIAO_SERVER_BUILD_DLL IDL_Files { CCM_Deployment.idl diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc index 98b463d5cba..014268adf82 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc +++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc @@ -3,10 +3,10 @@ // This file has been manually modified to add a second component implementation. project(BMClosedED_stub): ciao_client { - depends += BasicSP_stub + after += BasicSP_stub sharedname = BMClosedED_stub idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h - dllflags = BMCLOSEDED_STUB_BUILD_DLL + dynamicflags = BMCLOSEDED_STUB_BUILD_DLL IDL_Files { BMClosedED.idl @@ -18,12 +18,12 @@ project(BMClosedED_stub): ciao_client { } project(BMClosedED_svnt) : ciao_servant { - depends += BasicSP_svnt BMClosedED_stub + after += BasicSP_svnt BMClosedED_stub sharedname = BMClosedED_svnt libs += BMClosedED_stub BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMCLOSEDED_SVNT_Export -Wb,export_include=BMClosedED_svnt_export.h - dllflags = BMCLOSEDED_SVNT_BUILD_DLL + dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL CIDL_Files { BMClosedED.cidl @@ -42,12 +42,12 @@ project(BMClosedED_svnt) : ciao_servant { project(BMClosedED_exec) : ciao_component { - depends += BMClosedED_svnt + after += BMClosedED_svnt sharedname = BMClosedED_exec libs += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMCLOSEDED_EXEC_Export -Wb,export_include=BMClosedED_exec_export.h - dllflags = BMCLOSEDED_EXEC_BUILD_DLL + dynamicflags = BMCLOSEDED_EXEC_BUILD_DLL IDL_Files { BMClosedEDEI.idl @@ -58,3 +58,4 @@ project(BMClosedED_exec) : ciao_component { BMClosedED_exec.cpp } } + diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc index 83530e093cd..2c618860cb9 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc +++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc @@ -1,13 +1,13 @@ // $Id$ project(BMDevice_stub): ciao_client { - depends += BasicSP_stub + after += BasicSP_stub sharedname = BMDevice_stub idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h libpaths += .. libs += BasicSP_stub - dllflags = BMDEVICE_STUB_BUILD_DLL + dynamicflags = BMDEVICE_STUB_BUILD_DLL IDL_Files { BMDevice.idl @@ -19,12 +19,12 @@ project(BMDevice_stub): ciao_client { } project(BMDevice_svnt) : ciao_servant { - depends += BMDevice_stub BasicSP_stub + after += BMDevice_stub BasicSP_stub sharedname = BMDevice_svnt libs += BMDevice_stub BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMDEVICE_SVNT_Export -Wb,export_include=BMDevice_svnt_export.h - dllflags = BMDEVICE_SVNT_BUILD_DLL + dynamicflags = BMDEVICE_SVNT_BUILD_DLL CIDL_Files { BMDevice.cidl @@ -43,12 +43,12 @@ project(BMDevice_svnt) : ciao_servant { project(BMDevice_exec) : ciao_component { - depends += BMDevice_svnt + after += BMDevice_svnt sharedname = BMDevice_exec libs += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMDEVICE_EXEC_Export -Wb,export_include=BMDevice_exec_export.h - dllflags = BMDEVICE_EXEC_BUILD_DLL + dynamicflags = BMDEVICE_EXEC_BUILD_DLL IDL_Files { BMDeviceEI.idl @@ -61,3 +61,4 @@ project(BMDevice_exec) : ciao_component { BMDevice_exec.cpp } } + diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc index 5ba78a1c5a9..5c0a113b9c8 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc +++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc @@ -2,10 +2,10 @@ // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay" project(BMDisplay_stub): ciao_client { - depends += BasicSP_stub + after += BasicSP_stub sharedname = BMDisplay_stub idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h - dllflags = BMDISPLAY_STUB_BUILD_DLL + dynamicflags = BMDISPLAY_STUB_BUILD_DLL IDL_Files { BMDisplay.idl @@ -17,12 +17,12 @@ project(BMDisplay_stub): ciao_client { } project(BMDisplay_svnt) : ciao_servant { - depends += BasicSP_svnt BMDisplay_stub + after += BasicSP_svnt BMDisplay_stub sharedname = BMDisplay_svnt libs += BMDisplay_stub BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMDISPLAY_SVNT_Export -Wb,export_include=BMDisplay_svnt_export.h - dllflags = BMDISPLAY_SVNT_BUILD_DLL + dynamicflags = BMDISPLAY_SVNT_BUILD_DLL CIDL_Files { BMDisplay.cidl @@ -41,12 +41,12 @@ project(BMDisplay_svnt) : ciao_servant { project(BMDisplay_exec) : ciao_component { - depends += BMDisplay_svnt + after += BMDisplay_svnt sharedname = BMDisplay_exec libs += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMDISPLAY_EXEC_Export -Wb,export_include=BMDisplay_exec_export.h - dllflags = BMDISPLAY_EXEC_BUILD_DLL + dynamicflags = BMDISPLAY_EXEC_BUILD_DLL IDL_Files { BMDisplayEI.idl @@ -57,3 +57,4 @@ project(BMDisplay_exec) : ciao_component { BMDisplay_exec.cpp } } + diff --git a/TAO/CIAO/examples/OEP/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/OEP/BasicSP/BasicSP.mpc index 55ef64d4575..f58c9efe005 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/BasicSP.mpc +++ b/TAO/CIAO/examples/OEP/BasicSP/BasicSP.mpc @@ -5,7 +5,7 @@ project(BasicSP_stub): ciao_client { sharedname = BasicSP_stub idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h - dllflags = BASICSP_STUB_BUILD_DLL + dynamicflags = BASICSP_STUB_BUILD_DLL IDL_Files { BasicSP.idl @@ -17,12 +17,12 @@ project(BasicSP_stub): ciao_client { } project(BasicSP_svnt) : ciao_server { - depends += BasicSP_stub + after += BasicSP_stub sharedname = BasicSP_svnt libs += BasicSP_stub idlflags += -Wb,export_macro=BASICSP_SVNT_Export -Wb,export_include=BasicSP_svnt_export.h - dllflags = BASICSP_SVNT_BUILD_DLL + dynamicflags = BASICSP_SVNT_BUILD_DLL Source_Files { BasicSPS.cpp diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc index 4e04ee473f5..b5d7a251536 100644 --- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc +++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc @@ -2,10 +2,10 @@ // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i -c EC" project(EC_stub): ciao_client { - depends += BasicSP_stub + after += BasicSP_stub sharedname = EC_stub idlflags += -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h - dllflags = EC_STUB_BUILD_DLL + dynamicflags = EC_STUB_BUILD_DLL IDL_Files { EC.idl @@ -17,12 +17,12 @@ project(EC_stub): ciao_client { } project(EC_svnt) : ciao_servant { - depends += BasicSP_svnt EC_stub + after += BasicSP_svnt EC_stub sharedname = EC_svnt - libs += EC_stub BasicSP_stub BasicSP_svnt TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + libs += EC_stub BasicSP_stub BasicSP_svnt + libpaths += .. idlflags += -Wb,export_macro=EC_SVNT_Export -Wb,export_include=EC_svnt_export.h - dllflags = EC_SVNT_BUILD_DLL + dynamicflags = EC_SVNT_BUILD_DLL CIDL_Files { EC.cidl @@ -41,12 +41,12 @@ project(EC_svnt) : ciao_servant { project(EC_exec) : ciao_component { - depends += EC_svnt + after += EC_svnt sharedname = EC_exec libs += EC_stub BasicSP_stub EC_svnt libpaths += .. idlflags += -Wb,export_macro=EC_EXEC_Export -Wb,export_include=EC_exec_export.h - dllflags = EC_EXEC_BUILD_DLL + dynamicflags = EC_EXEC_BUILD_DLL IDL_Files { ECEI.idl @@ -60,11 +60,11 @@ project(EC_exec) : ciao_component { -project (EC_client) : ciao_client { +project (EC_client) : ciao_client, valuetype { exename = client - depends += EC_stub - libs += EC_stub BasicSP_stub TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + after += EC_stub + libs += EC_stub BasicSP_stub + libpaths += .. IDL_Files { } @@ -75,11 +75,11 @@ project (EC_client) : ciao_client { } -project (EC_controller) : ciao_client { +project (EC_controller) : ciao_client, valuetype { exename = controller - depends += EC_stub - libs += EC_stub BasicSP_stub TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + after += EC_stub + libs += EC_stub BasicSP_stub + libpaths += .. IDL_Files { } @@ -88,3 +88,4 @@ project (EC_controller) : ciao_client { controller.cpp } } + diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc b/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc index b925fd1fbd0..635fb423371 100644 --- a/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc +++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc @@ -3,10 +3,10 @@ // This file has been manually modified to add a second component implementation. project(GPS_stub): ciao_client { - depends += HUDisplay_stub + after += HUDisplay_stub sharedname = GPS_stub idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h - dllflags = GPS_STUB_BUILD_DLL + dynamicflags = GPS_STUB_BUILD_DLL IDL_Files { GPS.idl @@ -18,12 +18,12 @@ project(GPS_stub): ciao_client { } project(GPS_svnt) : ciao_servant { - depends += HUDisplay_svnt GPS_stub + after += HUDisplay_svnt GPS_stub sharedname = GPS_svnt libs += GPS_stub HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h - dllflags = GPS_SVNT_BUILD_DLL + dynamicflags = GPS_SVNT_BUILD_DLL CIDL_Files { GPS.cidl @@ -42,12 +42,12 @@ project(GPS_svnt) : ciao_servant { project(GPS_exec) : ciao_component { - depends += GPS_svnt + after += GPS_svnt sharedname = GPS_exec libs += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h - dllflags = GPS_EXEC_BUILD_DLL + dynamicflags = GPS_EXEC_BUILD_DLL IDL_Files { GPSEI.idl @@ -60,12 +60,12 @@ project(GPS_exec) : ciao_component { } project(GPS_tracing_exec) : ciao_component { - depends += GPS_svnt + after += GPS_svnt sharedname = GPS_tracing_exec libs += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h - dllflags = GPS_EXEC_BUILD_DLL + dynamicflags = GPS_EXEC_BUILD_DLL IDL_Files { GPSEI.idl diff --git a/TAO/CIAO/examples/OEP/Display/HUDisplay.mpc b/TAO/CIAO/examples/OEP/Display/HUDisplay.mpc index 74520a752bd..03edf2dff7d 100644 --- a/TAO/CIAO/examples/OEP/Display/HUDisplay.mpc +++ b/TAO/CIAO/examples/OEP/Display/HUDisplay.mpc @@ -6,7 +6,7 @@ project(HUDisplay_stub): ciao_client { sharedname = HUDisplay_stub idlflags += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h - dllflags = HUDISPLAY_STUB_BUILD_DLL + dynamicflags = HUDISPLAY_STUB_BUILD_DLL IDL_Files { HUDisplay.idl @@ -18,12 +18,12 @@ project(HUDisplay_stub): ciao_client { } project(HUDisplay_svnt) : ciao_server { - depends += HUDisplay_stub + after += HUDisplay_stub sharedname = HUDisplay_svnt libs += HUDisplay_stub idlflags += -Wb,export_macro=HUDISPLAY_SVNT_Export -Wb,export_include=HUDisplay_svnt_export.h - dllflags = HUDISPLAY_SVNT_BUILD_DLL + dynamicflags = HUDISPLAY_SVNT_BUILD_DLL Source_Files { HUDisplayS.cpp diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc index e194985a2fb..4123dcdb27a 100644 --- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc +++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc @@ -2,10 +2,10 @@ // This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i NavDisplay" project(NavDisplay_stub): ciao_client { - depends += HUDisplay_stub + after += HUDisplay_stub sharedname = NavDisplay_stub idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h - dllflags = NAVDISPLAY_STUB_BUILD_DLL + dynamicflags = NAVDISPLAY_STUB_BUILD_DLL IDL_Files { NavDisplay.idl @@ -17,12 +17,12 @@ project(NavDisplay_stub): ciao_client { } project(NavDisplay_svnt) : ciao_servant { - depends += HUDisplay_svnt NavDisplay_stub + after += HUDisplay_svnt NavDisplay_stub sharedname = NavDisplay_svnt libs += NavDisplay_stub HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h - dllflags = NAVDISPLAY_SVNT_BUILD_DLL + dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL CIDL_Files { NavDisplay.cidl @@ -41,12 +41,12 @@ project(NavDisplay_svnt) : ciao_servant { project(NavDisplay_exec) : ciao_component { - depends += NavDisplay_svnt + after += NavDisplay_svnt sharedname = NavDisplay_exec libs += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h - dllflags = NAVDISPLAY_EXEC_BUILD_DLL + dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL IDL_Files { NavDisplayEI.idl diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc index b3caa4b62e0..b0c2aa77632 100644 --- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc +++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc @@ -1,12 +1,11 @@ // $Id$ project(NavDisplayGUI_exec) : ciao_component, qt_moc { - depends += NavDisplay_exec + after += NavDisplay_exec sharedname = NavDisplayGUI_exec libs += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt - libpaths += .. ../NavDisplay $(QTDIR)/lib - dllflags = NAVDISPLAY_EXEC_BUILD_DLL QT_DLL - macros += QT_THREAD_SUPPORT - includes += ../NavDisplay $(QTDIR)/include + libpaths += .. ../NavDisplay + dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL QT_DLL + includes += ../NavDisplay idlflags += -I ../NavDisplay -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h idlgendir = ./ diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc index c9aec0f7d78..cfe7fc7e2a3 100644 --- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc +++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc @@ -2,10 +2,10 @@ // This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i -c RateGen" project(RateGen_stub): ciao_client { - depends += HUDisplay_stub + after += HUDisplay_stub sharedname = RateGen_stub idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h - dllflags = RATEGEN_STUB_BUILD_DLL + dynamicflags = RATEGEN_STUB_BUILD_DLL IDL_Files { RateGen.idl @@ -17,12 +17,12 @@ project(RateGen_stub): ciao_client { } project(RateGen_svnt) : ciao_servant { - depends += HUDisplay_svnt RateGen_stub + after += HUDisplay_svnt RateGen_stub sharedname = RateGen_svnt - libs += RateGen_stub HUDisplay_stub HUDisplay_svnt TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + libs += RateGen_stub HUDisplay_stub HUDisplay_svnt + libpaths += .. idlflags += -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h - dllflags = RATEGEN_SVNT_BUILD_DLL + dynamicflags = RATEGEN_SVNT_BUILD_DLL CIDL_Files { RateGen.cidl @@ -41,12 +41,12 @@ project(RateGen_svnt) : ciao_servant { project(RateGen_exec) : ciao_component { - depends += RateGen_svnt + after += RateGen_svnt sharedname = RateGen_exec libs += RateGen_stub HUDisplay_stub RateGen_svnt libpaths += .. idlflags += -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h - dllflags = RATEGEN_EXEC_BUILD_DLL + dynamicflags = RATEGEN_EXEC_BUILD_DLL IDL_Files { RateGenEI.idl @@ -60,11 +60,11 @@ project(RateGen_exec) : ciao_component { -project (RateGen_client) : ciao_client { +project (RateGen_client) : ciao_client, valuetype { exename = client - depends += RateGen_stub - libs += RateGen_stub HUDisplay_stub TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + after += RateGen_stub + libs += RateGen_stub HUDisplay_stub + libpaths += .. IDL_Files { } @@ -75,11 +75,11 @@ project (RateGen_client) : ciao_client { } -project (RateGen_controller) : ciao_client { +project (RateGen_controller) : ciao_client, valuetype { exename = controller - depends += RateGen_stub - libs += RateGen_stub HUDisplay_stub TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + after += RateGen_stub + libs += RateGen_stub HUDisplay_stub + libpaths += .. IDL_Files { } diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc index 333aa082f6a..ed57e040120 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc @@ -3,10 +3,10 @@ // This file has been manually modified to add a second component implementation. project(BMClosedED_stub): ciao_client { - depends += BasicSP_stub + after += BasicSP_stub sharedname = BMClosedED_stub idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h - dllflags = BMCLOSEDED_STUB_BUILD_DLL + dynamicflags = BMCLOSEDED_STUB_BUILD_DLL IDL_Files { BMClosedED.idl @@ -18,12 +18,12 @@ project(BMClosedED_stub): ciao_client { } project(BMClosedED_svnt) : ciao_servant { - depends += BasicSP_svnt BMClosedED_stub + after += BasicSP_svnt BMClosedED_stub sharedname = BMClosedED_svnt libs += BMClosedED_stub BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMCLOSEDED_SVNT_Export -Wb,export_include=BMClosedED_svnt_export.h - dllflags = BMCLOSEDED_SVNT_BUILD_DLL + dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL CIDL_Files { // CIDL files are not used in handcrafted examples. @@ -42,12 +42,12 @@ project(BMClosedED_svnt) : ciao_servant { project(BMClosedED_exec) : ciao_component { - depends += BMClosedED_svnt + after += BMClosedED_svnt sharedname = BMClosedED_exec libs += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMCLOSEDED_EXEC_Export -Wb,export_include=BMClosedED_exec_export.h - dllflags = BMCLOSEDED_EXEC_BUILD_DLL + dynamicflags = BMCLOSEDED_EXEC_BUILD_DLL IDL_Files { BMClosedEDEI.idl diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc index 4e56fa1735a..b140f0da752 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc @@ -1,13 +1,13 @@ // $Id$ project(BMDevice_stub): ciao_client { - depends += BasicSP_stub + after += BasicSP_stub sharedname = BMDevice_stub idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h libpaths += .. libs += BasicSP_stub - dllflags = BMDEVICE_STUB_BUILD_DLL + dynamicflags = BMDEVICE_STUB_BUILD_DLL IDL_Files { BMDevice.idl @@ -19,12 +19,12 @@ project(BMDevice_stub): ciao_client { } project(BMDevice_svnt) : ciao_servant { - depends += BMDevice_stub BasicSP_stub + after += BMDevice_stub BasicSP_stub sharedname = BMDevice_svnt libs += BMDevice_stub BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMDEVICE_SVNT_Export -Wb,export_include=BMDevice_svnt_export.h - dllflags = BMDEVICE_SVNT_BUILD_DLL + dynamicflags = BMDEVICE_SVNT_BUILD_DLL CIDL_Files { // CIDL files are not used in handcrafted examples. @@ -43,12 +43,12 @@ project(BMDevice_svnt) : ciao_servant { project(BMDevice_exec) : ciao_component { - depends += BMDevice_svnt + after += BMDevice_svnt sharedname = BMDevice_exec libs += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMDEVICE_EXEC_Export -Wb,export_include=BMDevice_exec_export.h - dllflags = BMDEVICE_EXEC_BUILD_DLL + dynamicflags = BMDEVICE_EXEC_BUILD_DLL IDL_Files { BMDeviceEI.idl diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc index 1f5c2fb83f8..ceef8347541 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc @@ -2,10 +2,10 @@ // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay" project(BMDisplay_stub): ciao_client { - depends += BasicSP_stub + after += BasicSP_stub sharedname = BMDisplay_stub idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h - dllflags = BMDISPLAY_STUB_BUILD_DLL + dynamicflags = BMDISPLAY_STUB_BUILD_DLL IDL_Files { BMDisplay.idl @@ -17,12 +17,12 @@ project(BMDisplay_stub): ciao_client { } project(BMDisplay_svnt) : ciao_servant { - depends += BasicSP_svnt BMDisplay_stub + after += BasicSP_svnt BMDisplay_stub sharedname = BMDisplay_svnt libs += BMDisplay_stub BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMDISPLAY_SVNT_Export -Wb,export_include=BMDisplay_svnt_export.h - dllflags = BMDISPLAY_SVNT_BUILD_DLL + dynamicflags = BMDISPLAY_SVNT_BUILD_DLL CIDL_Files { // CIDL files are not used in handcrafted examples. @@ -41,12 +41,12 @@ project(BMDisplay_svnt) : ciao_servant { project(BMDisplay_exec) : ciao_component { - depends += BMDisplay_svnt + after += BMDisplay_svnt sharedname = BMDisplay_exec libs += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=BMDISPLAY_EXEC_Export -Wb,export_include=BMDisplay_exec_export.h - dllflags = BMDISPLAY_EXEC_BUILD_DLL + dynamicflags = BMDISPLAY_EXEC_BUILD_DLL IDL_Files { BMDisplayEI.idl diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc index 140a63e401c..301ef3eb1a6 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc @@ -5,7 +5,7 @@ project(BasicSP_stub): ciao_client { sharedname = BasicSP_stub idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h - dllflags = BASICSP_STUB_BUILD_DLL + dynamicflags = BASICSP_STUB_BUILD_DLL IDL_Files { BasicSP.idl @@ -17,12 +17,12 @@ project(BasicSP_stub): ciao_client { } project(BasicSP_svnt) : ciao_servant { - depends += BasicSP_stub + after += BasicSP_stub sharedname = BasicSP_svnt libs += BasicSP_stub idlflags += -Wb,export_macro=BASICSP_SVNT_Export -Wb,export_include=BasicSP_svnt_export.h - dllflags = BASICSP_SVNT_BUILD_DLL + dynamicflags = BASICSP_SVNT_BUILD_DLL IDL_Files { BasicSPE.idl diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.mpc index 58f2fe3c271..894491c9600 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.mpc +++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.mpc @@ -2,10 +2,10 @@ // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i -c EC" project(EC_stub): ciao_client { - depends += BasicSP_stub + after += BasicSP_stub sharedname = EC_stub idlflags += -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h - dllflags = EC_STUB_BUILD_DLL + dynamicflags = EC_STUB_BUILD_DLL IDL_Files { EC.idl @@ -16,13 +16,13 @@ project(EC_stub): ciao_client { } } -project(EC_svnt) : ciao_server { - depends += BasicSP_svnt EC_stub +project(EC_svnt) : ciao_server, valuetype { + after += BasicSP_svnt EC_stub sharedname = EC_svnt - libs += EC_stub BasicSP_stub BasicSP_svnt TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + libs += EC_stub BasicSP_stub BasicSP_svnt + libpaths += .. idlflags += -Wb,export_macro=EC_SVNT_Export -Wb,export_include=EC_svnt_export.h - dllflags = EC_SVNT_BUILD_DLL + dynamicflags = EC_SVNT_BUILD_DLL IDL_Files { ECE.idl @@ -37,12 +37,12 @@ project(EC_svnt) : ciao_server { project(EC_exec) : ciao_server { - depends += EC_svnt + after += EC_svnt sharedname = EC_exec libs += EC_stub BasicSP_stub EC_svnt libpaths += .. idlflags += -Wb,export_macro=EC_EXEC_Export -Wb,export_include=EC_exec_export.h - dllflags = EC_EXEC_BUILD_DLL + dynamicflags = EC_EXEC_BUILD_DLL IDL_Files { ECEI.idl @@ -56,11 +56,11 @@ project(EC_exec) : ciao_server { -project (EC_client) : ciao_client { +project (EC_client) : ciao_client, valuetype { exename = client - depends += EC_stub - libs += EC_stub BasicSP_stub TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + after += EC_stub + libs += EC_stub BasicSP_stub + libpaths += .. IDL_Files { } @@ -71,11 +71,11 @@ project (EC_client) : ciao_client { } -project (controller) : ciao_client { +project (controller) : ciao_client, valuetype { exename = controller - depends += EC_stub - libs += EC_stub BasicSP_stub TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + after += EC_stub + libs += EC_stub BasicSP_stub + libpaths += .. IDL_Files { } diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc index 0a59c4cb021..16138dfa87f 100644 --- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc +++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc @@ -3,10 +3,10 @@ // This file has been manually modified to add a second component implementation. project(GPS_stub): ciao_client { - depends += HUDisplay_stub + after += HUDisplay_stub sharedname = GPS_stub idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h - dllflags = GPS_STUB_BUILD_DLL + dynamicflags = GPS_STUB_BUILD_DLL IDL_Files { GPS.idl @@ -18,12 +18,12 @@ project(GPS_stub): ciao_client { } project(GPS_svnt) : ciao_servant { - depends += HUDisplay_svnt GPS_stub + after += HUDisplay_svnt GPS_stub sharedname = GPS_svnt libs += GPS_stub HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h - dllflags = GPS_SVNT_BUILD_DLL + dynamicflags = GPS_SVNT_BUILD_DLL CIDL_Files { // CIDL files are not used in handcrafted examples. @@ -42,12 +42,12 @@ project(GPS_svnt) : ciao_servant { project(GPS_exec) : ciao_component { - depends += GPS_svnt + after += GPS_svnt sharedname = GPS_exec libs += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h - dllflags = GPS_EXEC_BUILD_DLL + dynamicflags = GPS_EXEC_BUILD_DLL IDL_Files { GPSEI.idl @@ -60,12 +60,12 @@ project(GPS_exec) : ciao_component { } project(GPS_tracing_exec) : ciao_component { - depends += GPS_svnt + after += GPS_svnt sharedname = GPS_tracing_exec libs += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h - dllflags = GPS_EXEC_BUILD_DLL + dynamicflags = GPS_EXEC_BUILD_DLL IDL_Files { GPSEI.idl diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc index c4b896ee1a8..698fc4337e5 100644 --- a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc +++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc @@ -5,7 +5,7 @@ project(HUDisplay_stub): ciao_client { sharedname = HUDisplay_stub idlflags += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h - dllflags = HUDISPLAY_STUB_BUILD_DLL + dynamicflags = HUDISPLAY_STUB_BUILD_DLL IDL_Files { HUDisplay.idl @@ -17,12 +17,12 @@ project(HUDisplay_stub): ciao_client { } project(HUDisplay_svnt) : ciao_servant { - depends += HUDisplay_stub + after += HUDisplay_stub sharedname = HUDisplay_svnt libs += HUDisplay_stub idlflags += -Wb,export_macro=HUDISPLAY_SVNT_Export -Wb,export_include=HUDisplay_svnt_export.h - dllflags = HUDISPLAY_SVNT_BUILD_DLL + dynamicflags = HUDISPLAY_SVNT_BUILD_DLL IDL_Files { HUDisplayE.idl diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc index 11e3f540ee8..4c4069160ea 100644 --- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc +++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc @@ -2,10 +2,10 @@ // This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i NavDisplay" project(NavDisplay_stub): ciao_client { - depends += HUDisplay_stub + after += HUDisplay_stub sharedname = NavDisplay_stub idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h - dllflags = NAVDISPLAY_STUB_BUILD_DLL + dynamicflags = NAVDISPLAY_STUB_BUILD_DLL IDL_Files { NavDisplay.idl @@ -17,12 +17,12 @@ project(NavDisplay_stub): ciao_client { } project(NavDisplay_svnt) : ciao_servant { - depends += HUDisplay_svnt NavDisplay_stub + after += HUDisplay_svnt NavDisplay_stub sharedname = NavDisplay_svnt libs += NavDisplay_stub HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h - dllflags = NAVDISPLAY_SVNT_BUILD_DLL + dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL CIDL_Files { // CIDL files are not used in handcrafted examples. @@ -41,12 +41,12 @@ project(NavDisplay_svnt) : ciao_servant { project(NavDisplay_exec) : ciao_component { - depends += NavDisplay_svnt + after += NavDisplay_svnt sharedname = NavDisplay_exec libs += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt libpaths += .. idlflags += -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h - dllflags = NAVDISPLAY_EXEC_BUILD_DLL + dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL IDL_Files { NavDisplayEI.idl diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc index b3caa4b62e0..b0c2aa77632 100644 --- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc +++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc @@ -1,12 +1,11 @@ // $Id$ project(NavDisplayGUI_exec) : ciao_component, qt_moc { - depends += NavDisplay_exec + after += NavDisplay_exec sharedname = NavDisplayGUI_exec libs += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt - libpaths += .. ../NavDisplay $(QTDIR)/lib - dllflags = NAVDISPLAY_EXEC_BUILD_DLL QT_DLL - macros += QT_THREAD_SUPPORT - includes += ../NavDisplay $(QTDIR)/include + libpaths += .. ../NavDisplay + dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL QT_DLL + includes += ../NavDisplay idlflags += -I ../NavDisplay -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h idlgendir = ./ diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc index 8417496533d..102e244c1cc 100644 --- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc +++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc @@ -2,10 +2,10 @@ // This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i -c RateGen" project(RateGen_stub): ciao_client { - depends += HUDisplay_stub + after += HUDisplay_stub sharedname = RateGen_stub idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h - dllflags = RATEGEN_STUB_BUILD_DLL + dynamicflags = RATEGEN_STUB_BUILD_DLL IDL_Files { RateGen.idl @@ -16,13 +16,13 @@ project(RateGen_stub): ciao_client { } } -project(RateGen_svnt) : ciao_servant { - depends += HUDisplay_svnt RateGen_stub +project(RateGen_svnt) : ciao_servant, valuetype { + after += HUDisplay_svnt RateGen_stub sharedname = RateGen_svnt - libs += RateGen_stub HUDisplay_stub HUDisplay_svnt TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + libs += RateGen_stub HUDisplay_stub HUDisplay_svnt + libpaths += .. idlflags += -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h - dllflags = RATEGEN_SVNT_BUILD_DLL + dynamicflags = RATEGEN_SVNT_BUILD_DLL CIDL_Files { // CIDL files are not used in handcrafted examples. @@ -41,12 +41,12 @@ project(RateGen_svnt) : ciao_servant { project(RateGen_exec) : ciao_component { - depends += RateGen_svnt + after += RateGen_svnt sharedname = RateGen_exec libs += RateGen_stub HUDisplay_stub RateGen_svnt libpaths += .. idlflags += -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h - dllflags = RATEGEN_EXEC_BUILD_DLL + dynamicflags = RATEGEN_EXEC_BUILD_DLL IDL_Files { RateGenEI.idl @@ -60,11 +60,11 @@ project(RateGen_exec) : ciao_component { -project (RateGen_client) : ciao_client { +project (RateGen_client) : ciao_client, valuetype { exename = client - depends += RateGen_stub - libs += RateGen_stub HUDisplay_stub TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + after += RateGen_stub + libs += RateGen_stub HUDisplay_stub + libpaths += .. IDL_Files { } @@ -75,11 +75,11 @@ project (RateGen_client) : ciao_client { } -project (controller) : ciao_client { +project (controller) : ciao_client, valuetype { exename = controller - depends += RateGen_stub - libs += RateGen_stub HUDisplay_stub TAO_Valuetype - libpaths += .. $(TAO_ROOT)/tao/Valuetype + after += RateGen_stub + libs += RateGen_stub HUDisplay_stub + libpaths += .. IDL_Files { } @@ -88,3 +88,4 @@ project (controller) : ciao_client { controller.cpp } } + diff --git a/TAO/CIAO/examples/handcrafted/Hello/hello.mpc b/TAO/CIAO/examples/handcrafted/Hello/hello.mpc index 5b8774c52ed..e83742c1fb2 100644 --- a/TAO/CIAO/examples/handcrafted/Hello/hello.mpc +++ b/TAO/CIAO/examples/handcrafted/Hello/hello.mpc @@ -3,7 +3,7 @@ project(hello_stub): ciao_client { idlflags += -I ../../.. -I ../../../.. -I ../../../../orbsvcs/orbsvcs idlflags += -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" idlflags += -Wb,stub_export_macro=HELLO_STUB_Export -Wb,stub_export_include=hello_stub_export.h -Wb,skel_export_macro=HELLO_SERVANT_Export -Wb,skel_export_include=hello_servants_export.h - dllflags = HELLO_STUB_BUILD_DLL + dynamicflags = HELLO_STUB_BUILD_DLL IDL_Files { hello.idl @@ -15,11 +15,11 @@ project(hello_stub): ciao_client { } project(hello_servants) : ciao_servant { - depends += hello_stub + after += hello_stub sharedname = hello_servants libs += hello_stub - idlflags += -I ../../.. -I ../../../.. -I ../../../../orbsvcs/orbsvcs -Wb,export_macro=HELLO_SERVANT_Export -Wb,export_include=hello_servants_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" - dllflags = HELLO_SERVANT_BUILD_DLL + idlflags += -I ../../.. -I ../../../.. -I ../../../../orbsvcs/orbsvcs -Wb,export_macro=HELLO_SERVANT_Export -Wb,export_include=hello_servants_export.h + dynamicflags = HELLO_SERVANT_BUILD_DLL CIDL_Files { // CIDL files are not used in handcrafted examples. @@ -37,10 +37,10 @@ project(hello_servants) : ciao_servant { } project(hello_executors) : ciao_component { - depends += hello_servants + after += hello_servants sharedname = hello_executors libs += hello_stub hello_servants - dllflags = HELLO_EXECUTOR_BUILD_DLL + dynamicflags = HELLO_EXECUTOR_BUILD_DLL IDL_Files { } @@ -52,7 +52,7 @@ project(hello_executors) : ciao_component { project (client) : ciao_client { exename = client - depends += hello_stub + after += hello_stub libs += hello_stub IDL_Files { @@ -66,7 +66,7 @@ project (client) : ciao_client { // Client for interacting with the Simple_Component_Server project (simple_client) : ciao_client { libpaths += $(CIAO_ROOT)/tools/Simple_Component_Server - depends += hello_stub Simple_Server_Stbu + after += hello_stub Simple_Server_Stbu libpaths += $(CIAO_ROOT)/tools/Simple_Component_Server libs += hello_stub CIAO_Simple_Server_Stub exename = simple_client diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc index 3258f89bfe8..1249f2429f4 100644 --- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc +++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.mpc @@ -1,8 +1,8 @@ -project(Assembly_Manager): ciao_server, acexml { +project(Assembly_Manager): ciao_server, acexml, iortable { - libs += TAO_IORTable CIAO_XML_Helpers - libpaths += $(TAO_ROOT)/tao/IORTable ../XML_Helpers - depends += XML_Helpers + libs += CIAO_XML_Helpers + libpaths += ../XML_Helpers + after += XML_Helpers Source_Files { Assembly_ServiceC.cpp diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc b/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc index a87efd1e32e..85bf8876504 100644 --- a/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc +++ b/TAO/CIAO/tools/ComponentServer/ComponentServer.mpc @@ -1,10 +1,6 @@ // $Id$ -project(ComponentServer): ciao_server { - - libs += TAO_IORTable - libpaths += $(TAO_ROOT)/tao/IORTable - +project(ComponentServer): ciao_server, iortable { Source_Files { ComponentServer.cpp } diff --git a/TAO/CIAO/tools/Daemon/Daemon.mpc b/TAO/CIAO/tools/Daemon/Daemon.mpc index 1b6d2ceb0ca..e90eb7c982d 100644 --- a/TAO/CIAO/tools/Daemon/Daemon.mpc +++ b/TAO/CIAO/tools/Daemon/Daemon.mpc @@ -1,8 +1,4 @@ -project(CIAO_Daemon): ciao_server { - - libs += TAO_IORTable - libpaths += $(TAO_ROOT)/tao/IORTable - +project(CIAO_Daemon): ciao_server, iortable { IDL_Files { Daemon.idl } @@ -19,7 +15,7 @@ project(DaemonController) : ciao_server, acexml { libs += CIAO_XML_Helpers libpaths += ../XML_Helpers - depends += XML_Helpers + after += XML_Helpers IDL_Files { Daemon.idl diff --git a/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc b/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc index ebc7757da49..4cb3912033d 100644 --- a/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc +++ b/TAO/CIAO/tools/ServerActivator/ServerActivator.mpc @@ -1,8 +1,4 @@ -project(ServerActivator): ciao_server { - - libs += TAO_IORTable - libpaths += $(TAO_ROOT)/tao/IORTable - +project(ServerActivator): ciao_server, iortable { Source_Files { ServerActivator.cpp } diff --git a/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.mpc b/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.mpc index 81c41c1ed83..eb1f0b5c800 100644 --- a/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.mpc +++ b/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.mpc @@ -1,7 +1,7 @@ project (Simple_Server_Stub) : taolib_with_idl, ciao_client { sharedname = CIAO_Simple_Server_Stub - idlflags += -Wb,stub_export_include=Simple_Server_Stub_Export.h -Wb,stub_export_macro=CIAO_SIMPLE_SERVER_STUB_Export -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" - dllflags = CIAO_SIMPLE_SERVER_STUB_BUILD_DLL + idlflags += -Wb,stub_export_include=Simple_Server_Stub_Export.h -Wb,stub_export_macro=CIAO_SIMPLE_SERVER_STUB_Export + dynamicflags = CIAO_SIMPLE_SERVER_STUB_BUILD_DLL IDL_Files { Simple_Server.idl @@ -13,7 +13,7 @@ project (Simple_Server_Stub) : taolib_with_idl, ciao_client { } project (Simple_Component_Server) : ciao_server { - depends += Simple_Server_Stub + after += Simple_Server_Stub libs += CIAO_Simple_Server_Stub exename = Simple_Component_Server @@ -26,7 +26,7 @@ project (Simple_Component_Server) : ciao_server { // Use the following settings as a blueprint for creating client project. project (Simple_Component_Server_test_client) : ciao_server { - depends += Simple_Server_Stub + after += Simple_Server_Stub libs += CIAO_Simple_Server_Stub libpaths += $(CIAO_ROOT)/tools/Simple_Component_Server exename = sample_client diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc index d73aab62935..5699408b442 100644 --- a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc +++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc @@ -1,6 +1,6 @@ project(XML_Helpers): acelib, acexml { sharedname=CIAO_XML_Helpers - dllflags += CIAO_XML_HELPERS_BUILD_DLL + dynamicflags += CIAO_XML_HELPERS_BUILD_DLL Source_Files { XML_Utils.cpp @@ -13,7 +13,7 @@ project(XML_Helpers): acelib, acexml { project(Helper_Test): aceexe, acexml { libs += CIAO_XML_Helpers - depends += XML_Helpers + after += XML_Helpers Source_Files { main.cpp diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a19e0fe6c85..22987bd86ea 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,326 @@ +Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com> + + * TAOACE.mwc: + * TAO_IDL/tao_idl.mpc: + * examples/examples.mwc: + * examples/AMH/Sink_Server/Sink_Server.mpc: + * examples/AMI/FL_Callback/FL_Callback.mpc: + * examples/Callback_Quoter/Callback_Quoter.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/Persistent_Grid/Persistent_Grid.mpc: + * examples/PluggableUDP/tests/Basic/Basic.mpc: + * examples/PluggableUDP/tests/Performance/Performance.mpc: + * examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc: + * examples/Quoter/Quoter.mpc: + * examples/RTCORBA/Activity/Activity.mpc: + * examples/Simple/bank/bank.mpc: + * examples/Simple/chat/chat.mpc: + * examples/Simple/echo/echo.mpc: + * examples/Simple/grid/grid.mpc: + * examples/Simple/time/time.mpc: + * examples/Simple/time-date/time_date.mpc: + * examples/TypeCode_Creation/TypeCode_Creation.mpc: + * examples/ior_corbaloc/ior_corbaloc.mpc: + * examples/mfc/client.mpc: + * examples/mfc/server.mpc: + * orbsvcs/Concurrency_Service/Concurrency_Service.mpc: + * orbsvcs/CosEvent_Service/CosEvent_Service.mpc: + * orbsvcs/Dump_Schedule/Dump_Schedule.mpc: + * orbsvcs/Event_Service/Event_Service.mpc: + * orbsvcs/IFR_Service/IFR_Service.mpc: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc: + * orbsvcs/LoadBalancer/LoadBalancer.mpc: + * orbsvcs/Naming_Service/Naming_Service.mpc: + * orbsvcs/Notify_Service/Notify_Service.mpc: + * orbsvcs/Scheduling_Service/Scheduling_Service.mpc: + * orbsvcs/Time_Service/Time_Service.mpc: + * orbsvcs/Trading_Service/Trading_Service.mpc: + * orbsvcs/examples/examples.mwc: + * orbsvcs/orbsvcs/AV.mpc: + * orbsvcs/orbsvcs/CosConcurrency.mpc: + * orbsvcs/orbsvcs/CosEvent.mpc: + * orbsvcs/orbsvcs/CosLifeCycle.mpc: + * orbsvcs/orbsvcs/CosLoadBalancing.mpc: + * orbsvcs/orbsvcs/CosNaming.mpc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/CosProperty.mpc: + * orbsvcs/orbsvcs/CosTime.mpc: + * orbsvcs/orbsvcs/CosTrading.mpc: + * orbsvcs/orbsvcs/DsEventLogAdmin.mpc: + * orbsvcs/orbsvcs/DsLogAdmin.mpc: + * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc: + * orbsvcs/orbsvcs/ETCL.mpc: + * orbsvcs/orbsvcs/FTORB.mpc: + * orbsvcs/orbsvcs/FaultTolerance.mpc: + * orbsvcs/orbsvcs/IFRService.mpc: + * orbsvcs/orbsvcs/PortableGroup.mpc: + * orbsvcs/orbsvcs/RTCORBAEvent.mpc: + * orbsvcs/orbsvcs/RTEvent.mpc: + * orbsvcs/orbsvcs/RTEventLogAdmin.mpc: + * orbsvcs/orbsvcs/RTOLDEvent.mpc: + * orbsvcs/orbsvcs/RTSched.mpc: + * orbsvcs/orbsvcs/RTSchedEvent.mpc: + * orbsvcs/orbsvcs/RT_Notification.mpc: + * orbsvcs/orbsvcs/SSLIOP.mpc: + * orbsvcs/orbsvcs/Security.mpc: + * orbsvcs/orbsvcs/Svc_Utils.mpc: + * orbsvcs/performance-tests/perf.mwc: + * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc: + * orbsvcs/tests/tests.mwc: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc: + * orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc: + * orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc: + * orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc: + * orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc: + * orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc: + * orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc: + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc: + * orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc: + * orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc: + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc: + * orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc: + * orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc: + * orbsvcs/tests/Concurrency/Concurrency.mpc: + * orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.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_Mcast/EC_Mcast.mpc: + * orbsvcs/tests/EC_Multiple/EC_Multiple.mpc: + * orbsvcs/tests/EC_Throughput/EC_Throughput.mpc: + * orbsvcs/tests/Event/Basic/Event_Basic.mpc: + * orbsvcs/tests/Event/Basic/rteventtestexe.mpb: + * orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc: + * orbsvcs/tests/Event/Mcast/Complex/Complex.mpc: + * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc: + * orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc: + * orbsvcs/tests/Event/Performance/Event_Performance.mpc: + * orbsvcs/tests/Event/Performance/eventperftestexe.mpb: + * orbsvcs/tests/Event/lib/Event_lib.mpc: + * orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc: + * orbsvcs/tests/IOR_MCast/IOR_MCast.mpc: + * orbsvcs/tests/ImplRepo/ImplRepo.mpc: + * orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc: + * orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc: + * orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc: + * orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc: + * orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc: + * orbsvcs/tests/Miop/McastHello/McastHello.mpc: + * orbsvcs/tests/Notify/Basic/Basic.mpc: + * orbsvcs/tests/Notify/Blocking/Blocking.mpc: + * orbsvcs/tests/Notify/Destroy/Destroy.mpc: + * orbsvcs/tests/Notify/Discarding/Discarding.mpc: + * orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc: + * orbsvcs/tests/Notify/Ordering/Ordering.mpc: + * orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc: + * orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc: + * orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc: + * orbsvcs/tests/Notify/lib/Notify_lib.mpc: + * orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc: + * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc: + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc: + * orbsvcs/tests/Property/Property.mpc: + * orbsvcs/tests/Redundant_Naming/Redundant_Naming.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/MT_IIOP_SSL/MT_IIOP_SSL.mpc: + * orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc: + * orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.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: + * orbsvcs/tests/ior_corbaname/ior_corbaname.mpc: + * orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc: + * performance-tests/perf.mwc: + * 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/Single_Threaded/Memory_Growth.mpc: + * performance-tests/POA/Create_Reference/Create_Reference.mpc: + * performance-tests/POA/Demux/Demux.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/RTCorba/Multiple_Endpoints/Common/Common.mpc: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc: + * performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc: + * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc: + * performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc: + * performance-tests/Sequence_Latency/AMI/ami.mpc: + * performance-tests/Sequence_Latency/DSI/DSI.mpc: + * performance-tests/Sequence_Latency/Deferred/Deferred.mpc: + * performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc: + * performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc: + * performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc: + * performance-tests/Throughput/Throughput.mpc: + * tao/tao.mpc: + * tao/BiDir_GIOP/BiDir_GIOP.mpc: + * tao/Domain/Domain.mpc: + * tao/DynamicAny/DynamicAny.mpc: + * tao/DynamicInterface/DynamicInterface.mpc: + * tao/IFR_Client/IFR_Client.mpc: + * tao/IORInterceptor/IORInterceptor.mpc: + * tao/IORManipulation/IORManipulation.mpc: + * tao/IORTable/IORTable.mpc: + * tao/Messaging/Messaging.mpc: + * tao/ObjRefTemplate/ObjRefTemplate.mpc: + * tao/PortableServer/PortableServer.mpc: + * tao/RTCORBA/RTCORBA.mpc: + * tao/RTPortableServer/RTPortableServer.mpc: + * tao/SmartProxies/SmartProxies.mpc: + * tao/Strategies/Strategies.mpc: + * tao/TypeCodeFactory/TypeCodeFactory.mpc: + * tao/Valuetype/Valuetype.mpc: + * tests/tests.mwc: + * tests/AMI/AMI.mpc: + * tests/AMI_Buffering/AMI_Buffering.mpc: + * tests/AMI_Timeouts/AMI_Timeouts.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/CDR/CDR.mpc: + * tests/Cache_Growth_Test/Cache_Growth_Test.mpc: + * tests/Client_Leaks/Client_Leaks.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/Exposed_Policies/Exposed_Policies.mpc: + * tests/Faults/Faults.mpc: + * tests/File_IO/File_IO.mpc: + * tests/Forwarding/Forwarding.mpc: + * tests/Hello/Hello.mpc: + * tests/IDL_Test/IDL_Test.mpc: + * tests/IORManipulation/IORManipulation.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/ORB_init.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/Default_Servant/Default_Servant.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/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/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/Queued_Message_Test/Queued_Message_Test.mpc: + * tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Connections.mpc: + * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc: + * tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc: + * tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc: + * tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc: + * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc: + * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc: + * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc: + * tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc: + * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc: + * tests/RTCORBA/Policies/Policies.mpc: + * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc: + * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc: + * tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc: + * tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc: + * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc: + * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc: + * tests/Reliable_Oneways/Reliable_Oneways.mpc: + * tests/Server_Leaks/Server_Leaks.mpc: + * tests/Single_Read/Single_Read.mpc: + * tests/Smart_Proxies/Smart_Proxies.mpc: + * tests/Stack_Recursion/Stack_Recursion.mpc: + * tests/Strategies/Strategies.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/utils.mwc: + * utils/catior/catior.mpc: + + Added and updated mpc files to use the latest + features and make use of base projects. + Wed Jun 25 09:40:08 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/TAO_Static.dsp: diff --git a/TAO/TAOACE.mwc b/TAO/TAOACE.mwc new file mode 100644 index 00000000000..b464ed99377 --- /dev/null +++ b/TAO/TAOACE.mwc @@ -0,0 +1,16 @@ +workspace { + ../ace + ../apps/gperf/src + ../ACEXML/common + ../ACEXML/parser/parser + ../ACEXML/apps/svcconf + tao + TAO_IDL + utils + orbsvcs + exclude { + orbsvcs/tests + orbsvcs/performance-tests + orbsvcs/examples + } +}
\ No newline at end of file diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index f77bcbc1bea..795451c2972 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -1,10 +1,11 @@ -project(TAO_IDL_EXE) : aceexe, taoversion, core { +// This project must be named TAO_IDL_EXE instead of TAO_IDL +// because otherwise mpc won't work correctly. +project(TAO_IDL_EXE) : aceexe, taoversion, core, tao_output { exename = tao_idl libs += TAO_IDL_BE TAO_IDL_FE - includes += include be_include fe - install = ../../bin - libflags += TAO_AS_STATIC_LIBS - depends += TAO_IDL_BE TAO_IDL_FE gperf_exe + includes += include be_include fe + install = $(ACE_ROOT)/bin + after += TAO_IDL_BE TAO_IDL_FE gperf_exe idlpreprocessor = 1 Source_Files { @@ -20,13 +21,15 @@ project(TAO_IDL_EXE) : aceexe, taoversion, core { } -project(TAO_IDL_BE) : acelib, taoversion, core { - sharedname = TAO_IDL_BE - libs += TAO_IDL_FE - includes += include be_include fe - dllflags = TAO_IDL_BE_BUILD_DLL - libflags += TAO_AS_STATIC_LIBS - depends += TAO_IDL_FE +project(TAO_IDL_BE) : acelib, taoversion, core, tao_output { + sharedname = TAO_IDL_BE + libs += TAO_IDL_FE + includes += include be_include fe + dynamicflags = TAO_IDL_BE_BUILD_DLL + staticflags += TAO_AS_STATIC_LIBS + after += TAO_IDL_FE + pch_header = be_pch.h + pch_source = be/be_pch.cpp Source_Files { be @@ -38,11 +41,13 @@ project(TAO_IDL_BE) : acelib, taoversion, core { } -project(TAO_IDL_FE) : acelib, taoversion, core { - sharedname = TAO_IDL_FE - includes += include fe - dllflags = TAO_IDL_FE_BUILD_DLL - libflags += TAO_AS_STATIC_LIBS +project(TAO_IDL_FE) : acelib, taoversion, core, tao_output { + sharedname = TAO_IDL_FE + includes += include fe + dynamicflags = TAO_IDL_FE_BUILD_DLL + staticflags += TAO_AS_STATIC_LIBS + pch_header = fe_pch.h + pch_source = fe/fe_pch.cpp Source_Files { fe diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc index 362f8298df3..02dcbb6fde1 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): server, strategies { +project(*st_server): taoserver, strategies { idlflags += -GH exename = st_server requires += ami @@ -11,7 +11,7 @@ project(st_server): server, strategies { } } -project(mt_server): server, strategies { +project(*mt_server): taoserver, strategies { idlflags += -GH exename = mt_server requires += ami @@ -25,7 +25,7 @@ project(mt_server): server, strategies { } } -project: client, strategies { +project(*client): taoclient, strategies { idlflags += -GH requires += ami diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc index 70192acb8d9..124e552d238 100644 --- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc +++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc @@ -1,4 +1,4 @@ -project(progress): server, strategies { +project(*progress): taoserver, strategies, messaging { exename = progress idlflags -= -Sc idlflags += -GC @@ -10,7 +10,7 @@ project(progress): server, strategies { } } -project(peer): server, strategies { +project(*peer): taoserver, strategies, messaging { exename = peer idlflags -= -Sc idlflags += -GC diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc index e9b77440891..d71411e1c13 100644 --- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc +++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc @@ -1,4 +1,4 @@ -project(notifier): namingexe { +project(Callback_Quoter notifier): namingexe { exename = notifier Source_Files { @@ -8,7 +8,7 @@ project(notifier): namingexe { } } -project(consumer): namingexe { +project(Callback_Quoter consumer): namingexe { exename = consumer Source_Files { @@ -20,7 +20,7 @@ project(consumer): namingexe { } } -project(supplier): namingexe { +project(Callback_Quoter supplier): namingexe { exename = supplier Source_Files { diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc index 5ac07b1b324..627f92f277e 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc +++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(*Server): namingexe { Source_Files { Content_Iterator_i.cpp Iterator_Factory_i.cpp @@ -6,7 +6,7 @@ project: namingexe { } } -project(client): namingexe { +project(*Client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc index b1b1f5da373..dd25d035714 100644 --- a/TAO/examples/Event_Comm/Event_Comm.mpc +++ b/TAO/examples/Event_Comm/Event_Comm.mpc @@ -1,4 +1,4 @@ -project(notifier): namingexe { +project(*notifier): namingexe { exename = notifier Source_Files { @@ -8,7 +8,7 @@ project(notifier): namingexe { } } -project(consumer): namingexe { +project(*consumer): namingexe { exename = consumer Source_Files { @@ -19,7 +19,7 @@ project(consumer): namingexe { } } -project(supplier): namingexe { +project(*supplier): namingexe { exename = supplier Source_Files { diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc index 21318ae94b9..635e94b0f66 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing.mpc +++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc @@ -1,4 +1,4 @@ -project: server { +project(*server): taoserver { avoids += repo IDL_Files { @@ -15,7 +15,7 @@ project: server { } } -project(client): server { +project(*Client): taoserver { exename = client avoids += repo @@ -31,7 +31,7 @@ project(client): server { } } -project(load balancer): server { +project(*Balancer): taoserver { 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 a41882d9b92..082a1d6ab18 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(load balancer): server { +project(*balancer): taoserver { avoids += minimum_corba repo exename = load_balancer @@ -14,7 +14,7 @@ project(load balancer): server { } } -project: server { +project(*server): taoserver { avoids += minimum_corba repo Source_Files { @@ -26,7 +26,7 @@ project: server { } } -project(client): server { +project(*client): taoserver { avoids += minimum_corba repo exename = client diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc index b22b4d27270..772fee77d2c 100644 --- a/TAO/examples/Logging/Logging.mpc +++ b/TAO/examples/Logging/Logging.mpc @@ -1,4 +1,4 @@ -project(Logging Service): namingexe { +project(*Service): namingexe { exename = Logging_Service comps += LifeCycle @@ -9,7 +9,7 @@ project(Logging Service): namingexe { } } -project(Logging Test): namingexe { +project(*Test): namingexe { exename = Logging_Test comps += LifeCycle diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc index d7c18dda87c..07d5ab802d5 100644 --- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc +++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc @@ -1,4 +1,6 @@ -project: server { +project(*server): taoserver { + idlflags += -Gv + Source_Files { Server_i.cpp Event_Types_impl.cpp @@ -7,8 +9,9 @@ project: server { } } -project(client): server { +project(*client): taoserver { exename = client + idlflags += -Gv Source_Files { Client_i.cpp diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc index 92133998162..ed4c9f9a98a 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc +++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc @@ -1,4 +1,4 @@ -project: server { +project(*server): taoserver { Source_Files { Grid_i.cpp Simple_util.cpp @@ -6,7 +6,7 @@ project: server { } } -project(client): server { +project(*client): taoserver { exename = client Source_Files { @@ -17,7 +17,7 @@ project(client): server { } } -project(persistent client): server { +project(*persistent client): taoserver { exename = persistent_client Source_Files { diff --git a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc index 14fec0011b0..10149161cbe 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc +++ b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc @@ -1,4 +1,4 @@ -project: server, strategies { +project(*server): taoserver, strategies { idlflags += -Sp -Sd Source_Files { @@ -8,7 +8,7 @@ project: server, strategies { } } -project(client): server, strategies { +project(*client): taoserver, strategies { idlflags += -Sp -Sd exename = client diff --git a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc index 26d2f25a243..368621c5a6a 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc +++ b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc @@ -1,4 +1,4 @@ -project: server, strategies { +project(*server): taoserver, strategies { idlflags += -Sd -Sp Source_Files { @@ -7,7 +7,7 @@ project: server, strategies { } } -project(client): server, strategies { +project(*client): taoserver, strategies { idlflags += -Sd -Sp exename = client diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc index a021b4a7027..db6fa1ec983 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc @@ -1,4 +1,4 @@ -project: server, strategies { +project(*server): taoserver, strategies { idlflags += -Sp -Sd Source_Files { @@ -7,7 +7,7 @@ project: server, strategies { } } -project(client): server, strategies { +project(*client): taoserver, strategies { idlflags += -Sp -Sd exename = client diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc index 24b184b267c..95ded085b6e 100644 --- a/TAO/examples/Quoter/Quoter.mpc +++ b/TAO/examples/Quoter/Quoter.mpc @@ -1,47 +1,35 @@ -project: namingexe { - libs += TAO_CosLifeCycle - depends += CosLifeCycle - idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs - includes += $(TAO_ROOT)/orbsvcs/orbsvcs - +// todo : Once MPC is used for everything, we should consider +// removing the includes += lines below, and updating +// the source code instead. +project(*server): namingexe, lifecycle { + idlflags += -I../../orbsvcs/orbsvcs + includes += ../../orbsvcs/orbsvcs Source_Files { server.cpp Quoter_i.cpp } } -project(client): namingexe { - libs += TAO_CosLifeCycle - depends += CosLifeCycle - idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs - includes += $(TAO_ROOT)/orbsvcs/orbsvcs - exename = client - +project(*client): namingexe, lifecycle { + idlflags += -I../../orbsvcs/orbsvcs + includes += ../../orbsvcs/orbsvcs Source_Files { client.cpp } } -project(Factory Finder): namingexe { - libs += TAO_CosLifeCycle - depends += CosLifeCycle - idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs - includes += $(TAO_ROOT)/orbsvcs/orbsvcs - exename = Factory_Finder - +project(*Factory Finder): namingexe, lifecycle { + idlflags += -I../../orbsvcs/orbsvcs + includes += ../../orbsvcs/orbsvcs Source_Files { Factory_Finder.cpp Factory_Finder_i.cpp } } -project(Generic Factory): namingexe { - libs += TAO_CosLifeCycle - depends += CosLifeCycle - idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs - includes += $(TAO_ROOT)/orbsvcs/orbsvcs - exename = Generic_Factory - +project(*Generic Factory): namingexe, lifecycle { + idlflags += -I../../orbsvcs/orbsvcs + includes += ../../orbsvcs/orbsvcs Source_Files { Generic_Factory.cpp Generic_Factory_i.cpp diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc index 1bc5a6338c8..dde5d3790d3 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.mpc +++ b/TAO/examples/RTCORBA/Activity/Activity.mpc @@ -1,4 +1,8 @@ -project(activity): namingexe, rt_server { - exename = activity +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. + dynamicflags = ACTIVITY_BUILD_DLL } diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc index 8615c64144f..69e76d79e35 100644 --- a/TAO/examples/Simple/bank/bank.mpc +++ b/TAO/examples/Simple/bank/bank.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(*server): namingexe { Source_Files { Account_i.cpp AccountManager_i.cpp @@ -7,7 +7,7 @@ project: namingexe { } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc index eed382a580a..d4ef4c0e1ad 100644 --- a/TAO/examples/Simple/chat/chat.mpc +++ b/TAO/examples/Simple/chat/chat.mpc @@ -1,36 +1,15 @@ -project: server { - depends += IORTable - libs += TAO_IORTable - - IDL_Files { - Receiver.idl - Broadcaster.idl - } - +project(*server) : taoserver, iortable { Source_Files { - ReceiverS.cpp - ReceiverC.cpp - BroadcasterC.cpp - BroadcasterS.cpp Broadcaster_i.cpp Server_i.cpp server.cpp } } -project(client): server { +project(*client): taoserver { exename = client - IDL_Files { - Receiver.idl - Broadcaster.idl - } - Source_Files { - ReceiverS.cpp - ReceiverC.cpp - BroadcasterC.cpp - BroadcasterS.cpp Receiver_i.cpp Client_i.cpp client.cpp diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc index a0f7eb00824..b6030da410b 100644 --- a/TAO/examples/Simple/echo/echo.mpc +++ b/TAO/examples/Simple/echo/echo.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(*server): namingexe { Source_Files { Echo_i.cpp ../Simple_util.cpp @@ -6,7 +6,7 @@ project: namingexe { } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc index c78abd91e73..9990fd4234d 100644 --- a/TAO/examples/Simple/grid/grid.mpc +++ b/TAO/examples/Simple/grid/grid.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(*server): namingexe { Source_Files { Grid_i.cpp server.cpp @@ -6,7 +6,7 @@ project: namingexe { } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Simple/time-date/time_date.mpc b/TAO/examples/Simple/time-date/time_date.mpc index f9a579d1500..1d3015cb3f1 100644 --- a/TAO/examples/Simple/time-date/time_date.mpc +++ b/TAO/examples/Simple/time-date/time_date.mpc @@ -1,11 +1,11 @@ -project: namingexe { +project(*server): namingexe { Source_Files { server.cpp ../Simple_util.cpp } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc index 8560adba888..089fea50cea 100644 --- a/TAO/examples/Simple/time/time.mpc +++ b/TAO/examples/Simple/time/time.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(*server): namingexe { Source_Files { Time_i.cpp server.cpp @@ -6,7 +6,7 @@ project: namingexe { } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc index e5721767ad2..38dbb1e4cf6 100644 --- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc +++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc @@ -1,8 +1,5 @@ -project(create_tc): client { +project: taoclient, typecodefactory, ifr_client { exename = create_tc - libs += TAO_TypeCodeFactory TAO_IFR_Client - depends += TypeCodeFactory IFR_Client - Source_Files { testC.cpp main.cpp diff --git a/TAO/examples/examples.mwc b/TAO/examples/examples.mwc new file mode 100644 index 00000000000..b206b16ec2f --- /dev/null +++ b/TAO/examples/examples.mwc @@ -0,0 +1,6 @@ +workspace { + exclude { + // todo : get the mfc projects working correctly. + mfc + } +} diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc index 67edd0abd8b..f95447eb087 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc +++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc @@ -1,11 +1,11 @@ -project: namingexe { +project(*server): namingexe { Source_Files { status_i.cpp server.cpp } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { @@ -14,7 +14,7 @@ project(client): namingexe { } } -project(corbaname client): server { +project(*corbaname client): namingexe { exename = corbaname_client Source_Files { diff --git a/TAO/examples/mfc/client.mpc b/TAO/examples/mfc/client.mpc index e3124fcfaa0..e16653925ae 100644 --- a/TAO/examples/mfc/client.mpc +++ b/TAO/examples/mfc/client.mpc @@ -1,4 +1,4 @@ -project(client): namingexe { +project(MFC client): namingexe { exename = client verbatim(gnuace, top) { diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc index 8cf601cdf9d..fbc1ed40408 100644 --- a/TAO/examples/mfc/server.mpc +++ b/TAO/examples/mfc/server.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(MFC Server): namingexe { pch_header = StdAfx.h pch_source = StdAfx.cpp diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc index 79ffb823596..9a385804201 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc @@ -1,5 +1,3 @@ -project : orbsvcsexe, core { - depends += CosConcurrency CosNaming Svc_Utils IORTable PortableServer +project : orbsvcsexe, core, concurrency, naming { exename = Concurrency_Service - libs += TAO_CosConcurrency TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer } diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc index 8dd4688f890..eaf3590618e 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc @@ -1,5 +1,3 @@ -project : orbsvcsexe, core { - depends += CosEvent CosNaming Svc_Utils IORTable Messaging PortableServer +project : orbsvcsexe, core, event, naming, svc_utils, iortable, messaging, portableserver { exename = CosEvent_Service - libs += TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_Messaging TAO_PortableServer } diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc index 550115780ab..a71e4b5059c 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc @@ -1,5 +1,3 @@ -project : orbsvcsexe, core { - depends += RTSched CosNaming Svc_Utils IORTable PortableServer +project : orbsvcsexe, core, rtsched, naming, svc_utils, iortable, portableserver { exename = Dump_Schedule - libs += TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer } diff --git a/TAO/orbsvcs/Event_Service/Event_Service.mpc b/TAO/orbsvcs/Event_Service/Event_Service.mpc index c7a982c0bde..2eff92a3bd1 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.mpc +++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc @@ -1,5 +1,3 @@ -project : orbsvcsexe, core { - depends += RTOLDEvent RTEvent RTSched CosNaming Svc_Utils IORTable Messaging PortableServer +project : orbsvcsexe, core, event, rtevent, rtoldevent, rtschedevent { exename = Event_Service - libs += TAO_RTOLDEvent TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_Messaging TAO_PortableServer } diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index 5158160f24a..7dc0347c6c4 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -1,8 +1,5 @@ -project(IFR_Service) : orbsvcsexe, core { - depends += IFRService TypeCodeFactory Svc_Utils IFR_Client IORTable PortableServer +project(IFR_Service) : orbsvcsexe, core, ifrservice, typecodefactory, svc_utils, ifr_client, iortable, portableserver { exename = IFR_Service - libs += TAO_IFRService TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer - Source_Files { IFR_Server.cpp IFR_Service.cpp @@ -10,13 +7,12 @@ project(IFR_Service) : orbsvcsexe, core { } -project(TAO_IFR_BE) : taolib, core { - depends += TAO_IDL_FE TAO_IFR_Client - sharedname = TAO_IFR_BE - libs += TAO_IDL_FE TAO_IFR_Client TAO - dllflags = TAO_IFR_BE_BUILD_DLL - includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe - libpaths += $(TAO_ROOT)/TAO_IDL +project(TAO_IFR_BE) : taolib, core, ifr_client { + after += TAO_IDL_FE + sharedname = TAO_IFR_BE + libs += TAO_IDL_FE + dynamicflags = TAO_IFR_BE_BUILD_DLL + includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe Source_Files { be_global.cpp @@ -32,11 +28,11 @@ project(TAO_IFR_BE) : taolib, core { } -project(TAO_IFR_EXE) : taoexe, core { - depends += TAO_IFR_BE IFR_Client TAO_IDL_FE +project(TAO_IFR_EXE) : taoexe, core, ifr_client { + after += TAO_IFR_BE TAO_IDL_FE exename = tao_ifr idlpreprocessor = 1 - libs += TAO_IFR_BE TAO_IFR_Client TAO TAO_IDL_FE + libs += TAO_IFR_BE TAO TAO_IDL_FE includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe libpaths += $(TAO_ROOT)/TAO_IDL diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index ff4fbebef4d..cd9806c2e22 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,11 +1,18 @@ -project : orbsvcsexe, core, acexml, minimum_corba { - depends += Svc_Utils IORTable PortableServer +project : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, portableserver { exename = ImplRepo_Service - libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer - comps += Naming + Source_Files { + Adapter_Activator.cpp + Forwarder.cpp + ImR_Locator.cpp + ImR_Locator_i.cpp + } +} + +project(ImR_Activator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, portableserver { + exename = ImR_Activator Source_Files { - ImR_Activator.cpp + ImR_Activator.cpp ImR_Activator_i.cpp Iterator.cpp Locator.cpp @@ -19,27 +26,8 @@ project : orbsvcsexe, core, acexml, minimum_corba { } -project(ImR_Activator) : orbsvcsexe, core, acexml, minimum_corba { - depends += Svc_Utils IORTable PortableServer - exename = ImR_Activator - libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer - comps += Naming - - Source_Files { - Adapter_Activator.cpp - Forwarder.cpp - ImR_Locator.cpp - ImR_Locator_i.cpp - } -} - - -project(tao_imr) : orbsvcsexe, core, acexml, minimum_corba { - depends += Svc_Utils IORTable PortableServer +project(tao_imr) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable, portableserver { exename = tao_imr - libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer - comps += Naming - Source_Files { tao_imr.cpp tao_imr_i.cpp diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc index c3a6a84cfbb..c143901f4aa 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc @@ -1,5 +1,3 @@ -project : orbsvcsexe, core { - depends += CosLifeCycle CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer +project : orbsvcsexe, core, lifecycle, naming, trading { exename = LifeCycle_Service - libs += TAO_CosLifeCycle TAO_CosTrading TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer } diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc index ab5877bf7a6..082968d3200 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc @@ -1,25 +1,21 @@ -project(CosLoadManager): namingexe, messaging, core { - libs += TAO_CosLoadBalancing TAO_PortableGroup - depends += LoadBalancing PortableGroup +project(CosLoadManager): namingexe, server, core, loadbalancing { requires += ami interceptors - comps += CosLoadBalancing exename = LoadManager Source_Files { - LoadBalancer.cpp LoadManager.cpp + Signal_Handler.cpp } } -project(CosLoadMonitor): namingexe, messaging, core { - libs += TAO_CosLoadBalancing TAO_PortableGroup - depends += LoadBalancing PortableGroup +project(CosLoadMonitor): namingexe, server, core, loadbalancing { requires += ami interceptors - comps += CosLoadBalancing exename = LoadMonitor Source_Files { LoadMonitor.cpp Push_Handler.cpp + Monitor_Signal_Handler.cpp + Signal_Handler.cpp } } diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc index f3dece5e2f6..7a5c68a1571 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc @@ -1,19 +1,13 @@ -project : orbsvcsexe, core { - depends += CosNaming Svc_Utils IORTable PortableServer +project : orbsvcsexe, core, naming { exename = Naming_Service - libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer - Source_Files { Naming_Server.cpp Naming_Service.cpp } } -project(NT_Naming_Service) : orbsvcsexe, core { - depends += CosNaming Svc_Utils IORTable PortableServer +project(NT_Naming_Service) : orbsvcsexe, core, naming { exename = NT_Naming_Service - libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer - Source_Files { Naming_Service.cpp NT_Naming_Server.cpp diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc index 2fab5e15927..124b7d4c7f0 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc @@ -1,11 +1,24 @@ -project : orbsvcsexe, core { - depends += CosNotification ETCL CosNaming Svc_Utils DynamicAny IORTable PortableServer +project : orbsvcsexe, core, notification { exename = Notify_Service - libs += TAO_CosNotification TAO_ETCL TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_IORTable TAO_PortableServer - Source_Files { Notify_Server.cpp Notify_Service.cpp } + Header_Files { + Notify_Service.h + } +} + +project(NT_Notify_Service) : orbsvcsexe, core, notification { + exename = NT_Notify_Service + Source_Files { + Notify_Service.cpp + NT_Notify_Server.cpp + NT_Notify_Service.cpp + } + Header_Files { + Notify_Service.h + NT_Notify_Service.h + } } diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc index 6e816f4f08d..5d97e837c0f 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc @@ -1,5 +1,3 @@ -project : orbsvcsexe, core { - depends += RTSched CosNaming Svc_Utils IORTable PortableServer +project : orbsvcsexe, core, rtsched, naming, svc_utils, iortable, portableserver { exename = Scheduling_Service - libs += TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer } diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc index 1d0ca163b3f..89a92d5f395 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service.mpc +++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc @@ -1,19 +1,13 @@ -project(Time_Service_Server) : orbsvcsexe, core { - depends += CosTime CosNaming Svc_Utils IORTable PortableServer +project(Time_Service_Server) : orbsvcsexe, core, time { exename = Time_Service_Server - libs += TAO_CosTime TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer - Source_Files { Server_i.cpp Time_Service_Server.cpp } } -project(Time_Service_Clerk) : orbsvcsexe, core { - depends += CosTime CosNaming Svc_Utils IORTable PortableServer +project(Time_Service_Clerk) : orbsvcsexe, core, time { exename = Time_Service_Clerk - libs += TAO_CosTime TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer - Source_Files { Clerk_i.cpp Time_Service_Clerk.cpp diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc index 437b62eae49..e4284c38bfe 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc @@ -1,6 +1,4 @@ -project : orbsvcsexe, core { - depends += CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer +project : orbsvcsexe, core, trading, naming { exename = Trading_Service - libs += TAO_CosTrading TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer } diff --git a/TAO/orbsvcs/examples/examples.mwc b/TAO/orbsvcs/examples/examples.mwc new file mode 100644 index 00000000000..d90104a2381 --- /dev/null +++ b/TAO/orbsvcs/examples/examples.mwc @@ -0,0 +1,2 @@ +workspace { +} diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index dd7dcea8819..d2e508feb6b 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -1,11 +1,10 @@ -project(AV) : orbsvcslib, core { - depends += CosProperty CosNaming Svc_Utils PortableServer QoS - sharedname = TAO_AV - libs += TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO ACE_QoS - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h - dllflags = TAO_AV_BUILD_DLL - tagchecks = AV - include_dir = orbsvcs +project(AV) : orbsvcslib, core, property, naming, qos { + sharedname = TAO_AV + 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 @@ -24,4 +23,12 @@ project(AV) : orbsvcslib, core { AV } } + Header_Files { + Channel_Clients_T.h + AV + } + Template_Files { + Channel_Clients_T.cpp + AV + } } diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index de1c3d49fdf..55e5c697565 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -1,11 +1,10 @@ -project(CosConcurrency) : orbsvcslib, core { - depends += PortableServer - sharedname = TAO_CosConcurrency - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h - dllflags = TAO_CONCURRENCY_BUILD_DLL - tagchecks = Concurrency - include_dir = orbsvcs +project(CosConcurrency) : orbsvcslib, core, portableserver { + sharedname = TAO_CosConcurrency + 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 8eed2ebf1ad..02c02f5c9e5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -1,12 +1,11 @@ -project(CosEvent) : orbsvcslib, messaging_only, core { - depends += CosNaming Svc_Utils PortableServer - sharedname = TAO_CosEvent - libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h +project(CosEvent) : orbsvcslib, messaging, core, naming { + sharedname = TAO_CosEvent + idlflags += -Wb,pch_include=CosEvent_pch.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h // Set both DLL flags because of the shared idl files - dllflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL - tagchecks = CosEvent - include_dir = orbsvcs + dynamicflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL + tagchecks = CosEvent + // Add this include path for precompiled headers + includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { CosEventComm.idl diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index 3f2eb39b502..c15f6202fd4 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -1,11 +1,10 @@ -project(CosLifeCycle) : orbsvcslib, core { - depends += CosNaming Svc_Utils PortableServer - sharedname = TAO_CosLifeCycle - libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h - dllflags = TAO_LIFECYCLE_BUILD_DLL - tagchecks = LifeCycle - include_dir = orbsvcs +project(CosLifeCycle) : orbsvcslib, core, naming { + sharedname = TAO_CosLifeCycle + 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 new file mode 100644 index 00000000000..ebc474d9207 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -0,0 +1,45 @@ +project(CosLoadBalancing) : orbsvcslib, core, naming, portablegroup, messaging { + sharedname = TAO_CosLoadBalancing + requires += ami + idlflags += -GC -Wb,pch_include=CosLoadBalancing_pch.h -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 + includes += $(TAO_ROOT)/orbsvcs/orbsvcs + + IDL_Files { + CosLoadBalancing.idl + LB_ORT.idl + } + + Source_Files(ORBSVCS_COMPONENTS) { + CosLoadBalancing { + CosLoadBalancingC.cpp + CosLoadBalancingS.cpp + LB_ORTC.cpp + LoadBalancing/LB_LeastLoaded.cpp + LoadBalancing/LB_LoadAlert.cpp + LoadBalancing/LB_LoadAlertInfo.cpp + LoadBalancing/LB_LoadAlertMap.cpp + LoadBalancing/LB_LoadAlert_Handler.cpp + LoadBalancing/LB_LoadListMap.cpp + LoadBalancing/LB_LoadManager.cpp + LoadBalancing/LB_LoadMap.cpp + LoadBalancing/LB_Location_Index_Map.cpp + LoadBalancing/LB_MemberLocator.cpp + LoadBalancing/LB_MonitorMap.cpp + LoadBalancing/LB_Pull_Handler.cpp + LoadBalancing/LB_Random.cpp + LoadBalancing/LB_RoundRobin.cpp + LoadBalancing/LB_ClientComponent.cpp + LoadBalancing/LB_ClientORBInitializer.cpp + LoadBalancing/LB_ClientRequestInterceptor.cpp + LoadBalancing/LB_ServerRequestInterceptor.cpp + LoadBalancing/LB_IORInterceptor.cpp + LoadBalancing/LB_ObjectReferenceFactory.cpp + LoadBalancing/LB_ORBInitializer.cpp + LoadBalancing/LB_Component.cpp + LoadBalancing/LB_CPU_Monitor.cpp + } + } +} diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index 8ff4a0f63f1..8c4d4cf131c 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -1,13 +1,10 @@ -project(CosNaming) : orbsvcslib, core { - depends += Svc_Utils IORTable PortableServer - sharedname = TAO_CosNaming - libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO - idlflags += -Wb,pch_include=CosNaming_pch.h -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h - dllflags = TAO_NAMING_BUILD_DLL - tagchecks = Naming - include_dir = orbsvcs +project(CosNaming) : orbsvcslib, core, svc_utils, iortable { + sharedname = TAO_CosNaming + idlflags += -Wb,pch_include=CosNaming_pch.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h + dynamicflags = TAO_NAMING_BUILD_DLL + tagchecks = Naming // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs + includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { CosNaming.idl diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 1a8fc3e6870..169ec859b4d 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -1,12 +1,14 @@ -project(CosNotification) : orbsvcslib, core { - depends += Svc_Utils ETCL DynamicAny PortableServer - sharedname = TAO_CosNotification - libs += TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h +project(CosNotification) : orbsvcslib, core, etcl, dynamicany, event { + sharedname = TAO_CosNotification + idlflags += -Wb,pch_include=CosEvent_pch.h -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h // Set both DLL flags because of the shared idl files - dllflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL - tagchecks = Notify - include_dir = orbsvcs + dynamicflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL + tagchecks = Notify + // Add this include path for precompiled headers + includes += $(TAO_ROOT)/orbsvcs/orbsvcs + // Since the pch files don't match the project name, we list them. + pch_header = CosEvent_pch.h + pch_source = CosEvent_pch.cpp IDL_Files { CosEventComm.idl diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index 5cc94b7cc35..96c3d990bb3 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -1,11 +1,10 @@ -project(CosProperty) : orbsvcslib, core { - depends += PortableServer - sharedname = TAO_CosProperty - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h - dllflags = TAO_PROPERTY_BUILD_DLL - tagchecks = Property - include_dir = orbsvcs +project(CosProperty) : orbsvcslib, core, portableserver { + sharedname = TAO_CosProperty + 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/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index a0682b5634b..d851d8efb10 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -1,11 +1,10 @@ -project(CosTime) : orbsvcslib, core { - depends += CosNaming PortableServer - sharedname = TAO_CosTime - libs += TAO_CosNaming TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h - dllflags = TAO_TIME_BUILD_DLL - tagchecks = Time - include_dir = orbsvcs +project(CosTime) : orbsvcslib, core, naming { + sharedname = TAO_CosTime + idlflags += -Wb,pch_include=CosTime_pch.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h + dynamicflags = TAO_TIME_BUILD_DLL + tagchecks = Time + // Add this include path for precompiled headers + includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { TimeService.idl diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 3de89113354..a37577c232f 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -1,11 +1,10 @@ -project(CosTrading) : orbsvcslib, core { - depends += CosNaming Svc_Utils DynamicAny PortableServer - sharedname = TAO_CosTrading - libs += TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h - dllflags = TAO_TRADING_BUILD_DLL - tagchecks = Trader - include_dir = orbsvcs +project(CosTrading) : orbsvcslib, core, dynamicany, svc_utils { + sharedname = TAO_CosTrading + 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 3f5293764cc..4b9abbca742 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc @@ -1,11 +1,10 @@ -project(DsEventLogAdmin) : orbsvcslib, core { - depends += ETCL CosTrading IORTable CosNaming Svc_Utils DynamicAny DsLogAdmin CosEvent PortableServer - sharedname = TAO_DsEventLogAdmin - libs += TAO_ETCL TAO_CosTrading TAO_IORTable TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_DsLogAdmin TAO_CosEvent TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=Log/eventlog_export.h - dllflags = TAO_EVENTLOG_BUILD_DLL - tagchecks = EventLog - include_dir = orbsvcs +project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event { + sharedname = TAO_DsEventLogAdmin + 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 69fb89a26ba..6ee303abfef 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -1,11 +1,10 @@ -project(DsLogAdmin) : orbsvcslib, core { - depends += ETCL CosTrading IORTable CosNaming Svc_Utils DynamicAny PortableServer - sharedname = TAO_DsLogAdmin - libs += TAO_ETCL TAO_CosTrading TAO_IORTable TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h - dllflags = TAO_LOG_BUILD_DLL - tagchecks = Log - include_dir = orbsvcs +project(DsLogAdmin) : orbsvcslib, core, etcl, naming, svc_utils, dynamicany { + sharedname = TAO_DsLogAdmin + 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 60dc71c6591..3228fd686e4 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc @@ -1,11 +1,12 @@ -project(DsNotifyLogAdmin) : orbsvcslib, core { - depends += CosNotification DsEventLogAdmin DsLogAdmin ETCL CosTrading Svc_Utils DynamicAny PortableServer - sharedname = TAO_DsNotifyLogAdmin - libs += TAO_CosNotification TAO_DsEventLogAdmin TAO_DsLogAdmin TAO_ETCL TAO_CosTrading TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h - dllflags = TAO_NOTIFYLOG_BUILD_DLL - tagchecks = Log - include_dir = orbsvcs +project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, notification { + 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 d1e7f9b8887..7d9a673cc7d 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL.mpc +++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc @@ -1,9 +1,9 @@ project(ETCL) : orbsvcslib, core { - sharedname = TAO_ETCL - libs += TAO - dllflags = TAO_ETCL_BUILD_DLL - tagchecks = Notify - include_dir = orbsvcs + sharedname = TAO_ETCL + dynamicflags = TAO_ETCL_BUILD_DLL + tagchecks = Notify + pch_header = + pch_source = IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 69de559de00..c99d19e2867 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -1,11 +1,10 @@ -project(FTORB) : orbsvcslib, core { - depends += IORManipulation PortableServer - sharedname = TAO_FTORB - libs += TAO_IORManip TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h - dllflags = TAO_FT_BUILD_DLL - tagchecks = FTORB - include_dir = orbsvcs +project(FTORB) : orbsvcslib, core, iormanip, portableserver { + sharedname = TAO_FTORB + idlflags += -Wb,pch_include=FTORB_pch.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h + dynamicflags = TAO_FT_BUILD_DLL + tagchecks = FTORB + // Add this include path for precompiled headers + includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { FT_CORBA_ORB.idl diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 9a9431e623c..254c681792a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -1,11 +1,10 @@ -project(FaultTolerance) : orbsvcslib, core { - depends += FTORB CosNaming CosNotification Svc_Utils IORManipulation PortableServer - sharedname = TAO_FaultTolerance - libs += TAO_FTORB TAO_CosNaming TAO_CosNotification TAO_Svc_Utils TAO_IORManip TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h - dllflags = TAO_FT_BUILD_DLL - tagchecks = FaultTolerance - include_dir = orbsvcs +project(FaultTolerance) : orbsvcslib, core, notification, ftorb { + sharedname = TAO_FaultTolerance + idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h + dynamicflags = TAO_FT_BUILD_DLL + tagchecks = FaultTolerance + pch_header = + pch_source = IDL_Files { FT_CORBA.idl diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index 64380a89e69..7c9e1ecb0a8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -1,10 +1,9 @@ -project(IFRService) : orbsvcslib, core { - depends += TypeCodeFactory Svc_Utils IFR_Client IORTable PortableServer - sharedname = TAO_IFRService - libs += TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer TAO - dllflags = TAO_IFRSERVICE_BUILD_DLL - tagchecks = IFRService - include_dir = orbsvcs +project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, ifr_client, iortable, portableserver { + sharedname = TAO_IFRService + dynamicflags = TAO_IFRSERVICE_BUILD_DLL + tagchecks = IFRService + pch_header = + pch_source = IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index 307f3633c16..cbc88fb6e14 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,14 +1,17 @@ -project(PortableGroup) : orbsvcslib, core { - depends += CosNaming Svc_Utils PortableServer - sharedname = TAO_PortableGroup - libs += TAO_CosNaming TAO_Valuetype TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h - dllflags = TAO_PORTABLEGROUP_BUILD_DLL - tagchecks = PortableGroup - include_dir = orbsvcs +project(PortableGroup) : orbsvcslib, core, naming, svc_utils, portableserver, messaging { + sharedname = TAO_PortableGroup + idlflags += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h + dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL + tagchecks = PortableGroup + pch_header = + pch_source = IDL_Files { miop.idl + } + + IDL_Files { + idlflags += -GC PortableGroup.idl } diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index e2298f794f8..55e4da739ac 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -1,11 +1,10 @@ -project(RTCORBAEvent) : orbsvcslib, core { - depends += RTEvent CosNaming Svc_Utils IORTable RTPortableServer PortableServer RTCORBA - sharedname = TAO_RTCORBAEvent - libs += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_RTPortableServer TAO_PortableServer TAO_RTCORBA TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h - dllflags = TAO_RTCORBAEVENT_BUILD_DLL - tagchecks = RTCORBAEvent - include_dir = orbsvcs +project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba { + sharedname = TAO_RTCORBAEvent + idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h + dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL + tagchecks = RTCORBAEvent + pch_header = + pch_source = IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 2b9792a5c5e..a8915adbdbd 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -1,11 +1,10 @@ -project(RTEvent) : orbsvcslib, core { - depends += Svc_Utils Messaging PortableServer - sharedname = TAO_RTEvent - libs += TAO_Svc_Utils TAO_Messaging TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h - dllflags = TAO_RTEVENT_BUILD_DLL - tagchecks = RTEvent - include_dir = orbsvcs +project(RTEvent) : orbsvcslib, core, svc_utils, messaging, portableserver { + sharedname = TAO_RTEvent + idlflags += -Wb,pch_include=RTEvent_pch.h -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h + dynamicflags = TAO_RTEVENT_BUILD_DLL + tagchecks = RTEvent + // Add this include path for precompiled headers + includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { RtecDefaultEventData.idl @@ -14,6 +13,8 @@ project(RTEvent) : orbsvcslib, core { RtecUDPAdmin.idl } + // This could be simplified if the cpp files for RTEvent were + // in their own directory. Source_Files(ORBSVCS_COMPONENTS) { RTEvent { RtecDefaultEventDataC.cpp @@ -25,20 +26,16 @@ project(RTEvent) : orbsvcslib, core { RtecUDPAdminC.cpp RtecUDPAdminS.cpp Event/EC_Event_Channel.cpp - Event/EC_Event_Channel_Base.cpp Event/EC_ConsumerAdmin.cpp Event/EC_SupplierAdmin.cpp Event/EC_ProxyConsumer.cpp Event/EC_ProxySupplier.cpp - Event/EC_Default_ProxyConsumer.cpp - Event/EC_Default_ProxySupplier.cpp Event/EC_Supplier_Filter.cpp Event/EC_Supplier_Filter_Builder.cpp Event/EC_Trivial_Supplier_Filter.cpp Event/EC_Filter.cpp Event/EC_Filter_Builder.cpp Event/EC_Dispatching.cpp - Event/EC_Reactive_Dispatching.cpp Event/EC_Factory.cpp Event/EC_QOS_Info.cpp Event/EC_Null_Factory.cpp @@ -67,25 +64,12 @@ project(RTEvent) : orbsvcslib, core { Event/EC_Masked_Type_Filter.cpp Event/EC_Prefix_Filter_Builder.cpp Event/EC_And_Filter.cpp - Event_Utilities.cpp Event/EC_Gateway.cpp - Event/EC_UDP_Out_Endpoint.cpp + Event/EC_Gateway_UDP.cpp Event/ECG_Mcast_EH.cpp Event/ECG_UDP_Sender.cpp Event/EC_UDP_Admin.cpp - Event/EC_Channel_Destroyer.cpp - Event/EC_Lifetime_Utils.cpp - Event/EC_Proxy_Disconnector.cpp - Event/ECG_Adapters.cpp - Event/ECG_Address_Server_Base.cpp - Event/ECG_CDR_Message_Receiver.cpp - Event/ECG_CDR_Message_Sender.cpp - Event/ECG_Complex_Address_Server.cpp - Event/ECG_Mcast_Gateway.cpp - Event/ECG_Simple_Address_Server.cpp - Event/ECG_Simple_Mcast_EH.cpp - Event/ECG_UDP_EH.cpp - Event/ECG_UDP_Receiver.cpp + Event_Utilities.cpp } } } diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index 81cec51442d..94f3cdfb8b6 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -1,11 +1,11 @@ -project(RTEventLogAdmin) : orbsvcslib, core { - depends += RTSched ETCL CosTrading IORTable CosNaming Svc_Utils DynamicAny DsLogAdmin RTEvent PortableServer - sharedname = TAO_RTEventLogAdmin - libs += TAO_ETCL TAO_CosTrading TAO_IORTable TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_DsLogAdmin TAO_RTEvent TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=Log/rteventlog_export.h - dllflags = TAO_RTEVENTLOG_BUILD_DLL - tagchecks = RTEventLog - include_dir = orbsvcs +project(RTEventLogAdmin) : orbsvcslib, core, etcl, trading, iortable, naming, \ + svc_utils, dynamicany, rtevent, rtsched, portableserver, dslogadmin { + sharedname = TAO_RTEventLogAdmin + idlflags += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=Log/rteventlog_export.h + dynamicflags = TAO_RTEVENTLOG_BUILD_DLL + tagchecks = RTEventLog + pch_header = + pch_source = IDL_Files { RTEventLogAdmin.idl diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc index 18573730b98..6cbfeb2ef6e 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc @@ -1,10 +1,9 @@ -project(RTOLDEvent) : orbsvcslib, core { - depends += RTEvent RTSched CosNaming Svc_Utils PortableServer - sharedname = TAO_RTOLDEvent - libs += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - dllflags = TAO_RTOLDEVENT_BUILD_DLL - tagchecks = RTOLDEvent - include_dir = orbsvcs +project(RTOLDEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, portableserver { + sharedname = TAO_RTOLDEvent + dynamicflags = TAO_RTOLDEVENT_BUILD_DLL + tagchecks = RTOLDEvent + // Add this include path for precompiled headers + includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index 82f5a71bcdd..42a929791ca 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -1,11 +1,13 @@ -project(RTSched) : orbsvcslib, core { - depends += CosNaming TAO_Svc_Utils PortableServer - sharedname = TAO_RTSched - libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h - dllflags = TAO_RTSCHED_BUILD_DLL - tagchecks = Sched - include_dir = orbsvcs +project(RTSched) : orbsvcslib, core, naming, svc_utils, portableserver { + sharedname = TAO_RTSched + idlflags += -Wb,pch_include=RTSched_pch.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h + dynamicflags = TAO_RTSCHED_BUILD_DLL + tagchecks = Sched + // Add this include path for precompiled headers + includes += $(TAO_ROOT)/orbsvcs/orbsvcs + // Ensure that we don't get RTSchedEvent_pch.{h,cpp} + pch_header = RTSched_pch.h + pch_source = RTSched_pch.cpp IDL_Files { RtecScheduler.idl diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index 791302737f3..fe63d7c93de 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -1,10 +1,9 @@ -project(RTSchedEvent) : orbsvcslib, core { - depends += RTEvent RTSched CosNaming Svc_Utils PortableServer - sharedname = TAO_RTSchedEvent - libs += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - dllflags = TAO_RTSCHEDEVENT_BUILD_DLL - tagchecks = RTSchedEvent - include_dir = orbsvcs +project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, portableserver { + sharedname = TAO_RTSchedEvent + dynamicflags = TAO_RTSCHEDEVENT_BUILD_DLL + tagchecks = RTSchedEvent + // Add this include path for precompiled headers + includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc index d4eb38ad14e..0f5f16244e8 100644 --- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc +++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc @@ -1,9 +1,9 @@ project(RT_Notification) : orbsvcslib, core { - depends += Svc_Utils ETCL DynamicAny PortableServer TAO_RTCORBA CosNotification + after += Svc_Utils ETCL DynamicAny PortableServer TAO_RTCORBA CosNotification sharedname = TAO_RT_Notification libs += TAO_CosNotification TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO TAO_RTCORBA idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=Notify/rt_notify_export.h - dllflags = TAO_RT_NOTIFY_BUILD_DLL + dynamicflags = TAO_RT_NOTIFY_BUILD_DLL tagchecks = RT_Notify include_dir = orbsvcs diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index fe6e72314f1..b510360d908 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -1,13 +1,11 @@ -project(SSLIOP) : orbsvcslib, corba_messaging, core { - ssl = 1 - requires += ssl interceptors - depends += Security PortableServer SSL - sharedname = TAO_SSLIOP - libs += TAO_Security TAO_PortableServer TAO ACE_SSL - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h - dllflags = TAO_SSLIOP_BUILD_DLL - tagchecks = SSLIOP - include_dir = orbsvcs +project(SSLIOP) : orbsvcslib, corba_messaging, 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/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index 0dd4457c6db..0f7a9e5f9fd 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -1,12 +1,11 @@ -project(Security) : orbsvcslib, corba_messaging, core { - depends += PortableServer - requires += interceptors - sharedname = TAO_Security - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h - dllflags = TAO_SECURITY_BUILD_DLL - tagchecks = Security - include_dir = orbsvcs +project(Security) : orbsvcslib, corba_messaging, core, portableserver { + requires += interceptors + sharedname = TAO_Security + idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h + dynamicflags = TAO_SECURITY_BUILD_DLL + tagchecks = Security + pch_header = + pch_source = IDL_Files { Security.idl diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index 137103f68fa..0d2ddedfbc1 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -1,10 +1,7 @@ -project(Svc_Utils) : orbsvcslib, core { - depends += PortableServer - sharedname = TAO_Svc_Utils - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h - dllflags = TAO_SVC_UTILS_BUILD_DLL - include_dir = orbsvcs +project(Svc_Utils) : orbsvcslib, core, portableserver { + sharedname = TAO_Svc_Utils + idlflags += -Wb,pch_include=Svc_Utils_pch.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h + dynamicflags = TAO_SVC_UTILS_BUILD_DLL IDL_Files { TimeBase.idl diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc index f2d376aa8d7..1006bb05658 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc @@ -1,12 +1,7 @@ -project(RTEC_Perf): strategies, messaging_only, orbsvcslib { - sharedname = TAO_RTEC_Perf - libs += TAO_RTCORBAEvent TAO_RTEvent TAO_CosNaming TAO_Svc_Utils \ - TAO_IORTable TAO_RTPortableServer TAO_RTCORBA \ - TAO_PortableServer TAO - idlflags += -Wb,export_macro=TAO_RTEC_Perf_Export \ - -Wb,export_include=rtec_perf_export.h \ - -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h - dllflags += TAO_RTEC_PERF_BUILD_DLL +project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba { + sharedname = TAO_RTEC_Perf + idlflags += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h + dynamicflags += TAO_RTEC_PERF_BUILD_DLL Template_Files { Auto_Disconnect.cpp diff --git a/TAO/orbsvcs/performance-tests/perf.mwc b/TAO/orbsvcs/performance-tests/perf.mwc new file mode 100644 index 00000000000..d90104a2381 --- /dev/null +++ b/TAO/orbsvcs/performance-tests/perf.mwc @@ -0,0 +1,2 @@ +workspace { +} diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc index 3fbedf431e6..fbc1c6a8ea7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -7,7 +7,7 @@ project(sender): avstreamsexe { } } -project(distributer): avstreamsexe { +project(*distributer): avstreamsexe { exename = distributer Source_Files { @@ -16,7 +16,7 @@ project(distributer): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc index 87f5ca868bc..c683ea2fef5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc index 8686dbabf50..15e50b2725e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe, strategies { +project(*sender): avstreamsexe, strategies { exename = sender Source_Files { @@ -7,7 +7,7 @@ project(sender): avstreamsexe, strategies { } } -project(distributer): avstreamsexe, strategies { +project(*distributer): avstreamsexe, strategies { exename = distributer Source_Files { @@ -16,7 +16,7 @@ project(distributer): avstreamsexe, strategies { } } -project(receiver): avstreamsexe, strategies { +project(*receiver): avstreamsexe, strategies { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc index a22b5c3335e..70e6b91ff07 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc @@ -1,4 +1,4 @@ -project(server): avstreamsexe { +project(*server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): avstreamsexe { } } -project(ftp): avstreamsexe { +project(*ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc index 11514686f85..7a640aa7275 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc @@ -1,4 +1,4 @@ -project(ping): avstreamsexe, strategies { +project(*ping): avstreamsexe, strategies { exename = ping Source_Files { @@ -6,7 +6,7 @@ project(ping): avstreamsexe, strategies { } } -project(pong): avstreamsexe, strategies { +project(*pong): avstreamsexe, strategies { exename = pong Source_Files { @@ -14,7 +14,7 @@ project(pong): avstreamsexe, strategies { } } -project(control): avstreamsexe, strategies { +project(*control): avstreamsexe, strategies { exename = control Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc index 87f5ca868bc..c683ea2fef5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc index 24150d0814c..9e0ba3db26e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc @@ -1,4 +1,4 @@ -project(server): avstreamsexe, strategies { +project(*server): avstreamsexe, strategies { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): avstreamsexe, strategies { } } -project(ftp): avstreamsexe, strategies { +project(*ftp): avstreamsexe, strategies { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc index a22b5c3335e..70e6b91ff07 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc @@ -1,4 +1,4 @@ -project(server): avstreamsexe { +project(*server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): avstreamsexe { } } -project(ftp): avstreamsexe { +project(*ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc index 87f5ca868bc..c683ea2fef5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc index a22b5c3335e..70e6b91ff07 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc @@ -1,4 +1,4 @@ -project(server): avstreamsexe { +project(*server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): avstreamsexe { } } -project(ftp): avstreamsexe { +project(*ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc index 80ac33b728f..1dabe554c43 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc @@ -1,15 +1,14 @@ -project(avstreams ts) : orbsvcslib { - sharedname = TAO_TS - dllflags = TAO_AV_BUILD_DLL - install = - comps += AV +project(*ts) : orbsvcslib, portableserver, avstreams, naming { + sharedname = TAO_TS + dynamicflags = TAO_AV_BUILD_DLL + comps += AV Source_Files { TimeStamp.cpp } } -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -17,7 +16,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc index af38d4d5ec6..1b836f3ddc5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(distributer): avstreamsexe { +project(*distributer): avstreamsexe { exename = distributer Source_Files { @@ -14,7 +14,7 @@ project(distributer): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc index 87f5ca868bc..c683ea2fef5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc index 52c21d6ccf7..db3edaf54b4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc @@ -1,20 +1,14 @@ -project(sender): avstreamsexe { - depends += QoS +project(*sender): avstreamsexe, qos { requires += rapi - libs += ACE_QoS exename = sender - Source_Files { sender.cpp } } -project(receiver): avstreamsexe { - depends += QoS +project(*receiver): avstreamsexe, qos { requires += rapi - libs += ACE_QoS exename = receiver - Source_Files { receiver.cpp } diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc index 02ab33d8e95..151719d33eb 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc @@ -1,8 +1,5 @@ -project(Bug 1393 Client): client { - depends += IFR_Client - exename = client - libpaths += $(TAO_ROOT)/tao/IFR_Client - libs += TAO_IFR_Client +project(*Client): taoclient, ifr_client { + exename = client Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc index d7230e5ffec..b0e1a6ffcdf 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc @@ -1,11 +1,11 @@ -project(Bug 1395 Server): server { +project(*Server): taoserver { Source_Files { Test_i.cpp server.cpp } } -project(Bug 1395 Client): client { +project(*Client): taoclient { Source_Files { TestC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc index e7f7d5a00ed..4c6f678f475 100644 --- a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc +++ b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc @@ -1,6 +1,3 @@ -project(CC client) : orbsvcsexe { - depends += CosConcurrency CosNaming Svc_Utils IORTable PortableServer - libs += TAO_CosConcurrency TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer +project(CC client) : orbsvcsexe, concurrency, naming, svc_utils, iortable, portableserver { exename = CC_client - comps += Concurrency } diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc index 86c0d1cf997..84d27803985 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc +++ b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc @@ -1,70 +1,40 @@ -project(Disconnect): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Disconnect): basiceventtestexe { exename = Disconnect - comps += CosEvent - Source_Files { Disconnect.cpp } } -project(MT_Disconnect): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*MT_Disconnect): basiceventtestexe { exename = MT_Disconnect - comps += CosEvent - Source_Files { MT_Disconnect.cpp } } -project(Push_Event): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Push_Event): basiceventtestexe { exename = Push_Event - comps += CosEvent - Source_Files { Push_Event.cpp } } -project(Pull_Push_Event): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Pull_Push_Event): basiceventtestexe { exename = Pull_Push_Event - comps += CosEvent - Source_Files { Pull_Push_Event.cpp } } -project(Shutdown): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Shutdown): basiceventtestexe { exename = Shutdown - comps += CosEvent - Source_Files { Shutdown.cpp } } -project(Random): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Random): basiceventtestexe { exename = Random - comps += CosEvent - Source_Files { Random.cpp } diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb new file mode 100644 index 00000000000..74857041faf --- /dev/null +++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb @@ -0,0 +1,6 @@ +project : orbsvcsexe, messaging, server, event, naming, svc_utils, iortable { + after += CosEvent_Test_Lib + libs += CECTests + includes += ../lib + comps += CosEvent +} diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc index 1b2d44aa696..1925cb18283 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc +++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc @@ -1,10 +1,6 @@ -project(CosEvent Test Lib): orbsvcslib { - sharedname = CECTests - depends += CosEvent CosNaming Svc_Utils IORTable PortableServer - libs += TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer - dllflags = CEC_TEST_BUILD_DLL - comps += CosEvent - +project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver { + sharedname = CECTests + dynamicflags = CEC_TEST_BUILD_DLL Header_Files { cectest_export.h } 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 f57e45eed91..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,19 +1,13 @@ -project(ECM Supplier): rteventexe { - depends += RTSched CosNaming IORTable Messaging - libs += TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging { exename = ECM_Supplier - Source_Files { ECM_Data.cpp ECM_Supplier.cpp } } -project(ECM Consumer): rteventexe { - depends += RTSched CosNaming IORTable Messaging - libs += TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging { exename = ECM_Consumer - Source_Files { ECM_Data.cpp ECM_Consumer.cpp diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc index a490a941d64..e347b814cda 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc @@ -1,5 +1,3 @@ -project(EC_Mcast): rteventexe { - depends += Messaging - libs += TAO_Messaging +project(EC_Mcast): rteventexe, messaging { exename = EC_Mcast }
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc index 5030fa91d5b..7ad66908fb9 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc @@ -1,5 +1,3 @@ -project(EC_Multiple): rteventexe { - depends += RTOLDEvent RTSchedEvent RTSched CosNaming IORTable Messaging - libs += TAO_RTOLDEvent TAO_RTSchedEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_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 509996ef24c..1256f6edba6 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc +++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc @@ -1,6 +1,4 @@ -project(ECT Supplier): rteventexe { - depends += RTOLDEvent RTSched CosNaming IORTable Messaging - libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messaging { exename = ECT_Supplier comps += Naming RTOLDEvent @@ -11,9 +9,7 @@ project(ECT Supplier): rteventexe { } } -project(ECT Consumer): rteventexe { - depends += RTOLDEvent RTSched CosNaming IORTable Messaging - libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messaging { exename = ECT_Consumer comps += Naming RTOLDEvent @@ -24,9 +20,7 @@ project(ECT Consumer): rteventexe { } } -project(ECT Throughput): rteventexe { - depends += RTOLDEvent RTSched CosNaming IORTable Messaging - libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECT Throughput): rteventexe, rtoldevent, rtsched, naming, iortable, messaging { exename = ECT_Throughput comps += Naming RTOLDEvent diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc index 1f348726321..b25b1794768 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc +++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc @@ -1,163 +1,88 @@ -project(Reconnect): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Reconnect - +project(*Reconnect): rteventtestexe { Source_Files { Reconnect.cpp } } -project(Shutdown): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Shutdown - +project(*Shutdown): rteventtestexe { Source_Files { Shutdown.cpp } } -project(Observer): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Observer - +project(*Observer): rteventtestexe { Source_Files { Observer.cpp } } -project(BCast): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = BCast - +project(*BCast): rteventtestexe { Source_Files { BCast.cpp } } -project(Timeout): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Timeout - +project(*Timeout): rteventtestexe { Source_Files { Timeout.cpp } } -project(Wildcard): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Wildcard - +project(*Wildcard): rteventtestexe { Source_Files { Wildcard.cpp } } -project(Negation): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Negation - +project(*Negation): rteventtestexe { Source_Files { Negation.cpp } } -project(Disconnect): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Disconnect - +project(*Disconnect): rteventtestexe { Source_Files { Disconnect.cpp } } -project(MT_Disconnect): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = MT_Disconnect - +project(*MT_Disconnect): rteventtestexe { Source_Files { MT_Disconnect.cpp } } -project(Atomic_Reconnect): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Atomic_Reconnect - +project(*Atomic_Reconnect): rteventtestexe { Source_Files { Atomic_Reconnect.cpp } } -project(Bitmask): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Bitmask - +project(*Bitmask): rteventtestexe { Source_Files { Bitmask.cpp } } -project(Complex): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Complex - +project(*Complex): rteventtestexe { Source_Files { Complex.cpp } } -project(Gateway): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Gateway - +project(*Gateway): rteventtestexe { Source_Files { Gateway.cpp } } -project(Control): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Control - +project(*Control): rteventtestexe { Source_Files { Control.cpp } } -project(Random): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Random - +project(*Random) : rteventtestexe { Source_Files { Random.cpp } diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb new file mode 100644 index 00000000000..3b0f0b416b5 --- /dev/null +++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb @@ -0,0 +1,5 @@ +project : messaging, rteventexe, naming, iortable { + after += RTEvent_Test_Lib + libs += ECTests + includes += ../lib +}
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc index 75a2811ee50..f142bf79c6b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc @@ -1,10 +1,6 @@ -project(ECMcastTests Lib): orbsvcslib { +project: orbsvcslib, rtevent, svc_utils, iortable, portableserver { sharedname = ECMcastTests - depends += TAO RTEvent Svc_Utils IORTable PortableServer - libs += TAO TAO_RTEvent TAO_Svc_Utils TAO_IORTable TAO_PortableServer - dllflags = ECMCASTTESTS_BUILD_DLL - comps += RTEvent - + dynamicflags = ECMCASTTESTS_BUILD_DLL Header_Files { ectest_export.h } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc index a7eab87ae62..0f1fd636a2a 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc @@ -1,5 +1,5 @@ -project(supplier): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*supplier): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = supplier @@ -9,8 +9,8 @@ project(supplier): messaging, rteventexe { } } -project(consumer): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*consumer): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = consumer @@ -20,8 +20,8 @@ project(consumer): messaging, rteventexe { } } -project(gateway-ec): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*gateway-ec): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = gateway-ec diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc index a7eab87ae62..0f1fd636a2a 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc @@ -1,5 +1,5 @@ -project(supplier): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*supplier): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = supplier @@ -9,8 +9,8 @@ project(supplier): messaging, rteventexe { } } -project(consumer): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*consumer): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = consumer @@ -20,8 +20,8 @@ project(consumer): messaging, rteventexe { } } -project(gateway-ec): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*gateway-ec): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = gateway-ec diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc index f760c85d215..15ce9690c3b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc @@ -1,5 +1,5 @@ -project(application): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*application): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = application @@ -9,8 +9,8 @@ project(application): messaging, rteventexe { } } -project(gateway-ec): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*gateway-ec): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = gateway-ec diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc index 99093bb62f8..663d52a0877 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc +++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc @@ -1,53 +1,33 @@ -project(Throughput): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Throughput): eventperftestexe { exename = Throughput - Source_Files { Throughput.cpp } } -project(Connect): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Connect): eventperftestexe { exename = Connect - Source_Files { Connect.cpp } } -project(Inversion): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Inversion): eventperftestexe { exename = Inversion - Source_Files { Inversion.cpp } } -project(Latency): messaging, rteventexe, strategies { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Latency): eventperftestexe, strategies { exename = Latency - Source_Files { Latency.cpp } } -project(Latency_Server): messaging, rteventexe, strategies { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Latency_Server): eventperftestexe, strategies { exename = Latency_Server - Source_Files { Latency_Server.cpp } diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb new file mode 100644 index 00000000000..c9fab7fabf5 --- /dev/null +++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb @@ -0,0 +1,6 @@ +project: messaging, rteventexe, naming, iortable { + after += Event_Test_Lib + libs += ECTests + includes += ../lib +} + diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc index c7a87e6535d..15def363a05 100644 --- a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc +++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc @@ -1,10 +1,6 @@ -project(Event Test Lib): orbsvcslib { - sharedname = ECTests - depends += RTEvent CosNaming Svc_Utils IORTable PortableServer - libs += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer - dllflags = EC_TEST_BUILD_DLL - comps += RTEvent - +project(Event Test Lib): orbsvcslib, rtevent, naming, svc_utils, iortable, portableserver { + sharedname = ECTests + dynamicflags = EC_TEST_BUILD_DLL Header_Files { ectest_export.h } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc index 75cdff845c0..3ceeb4c709a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc @@ -1,20 +1,12 @@ -project: server, orbsvcsexe { - depends += FTORB IORManip - libs += TAO_FTORB TAO_IORManip - comps += FTORB - +project(*server): server, orbsvcsexe, iormanip, ftorb { Source_Files { test_i.cpp server.cpp } } -project(Manager): server, orbsvcsexe { - depends += FTORB IORManip - libs += TAO_FTORB TAO_IORManip +project(*Manager): taoserver, orbsvcsexe, iormanip, ftorb { exename = Manager - comps += 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 26f2bdf4663..7830e63a8a6 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc @@ -1,6 +1,3 @@ -project(IOGRTest): server, orbsvcsexe { - depends += FTORB IORManip - libs += TAO_FTORB TAO_IORManip +project(IOGRTest): taoserver, orbsvcsexe, iormanip, ftorb { exename = IOGRTest - comps += FTORB } diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc index 4495317318e..5c75a2ece83 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc +++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(*server): namingexe { Source_Files { server_i.cpp MCast_Server_i.cpp @@ -6,7 +6,7 @@ project: namingexe { } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index 88426df1596..f5e19cebff8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -1,6 +1,4 @@ -project(airplane server) : server, orbsvcsexe, minimum_corba { - depends += IORTable - libs += TAO_IORTable +project(airplane server) : taoserver, orbsvcsexe, minimum_corba, iortable { exename = airplane_server IDL_Files { @@ -16,9 +14,7 @@ project(airplane server) : server, orbsvcsexe, minimum_corba { } } -project(airplane client) : server, orbsvcsexe, minimum_corba { - depends += IORTable - libs += TAO_IORTable +project(airplane client) : taoserver, orbsvcsexe, minimum_corba, iortable { exename = airplane_client IDL_Files { @@ -33,9 +29,7 @@ project(airplane client) : server, orbsvcsexe, minimum_corba { } } -project(nestea server) : server, orbsvcsexe, minimum_corba { - depends += IORTable - libs += TAO_IORTable +project(nestea server) : taoserver, orbsvcsexe, minimum_corba, iortable { exename = nestea_server IDL_Files { @@ -51,9 +45,7 @@ project(nestea server) : server, orbsvcsexe, minimum_corba { } } -project(nestea client) : server, orbsvcsexe, minimum_corba { - depends += IORTable - libs += TAO_IORTable +project(nestea client) : taoserver, orbsvcsexe, minimum_corba, iortable { exename = nestea_client IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc index fcea7321be4..b13db5bd77f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc @@ -1,4 +1,4 @@ -project(ImplRepo NameService) : namingexe, minimum_corba { +project: namingexe, minimum_corba { exename = test } 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 8a641176f7e..33224b6317b 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc @@ -1,17 +1,11 @@ -project: server { - depends += IFR_Client - libs += TAO_IFR_Client - +project(*server): taoserver, ifr_client { Source_Files { test_i.cpp server.cpp } } -project(client): server { - depends += IFR_Client DynamicInterface - libs += TAO_IFR_Client TAO_DynamicInterface - +project(*client): taoserver, ifr_client, dynamicinterface { IDL_Files { } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc index 247e13d8593..7cba36180a2 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc @@ -1,5 +1,3 @@ -project(InterfaceRepo IFR Test): taoexe { - depends += IFR_Client - libs += TAO_IFR_Client +project: taoexe, ifr_client { exename = IFR_Test } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc index 6e421a842a0..2e1e428b9ee 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc @@ -1,5 +1,3 @@ -project(InterfaceRepo Persistence Test): taoexe { - depends += IFR_Client - libs += TAO_IFR_Client +project: taoexe, ifr_client { exename = Persistence_Test } diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc index 8ab0054fcdd..9d5c2d8ee91 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc @@ -1,3 +1,3 @@ -project(Interoperable Naming): namingexe { +project: namingexe { exename = client }
\ 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 fb0564cd91e..22511d8ea6d 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc @@ -1,4 +1,4 @@ -project: server, orbsvcsexe { +project(*server): server, orbsvcsexe { comps += PortableGroup Source_Files { @@ -7,7 +7,7 @@ project: server, orbsvcsexe { } } -project: client, orbsvcsexe { +project(*client): client, orbsvcsexe { comps += PortableGroup Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc index 106b27d1b73..394ce4a885f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc +++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc @@ -1,4 +1,4 @@ -project(ConnectDisconnect): notifytest { +project(*Notify ConnectDisconnect): notifytest { exename = ConnectDisconnect Source_Files { @@ -7,7 +7,7 @@ project(ConnectDisconnect): notifytest { } -project(LifeCycle): notifytest { +project(*Notify LifeCycle): notifytest { exename = LifeCycle Source_Files { @@ -15,7 +15,7 @@ project(LifeCycle): notifytest { } } -project(IdAssignment): notifytest { +project(*Notify IdAssignment): notifytest { exename = IdAssignment Source_Files { @@ -23,7 +23,7 @@ project(IdAssignment): notifytest { } } -project(Events): notifytest { +project(*Notify Events): notifytest { exename = Events Source_Files { @@ -31,7 +31,7 @@ project(Events): notifytest { } } -project(AdminProperties): notifytest { +project(*Notify AdminProperties): notifytest { exename = AdminProperties Source_Files { @@ -39,7 +39,7 @@ project(AdminProperties): notifytest { } } -project(Simple): notifytest { +project(*Notify Simple): notifytest { exename = Simple Source_Files { @@ -47,3 +47,9 @@ project(Simple): notifytest { } } +project(*Notify MultiTypes): notifytest { + Source_Files { + MultiTypes.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc index 8a9b37f4cee..894e3967f93 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc +++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc index 2f4788cdadd..db543c60423 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc +++ b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc @@ -1,12 +1,6 @@ -project (Notify_Test_Destroy): notifytest { +project (Notify_Test_Destroy): notifytest, etcl, iortable, dynamicany, portableserver { exename = Notify_Tests_Destroy - - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL - libpaths += $(TAO_ROOT)/tao/IORTable - libpaths += $(TAO_ROOT)/tao/DynamicAny - libpaths += $(TAO_ROOT)/tao/PortableServer - Source_Files { - main.cpp + main.cpp } }
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc index 737753c82e1..0da4cfb02a8 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc +++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { @@ -17,7 +17,7 @@ project(Structured Consumer): notifytest { } } -project(Sequence Supplier): notifytest { +project(*Notify Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -25,7 +25,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*Notify Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc index fc4556e54d0..1ae7ff46d8c 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc index 737753c82e1..0da4cfb02a8 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc +++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { @@ -17,7 +17,7 @@ project(Structured Consumer): notifytest { } } -project(Sequence Supplier): notifytest { +project(*Notify Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -25,7 +25,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*Notify Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc index ee79552a2b0..48e3e3aa096 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc @@ -1,19 +1,11 @@ +project: orbsvcslib, notify, rtcorba, rtportableserver { -project(TAO_RT_NotifyTests): orbsvcslib, notify { + after += TAO_NotifyTests + libs += TAO_NotifyTests - depends += TAO_NotifyTests RTPortableServer RTCORBA sharedname = TAO_RT_NotifyTests - libs += TAO_NotifyTests TAO_RTCORBA TAO_RTPortableServer - requires += rt_corba - libpaths += $(TAO_ROOT)/tao/RTCORBA - libpaths += $(TAO_ROOT)/tao/RTPortableServer - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL - libpaths += $(TAO_ROOT)/tao/IORTable - libpaths += $(TAO_ROOT)/tao/DynamicAny - libpaths += $(TAO_ROOT)/tao/PortableServer - - dllflags = TAO_RT_NOTIFY_TEST_BUILD_DLL + dynamicflags = TAO_RT_NOTIFY_TEST_BUILD_DLL Source_Files{ RT_Application_Command.cpp diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc index a0d6a42a016..b7c685cccbd 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc @@ -1,4 +1,4 @@ -project(Sequence Supplier): notifytest { +project(*Notify Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*Notify Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc index a0d6a42a016..b7c685cccbd 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc @@ -1,4 +1,4 @@ -project(Sequence Supplier): notifytest { +project(*Notify Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*Notify Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc index bc010fa07a2..5ee6ac4d4f7 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(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { 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 90b199f6874..d8c014e0cab 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(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -7,7 +7,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc index 066e2d48a15..f2cc9d91a45 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc @@ -1,16 +1,8 @@ -project(TAO_RT_NotifyTests_Filter): orbsvcslib, notify { +project(TAO_RT_NotifyTests_Filter): orbsvcslib, notify, rtcorba, etcl, dynamicany, portableserver, iortable { sharedname = TAO_RT_NotifyTests_Filter - libs += TAO_CosNotification TAO_RTCORBA - requires += rt_corba - dllflags = TAO_RT_Test_Filter_BUILD_DLL - - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL - libpaths += $(TAO_ROOT)/tao/DynamicAny - libpaths += $(TAO_ROOT)/tao/PortableServer - libpaths += $(TAO_ROOT)/tao/IORTable - libpaths += $(TAO_ROOT)/tao/RTCORBA + dynamicflags = TAO_RT_Test_Filter_BUILD_DLL IDL_Files { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc index ae9f81e625c..7e0cd7fbc09 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc @@ -1,55 +1,4 @@ -project(TAO_NotifyTests): orbsvcslib, notify { - depends += CosNotification - sharedname += TAO_NotifyTests - - libs += TAO_CosNotification - - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL - libpaths += $(TAO_ROOT)/tao/IORTable - libpaths += $(TAO_ROOT)/tao/DynamicAny - libpaths += $(TAO_ROOT)/tao/PortableServer - - dllflags = TAO_NOTIFY_TEST_BUILD_DLL - - IDL_Files { - Activation_Manager.idl - } - - Source_Files{ - Activation_ManagerC.cpp - Activation_ManagerS.cpp - Peer.cpp - StructuredPushConsumer.cpp - SequencePushConsumer.cpp - PushConsumer.cpp - StructuredPushSupplier.cpp - SequencePushSupplier.cpp - PushSupplier.cpp - Direct_Consumer.cpp - Direct_Supplier.cpp - Relay_Consumer.cpp - Activation_Manager.cpp - Application_Command.cpp - Command.cpp - Command_Builder.cpp - Command_Factory.cpp - Command_Factory_T.cpp - ConsumerAdmin_Command.cpp - Driver.cpp - EventChannel_Command.cpp - Factories_Define.cpp - Filter_Command.cpp - LookupManager.cpp - Name.cpp - Notify_Test_Client.cpp - Options_Parser.cpp - Periodic_Consumer_Command.cpp - Periodic_Supplier_Command.cpp - Periodic_Consumer.cpp - Periodic_Supplier.cpp - Priority_Mapping.cpp - StructuredEvent.cpp - SupplierAdmin_Command.cpp - Task_Stats.cpp - } -} +project(NotifyTests_Lib): orbsvcslib, notify { + sharedname = NotifyTests + dynamicflags = TAO_NOTIFY_TEST_BUILD_DLL +}
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc index 737753c82e1..2712f4cdcca 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*notify perf Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*notify perf Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { @@ -17,7 +17,7 @@ project(Structured Consumer): notifytest { } } -project(Sequence Supplier): notifytest { +project(*notify perf Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -25,7 +25,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*notify perf Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc index 71a8b8973df..84a3653adac 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(RedGreen): notifytest { +project(*notify perf RedGreen): notifytest { 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 3279c094b0b..144536943a2 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc @@ -1,5 +1,3 @@ -project(Throughput): notifytest, strategies { - depends += Messaging - libs += TAO_Messaging +project(*notify perf Throughput): notifytest, strategies, messaging { exename = Throughput } diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc index a518e2928c2..a522e058a80 100644 --- a/TAO/orbsvcs/tests/Property/Property.mpc +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -1,19 +1,11 @@ -project: server, namingexe { - depends += CosProperty - libs += TAO_CosProperty - comps += Property - +project(*server): taoserver, namingexe, property { Source_Files { server.cpp } } -project(client): server, namingexe { - depends += CosProperty - libs += TAO_CosProperty +project(*client): server, namingexe, property { exename = client - comps += Property - Source_Files { server.cpp } diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc index 109e9d8e637..598c380e154 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc +++ b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc @@ -1,4 +1,4 @@ -project(Redundant Naming Client) : namingexe { +project(*Client) : namingexe { exename = client } diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc index 2bb97fe9c19..867eebf770d 100644 --- a/TAO/orbsvcs/tests/Sched/Sched.mpc +++ b/TAO/orbsvcs/tests/Sched/Sched.mpc @@ -1,6 +1,3 @@ -project(Sched): server, namingexe { - depends += RTSched - libs += TAO_RTSched +project: taoserver, namingexe, rtsched { exename = Sched - comps += Sched } diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc index 0ea29a538af..e51d0d2888f 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc @@ -1,9 +1,5 @@ -project(Sched Conf): server, namingexe { - depends += RTSched - libs += TAO_RTSched +project: taoserver, namingexe, rtsched { exename = Sched_Conf - comps += Sched - 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 4ce6682b786..d2151a236e9 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc +++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc @@ -1,17 +1,11 @@ -project: server { - depends += SSL - requires += ssl - +project(*security server): taoserver, ssl { Source_Files { TX_Object_i.cpp server.cpp } } -project: client { - depends += SSL - requires += ssl - +project(*security client): taoclient, 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 0d1d1a9e008..afe593a5d41 100644 --- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc +++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc @@ -1,7 +1,4 @@ -project: server { - depends += SSL - requires += ssl - +project(*security server): taoserver, ssl { IDL_Files { server.idl client.idl @@ -16,10 +13,8 @@ project: server { } } -project(client): server { +project(*security client): taoserver, ssl { exename = client - depends += SSL - requires += ssl IDL_Files { server.idl 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 36887871fbb..2736c3d344c 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: server { +project(*security server): orbsvcsexe, portableserver, ssl { Source_Files { Server_Worker.cpp test_i.cpp @@ -6,7 +6,7 @@ project: server { } } -project: client { +project(*security client): orbsvcsexe, ssl { Source_Files { testC.cpp Client_Worker.cpp diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc index 36887871fbb..18d3f89fc68 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc @@ -1,4 +1,4 @@ -project: server { +project(* security server): taoserver { Source_Files { Server_Worker.cpp test_i.cpp @@ -6,7 +6,7 @@ project: server { } } -project: client { +project(* security client): taoclient { Source_Files { testC.cpp Client_Worker.cpp diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc index 36887871fbb..2736c3d344c 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc @@ -1,4 +1,4 @@ -project: server { +project(*security server): orbsvcsexe, portableserver, ssl { Source_Files { Server_Worker.cpp test_i.cpp @@ -6,7 +6,7 @@ project: server { } } -project: client { +project(*security client): orbsvcsexe, ssl { Source_Files { testC.cpp Client_Worker.cpp diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc index 29eba59b7bd..5e37463cfc5 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc @@ -1,20 +1,12 @@ -project: server, orbsvcsexe { +project(*security server): taoserver, orbsvcsexe, security, ssl { ssl = 1 - depends += Security SSL - libs += TAO_Security - requires += ssl - Source_Files { Foo_i.cpp server.cpp } } -project: client, orbsvcsexe { - depends += Security SSL - libs += TAO_Security - requires += ssl - +project(*security client): taoclient, 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 e3ce0a1cbbe..116fa15bce0 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc @@ -1,18 +1,12 @@ -project: server, orbsvcsexe { +project(*security server): taoserver, orbsvcsexe, ssl, security { ssl = 1 - depends += Security SSL - libs += TAO_Security - requires += ssl Source_Files { SLevel1_Test_i.cpp server.cpp } } -project: client, orbsvcsexe { - depends += Security SSL - libs += TAO_Security - requires += ssl +project(*security client): taoclient, 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 9bab3528979..71352b6ae9c 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -1,4 +1,4 @@ -project(Simple Naming Client) : namingexe { +project(*Client) : namingexe { exename = client Source_Files { diff --git a/TAO/orbsvcs/tests/Time/Time.mpc b/TAO/orbsvcs/tests/Time/Time.mpc index 3aebba805f0..6939095c7fd 100644 --- a/TAO/orbsvcs/tests/Time/Time.mpc +++ b/TAO/orbsvcs/tests/Time/Time.mpc @@ -1,6 +1,3 @@ -project(client): server, namingexe { - depends += CosTime - libs += TAO_CosTime +project(*client): taoserver, namingexe, time { exename = client - comps += Time } diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc index 4923114a3ee..94db6d210e4 100644 --- a/TAO/orbsvcs/tests/Trading/Trading.mpc +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -1,8 +1,6 @@ -project(Trading Test Lib): orbsvcslib { - depends += CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer TAO - libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO +project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany, portableserver { sharedname = TTest - comps += Trader + dynamicflags = TRADING_TEST_BUILD_DLL Source_Files { TT_Info.cpp @@ -11,13 +9,20 @@ project(Trading Test Lib): orbsvcslib { Offer_Importer.cpp Simple_Dynamic.cpp } + Header_Files { + ttest_export.h + TT_Info.h + Service_Type_Exporter.h + Offer_Exporter.h + Offer_Importer.h + Simple_Dynamic.h + } } -project(export test): namingexe { - depends += Trading_Test_Lib CosTrading DynamicAny - libs += TTest TAO_CosTrading TAO_DynamicAny +project(*export test): namingexe, trading, dynamicany { + after += Trading_Test_Lib + libs += TTest exename = export_test - comps += Trader IDL_Files { } @@ -27,11 +32,10 @@ project(export test): namingexe { } } -project(import test): namingexe { - depends += Trading_Test_Lib CosTrading DynamicAny - libs += TTest TAO_CosTrading TAO_DynamicAny +project(*import test): namingexe, trading, dynamicany { + after += Trading_Test_Lib + libs += TTest exename = import_test - comps += Trader IDL_Files { } @@ -41,11 +45,10 @@ project(import test): namingexe { } } -project(colocated test): namingexe { - depends += Trading_Test_Lib CosTrading DynamicAny - libs += TTest TAO_CosTrading TAO_DynamicAny +project(*colocated test): namingexe, trading, dynamicany { + after += Trading_Test_Lib + libs += TTest exename = colocated_test - comps += Trader IDL_Files { } diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc index d30a93ca5f5..3015d82a066 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc @@ -1,14 +1,11 @@ -project: namingexe { - depends += CosNaming - libs += TAO_CosNaming - +project(*server): namingexe, naming { Source_Files { status_i.cpp server.cpp } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/orbsvcs/tests/tests.mwc b/TAO/orbsvcs/tests/tests.mwc new file mode 100644 index 00000000000..d90104a2381 --- /dev/null +++ b/TAO/orbsvcs/tests/tests.mwc @@ -0,0 +1,2 @@ +workspace { +} diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc index 04f5f1b0448..69929f9d4d9 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc @@ -1,3 +1,3 @@ -project(tests svc loader): taoexe, minimum_corba { +project: taoexe, minimum_corba { exename = tests_svc_loader } diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc index e168447bd5a..6724439b7c4 100644 --- a/TAO/performance-tests/Callback/Callback.mpc +++ b/TAO/performance-tests/Callback/Callback.mpc @@ -1,4 +1,4 @@ -project: messaging, strategies { +project(*server): messaging, server, strategies { requires += corba_messaging Source_Files { @@ -8,7 +8,7 @@ project: messaging, strategies { } -project(client): messaging, strategies { +project(*client): messaging, server, strategies { exename = client requires += corba_messaging 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 30410cf5041..f1ee9d20e41 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc @@ -1,7 +1,7 @@ -project(client): server, strategies { +project(*client): taoserver, strategies, dynamicinterface { exename = client - depends += IDL_Cubit_Server DynamicInterface - libs += TAO_DynamicInterface + after += IDL_Cubit_Server_Exe + libs += idlflags += -Gd Source_Files { 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 4b122cd44f5..322c702a920 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(IDL Cubit Server): server, strategies { +project(*Server): taoserver, strategies { idlflags += -Gd Source_Files { @@ -11,7 +11,7 @@ project(IDL Cubit Server): server, strategies { } } -project(client): server, strategies { +project(*client): taoserver, strategies { exename = client idlflags += -Gd @@ -23,7 +23,7 @@ project(client): server, strategies { } } -project(collocation): server, strategies { +project(*collocation): taoserver, strategies { exename = collocation/collocation_test idlflags += -Gd 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 95c692c616f..b330bcc57ef 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, strategies { +project(*server): taoserver, strategies { Source_Files { tmplinst.cpp Timer.cpp @@ -9,7 +9,7 @@ project: server, strategies { } } -project(client): server, strategies { +project(*client): taoserver, strategies { exename = client Source_Files { 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 b4d7798dfeb..51fd4a10708 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: server, strategies { +project(*AMH server): taoserver, strategies { idlflags += -GH requires += ami @@ -8,7 +8,7 @@ project: server, strategies { } } -project: client, strategies { +project(*AMH client): taoclient, strategies { idlflags += -GH requires += ami diff --git a/TAO/performance-tests/Latency/AMI/AMI.mpc b/TAO/performance-tests/Latency/AMI/AMI.mpc index 1e2c79c0468..caea1f693ad 100644 --- a/TAO/performance-tests/Latency/AMI/AMI.mpc +++ b/TAO/performance-tests/Latency/AMI/AMI.mpc @@ -1,4 +1,4 @@ -project: messaging, strategies { +project(*latency server): messaging, taoserver, strategies { idlflags -= -Sc idlflags += -GC requires += ami @@ -10,7 +10,7 @@ project: messaging, strategies { } } -project(client): messaging, strategies { +project(*latency client): messaging, taoserver, strategies { exename = client idlflags -= -Sc idlflags += -GC diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc index b766f9d5502..a54b77e76af 100644 --- a/TAO/performance-tests/Latency/DII/DII.mpc +++ b/TAO/performance-tests/Latency/DII/DII.mpc @@ -1,4 +1,4 @@ -project: server, strategies { +project(*latency server): taoserver, strategies { avoids += minimum_corba Source_Files { @@ -7,10 +7,8 @@ project: server, strategies { } } -project(client): server, strategies { +project(*latency client): taoserver, strategies, dynamicinterface { exename = client - depends += DynamicInterface - libs += TAO_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 822dda7b290..a09345a6fe5 100644 --- a/TAO/performance-tests/Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Latency/DSI/DSI.mpc @@ -1,6 +1,4 @@ -project: server, strategies { - depends += DynamicInterface - libs += TAO_DynamicInterface +project(*latency server): taoserver, strategies, dynamicinterface { avoids += minimum_corba IDL_Files { @@ -12,7 +10,7 @@ project: server, strategies { } } -project: client, strategies { +project(*latency client): taoclient, 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 a073c153a49..11703566fbe 100644 --- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc @@ -1,4 +1,4 @@ -project: server, strategies { +project(*server): taoserver, strategies { avoids += minimum_corba Source_Files { @@ -7,10 +7,8 @@ project: server, strategies { } } -project(client): server, strategies { +project(*client): taoserver, strategies, dynamicinterface { exename = client - depends += DynamicInterface - libs += TAO_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 a4459ae3fde..bcfe645d131 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, strategies { +project(*server): taoserver, strategies { avoids += minimum_corba Source_Files { @@ -7,7 +7,7 @@ project: server, strategies { } } -project: client, strategies { +project(*client): taoclient, 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 c829a60b5aa..0d491f6e4b4 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, strategies { +project(*server): taoserver, strategies { Source_Files { Roundtrip.cpp server.cpp } } -project: client, strategies { +project(*client) : taoclient, 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 4f27fdfdf35..edf85ac9ddc 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: server, strategies { +project(*latency server): taoserver, strategies { Source_Files { Roundtrip.cpp Worker_Thread.cpp @@ -6,7 +6,7 @@ project: server, strategies { } } -project: client, strategies { +project(*latency client): taoclient, strategies { Source_Files { TestC.cpp Client_Task.cpp diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc index e4bfb2a8701..f66ba34400d 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 { +project(*server): taoserver { Source_Files { - Hello.cpp + Memory_Growth.cpp server.cpp } } -project: client { +project(*client): taoclient { 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 076d4d98fd5..e699ea13391 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(create reference): server { +project: taoserver { exename = create_reference } diff --git a/TAO/performance-tests/POA/Demux/Demux.mpc b/TAO/performance-tests/POA/Demux/Demux.mpc index 14c9bf2f374..bbe63e5b7a2 100644 --- a/TAO/performance-tests/POA/Demux/Demux.mpc +++ b/TAO/performance-tests/POA/Demux/Demux.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(*poa server): namingexe { Source_Files { demux_test_server.cpp demux_test_i.cpp @@ -6,7 +6,7 @@ project: namingexe { } } -project(client): namingexe { +project(*poa client): namingexe { exename = client Source_Files { diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc index bce0ae4a4c2..3773b7f6b89 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 { +project(*server): taoserver { Source_Files { Factory.cpp Simple.cpp @@ -6,14 +6,14 @@ project: server { } } -project: client { +project(*client): taoclient { Source_Files { TestC.cpp client.cpp } } -project(collocated): server { +project(*collocated): taoserver { exename = collocated Source_Files { 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 7e0b0afdb61..fafea6dc2b4 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): server { +project(registration): taoserver { exename = registration } diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc index fbdd68ba00e..11f18462fe0 100644 --- a/TAO/performance-tests/Pluggable/Pluggable.mpc +++ b/TAO/performance-tests/Pluggable/Pluggable.mpc @@ -1,4 +1,4 @@ -project: server { +project(*server): taoserver { Source_Files { PP_Test_Server.cpp PP_Test_i.cpp @@ -6,7 +6,7 @@ project: server { } } -project: client { +project(*client) : taoclient { Source_Files { PP_TestC.cpp PP_Test_Client.cpp diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc index 87f832826b4..38eacbb4a8c 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc @@ -1,8 +1,6 @@ -project: taolib_with_idl { - sharedname = RTCORBA_Common - depends += PortableServer - libs += TAO_PortableServer TAO - requires += rt_corba - idlflags += -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h - dllflags = RTCORBA_COMMON_BUILD_DLL +project(RTCORBA_Common): taolib_with_idl, portableserver { + sharedname = RTCORBA_Common + requires += rt_corba + idlflags += -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h + dynamicflags = RTCORBA_COMMON_BUILD_DLL } diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc index d96b93a86ad..01472f35f36 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc @@ -1,18 +1,10 @@ -project: rt_server, strategies { - depends += Common - libs += RTCORBA_Common - includes += ../Common - +project(*server): rt_server, strategies, rtcorbacommon { Source_Files { server.cpp } } -project: rt_client, strategies { - depends += Common - libs += RTCORBA_Common - includes += ../Common - +project(*client): rt_client, strategies, rtcorbacommon { Source_Files { client.cpp } diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc index d96b93a86ad..01472f35f36 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc @@ -1,18 +1,10 @@ -project: rt_server, strategies { - depends += Common - libs += RTCORBA_Common - includes += ../Common - +project(*server): rt_server, strategies, rtcorbacommon { Source_Files { server.cpp } } -project: rt_client, strategies { - depends += Common - libs += RTCORBA_Common - includes += ../Common - +project(*client): rt_client, strategies, rtcorbacommon { Source_Files { client.cpp } diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc index 9a70b67972e..21de87f2cdb 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc @@ -1,11 +1,11 @@ -project: rt_server, messaging_only { +project(*oneways server): rt_server, messaging { Source_Files { test_i.cpp server.cpp } } -project: rt_client, messaging_only { +project(*oneways client): rt_client, messaging { Source_Files { testC.cpp client.cpp diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc index 1fb55017b86..dcd9ab3ae37 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc +++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc @@ -1,10 +1,10 @@ -project: rt_server { +project(*RTCorba server): rt_server { Source_Files { server.cpp } } -project: rt_client { +project(*RTCorba client): rt_client { Source_Files { testC.cpp client.cpp 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 b4d7798dfeb..ddc76182b9b 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: server, strategies { +project(*AMH sequence server): server, strategies { idlflags += -GH requires += ami @@ -8,7 +8,7 @@ project: server, strategies { } } -project: client, strategies { +project(* AMH sequence client): client, strategies { idlflags += -GH requires += ami diff --git a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc index 1e2c79c0468..0238ad5ff7a 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc +++ b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc @@ -1,4 +1,4 @@ -project: messaging, strategies { +project(* sequence server): messaging, strategies { idlflags -= -Sc idlflags += -GC requires += ami @@ -10,7 +10,7 @@ project: messaging, strategies { } } -project(client): messaging, strategies { +project(* sequence client): messaging, strategies { exename = client idlflags -= -Sc idlflags += -GC diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc index 822dda7b290..49c6abac707 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc @@ -1,5 +1,5 @@ -project: server, strategies { - depends += DynamicInterface +project(* sequence server) : server, strategies { + after += DynamicInterface libs += TAO_DynamicInterface avoids += minimum_corba @@ -12,7 +12,7 @@ project: server, strategies { } } -project: client, strategies { +project(* sequence client): client, strategies { avoids += minimum_corba Source_Files { diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc index a073c153a49..011aad78b25 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc @@ -1,4 +1,4 @@ -project: server, strategies { +project(* sequence server): server, strategies { avoids += minimum_corba Source_Files { @@ -7,9 +7,9 @@ project: server, strategies { } } -project(client): server, strategies { +project(* sequence client): server, strategies { exename = client - depends += DynamicInterface + after += DynamicInterface libs += TAO_DynamicInterface avoids += minimum_corba 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 a4459ae3fde..43ec77f05a1 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: server, strategies { +project(* sequence server) : server, strategies { avoids += minimum_corba Source_Files { @@ -7,7 +7,7 @@ project: server, strategies { } } -project: client, strategies { +project(* sequence client): client, strategies { avoids += minimum_corba Source_Files { diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc index c829a60b5aa..aa1d790c1a9 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc @@ -1,11 +1,11 @@ -project: server, strategies { +project(* sequence server): server, strategies { Source_Files { Roundtrip.cpp server.cpp } } -project: client, strategies { +project(* sequence client): client, strategies { Source_Files { TestC.cpp Client_Task.cpp diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc index 4f27fdfdf35..dfa17b43c8d 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc @@ -1,4 +1,4 @@ -project: server, strategies { +project(* sequence server): server, strategies { Source_Files { Roundtrip.cpp Worker_Thread.cpp @@ -6,7 +6,7 @@ project: server, strategies { } } -project: client, strategies { +project(* sequence client): client, strategies { Source_Files { TestC.cpp Client_Task.cpp diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc index b094a1ddbea..87940c2d100 100644 --- a/TAO/performance-tests/Throughput/Throughput.mpc +++ b/TAO/performance-tests/Throughput/Throughput.mpc @@ -1,4 +1,4 @@ -project: server, strategies { +project(*server): taoserver, strategies { Source_Files { Receiver_Factory.cpp Receiver.cpp @@ -6,7 +6,7 @@ project: server, strategies { } } -project: client, strategies { +project(*client):taoclient, strategies { Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/perf.mwc b/TAO/performance-tests/perf.mwc new file mode 100644 index 00000000000..d90104a2381 --- /dev/null +++ b/TAO/performance-tests/perf.mwc @@ -0,0 +1,2 @@ +workspace { +} diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc index ac481e6a418..797c903afa1 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -1,7 +1,5 @@ project : taolib, core { - sharedname = TAO_BiDirGIOP - libs += TAO - dllflags = TAO_BIDIRGIOP_BUILD_DLL - libout = .. - include_dir = tao/BiDir_GIOP + sharedname = TAO_BiDirGIOP + dynamicflags = TAO_BIDIRGIOP_BUILD_DLL + include_dir = tao/BiDir_GIOP } diff --git a/TAO/tao/Domain/Domain.mpc b/TAO/tao/Domain/Domain.mpc index 10e40ec91d9..0293877c1c4 100644 --- a/TAO/tao/Domain/Domain.mpc +++ b/TAO/tao/Domain/Domain.mpc @@ -1,8 +1,5 @@ -project : taolib, core { - depends += IFR_Client PortableServer - sharedname = TAO_Domain - libs += TAO_IFR_Client TAO_PortableServer TAO - dllflags = TAO_DOMAIN_BUILD_DLL - libout = .. - include_dir = tao/Domain +project : taolib, core, ifr_client, portableserver { + sharedname = TAO_Domain + dynamicflags = TAO_DOMAIN_BUILD_DLL + include_dir = tao/Domain } diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc index aa1ce364cc7..ad4087e8540 100644 --- a/TAO/tao/DynamicAny/DynamicAny.mpc +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -1,7 +1,5 @@ project : taolib, core { - sharedname = TAO_DynamicAny - libs += TAO - dllflags = TAO_DYNAMICANY_BUILD_DLL - libout = .. - include_dir = tao/DynamicAny + sharedname = TAO_DynamicAny + dynamicflags = TAO_DYNAMICANY_BUILD_DLL + include_dir = tao/DynamicAny } diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc index 7c4657100ce..d1c16deefe5 100644 --- a/TAO/tao/DynamicInterface/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface/DynamicInterface.mpc @@ -1,7 +1,5 @@ -project : taolib, core { - sharedname = TAO_DynamicInterface - libs += TAO TAO_PortableServer - dllflags = TAO_DYNAMICINTERFACE_BUILD_DLL - libout = .. - include_dir = tao/DynamicInterface +project : taolib, core, portableserver { + sharedname = TAO_DynamicInterface + dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL + include_dir = tao/DynamicInterface } diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc index 98e30f1fad3..48b51d1e144 100644 --- a/TAO/tao/IFR_Client/IFR_Client.mpc +++ b/TAO/tao/IFR_Client/IFR_Client.mpc @@ -1,7 +1,5 @@ project : taolib, core { - sharedname = TAO_IFR_Client - libs += TAO - dllflags = TAO_IFR_CLIENT_BUILD_DLL - libout = .. - include_dir = tao/IFR_Client + sharedname = TAO_IFR_Client + dynamicflags = TAO_IFR_CLIENT_BUILD_DLL + include_dir = tao/IFR_Client } diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc index a32fb318c8e..656d5ab6681 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc @@ -1,7 +1,7 @@ project : taolib, core { sharedname = TAO_IORInterceptor libs += TAO - dllflags = TAO_IORINTERCEPTOR_BUILD_DLL + dynamicflags = TAO_IORINTERCEPTOR_BUILD_DLL libout = .. include_dir = tao/IORInterceptor } diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 9802365e3d8..851577c2b39 100644 --- a/TAO/tao/IORManipulation/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -1,7 +1,5 @@ project : taolib, core { - sharedname = TAO_IORManip - libs += TAO - dllflags = TAO_IORMANIP_BUILD_DLL - libout = .. - include_dir = tao/IORManipulation + sharedname = TAO_IORManip + dynamicflags = TAO_IORMANIP_BUILD_DLL + include_dir = tao/IORManipulation } diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index 3d3f878d6a2..697ff6b0e27 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -1,7 +1,5 @@ project : taolib, core { - sharedname = TAO_IORTable - libs += TAO - dllflags = TAO_IORTABLE_BUILD_DLL - libout = .. - include_dir = tao/IORTable + sharedname = TAO_IORTable + dynamicflags = TAO_IORTABLE_BUILD_DLL + include_dir = tao/IORTable } diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 1ed5d6b9ead..25f9f55a596 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -1,8 +1,5 @@ -project : taolib, core { - depends += PortableServer - sharedname = TAO_Messaging - libs += TAO_Valuetype TAO_PortableServer TAO - dllflags = TAO_MESSAGING_BUILD_DLL - libout = .. - include_dir = tao/Messaging +project : taolib, core, portableserver { + sharedname = TAO_Messaging + dynamicflags = TAO_MESSAGING_BUILD_DLL + include_dir = tao/Messaging } diff --git a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc index 347cd86eb7d..efa8e1a787e 100644 --- a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc +++ b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc @@ -1,7 +1,7 @@ project : valuetype, taolib, core { sharedname = TAO_ObjRefTemplate libs += TAO_Valuetype TAO - dllflags = TAO_ORT_BUILD_DLL + dynamicflags = TAO_ORT_BUILD_DLL libout = .. include_dir = tao/ObjRefTemplate } diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc index aab18066920..30ea485ea25 100644 --- a/TAO/tao/PortableServer/PortableServer.mpc +++ b/TAO/tao/PortableServer/PortableServer.mpc @@ -1,8 +1,5 @@ -project : objreftemplate, iorinterceptor, taolib, core { - depends += Valuetype IORInterceptor ObjRefTemplate - sharedname = TAO_PortableServer - libs += TAO TAO_IORInterceptor TAO_ObjRefTemplate TAO_Valuetype - dllflags = TAO_PORTABLESERVER_BUILD_DLL - libout = .. - include_dir = tao/PortableServer +project : taolib, core { + sharedname = TAO_PortableServer + dynamicflags = TAO_PORTABLESERVER_BUILD_DLL + include_dir = tao/PortableServer } diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc index aa53a5a3cf6..b0339042dea 100644 --- a/TAO/tao/RTCORBA/RTCORBA.mpc +++ b/TAO/tao/RTCORBA/RTCORBA.mpc @@ -1,7 +1,5 @@ project : taolib, core { - sharedname = TAO_RTCORBA - libs += TAO - dllflags = TAO_RTCORBA_BUILD_DLL - libout = .. - include_dir = tao/RTCORBA + sharedname = TAO_RTCORBA + dynamicflags = TAO_RTCORBA_BUILD_DLL + include_dir = tao/RTCORBA } diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc index 60e3e867742..6059840899e 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc @@ -1,8 +1,5 @@ -project : taolib, core { - depends += RTCORBA PortableServer Valuetype - sharedname = TAO_RTPortableServer - libs += TAO_RTCORBA TAO_PortableServer TAO_Valuetype TAO - dllflags = TAO_RTPORTABLESERVER_BUILD_DLL - libout = .. - include_dir = tao/RTPortableServer +project : taolib, core, rtcorba, portableserver { + sharedname = TAO_RTPortableServer + dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL + include_dir = tao/RTPortableServer } diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc index ef3ee2e706d..93934914101 100644 --- a/TAO/tao/SmartProxies/SmartProxies.mpc +++ b/TAO/tao/SmartProxies/SmartProxies.mpc @@ -1,7 +1,5 @@ project : taolib, core { - sharedname = TAO_SmartProxies - libs += TAO - dllflags = TAO_SMARTPROXIES_BUILD_DLL - libout = .. - include_dir = tao/SmartProxies + sharedname = TAO_SmartProxies + dynamicflags = TAO_SMARTPROXIES_BUILD_DLL + include_dir = tao/SmartProxies } diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc index cd50b4873da..95696b79e54 100644 --- a/TAO/tao/Strategies/Strategies.mpc +++ b/TAO/tao/Strategies/Strategies.mpc @@ -1,7 +1,5 @@ project : taolib, core { - sharedname = TAO_Strategies - libs += TAO - dllflags = TAO_STRATEGIES_BUILD_DLL - libout = .. - include_dir = tao/Strategies + sharedname = TAO_Strategies + dynamicflags = TAO_STRATEGIES_BUILD_DLL + include_dir = tao/Strategies } diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc index 9212d9db4bb..c36718a5137 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc @@ -1,8 +1,5 @@ -project : taolib, core { - depends += IFR_Client - sharedname = TAO_TypeCodeFactory - libs += TAO_IFR_Client TAO - dllflags = TAO_TYPECODEFACTORY_BUILD_DLL - libout = .. - include_dir = tao/TypeCodeFactory +project : taolib, core, ifr_client { + sharedname = TAO_TypeCodeFactory + dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL + include_dir = tao/TypeCodeFactory } diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc index b1d3579aed3..b1bf439bac0 100644 --- a/TAO/tao/Valuetype/Valuetype.mpc +++ b/TAO/tao/Valuetype/Valuetype.mpc @@ -1,7 +1,7 @@ project : taolib, core { sharedname = TAO_Valuetype libs += TAO - dllflags = TAO_VALUETYPE_BUILD_DLL + dynamicflags = TAO_VALUETYPE_BUILD_DLL libout = .. include_dir = tao/Valuetype } diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index e0ca35217e9..0dbcc4ff356 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -1,9 +1,8 @@ -project : acelib, taoversion, core { - includes += $(TAO_ROOT) $(TAO_ROOT)/tao - sharedname = TAO - libflags += TAO_AS_STATIC_LIBS - dllflags = TAO_BUILD_DLL - include_dir = tao +project(TAO) : acelib, taoversion, core, tao_output { + includes += $(TAO_ROOT) $(TAO_ROOT)/tao + sharedname = TAO + dynamicflags = TAO_BUILD_DLL + include_dir = tao // Override the defaults due to the // existence of orb.idl @@ -78,6 +77,7 @@ project : acelib, taoversion, core { Environment.cpp Object.cpp LocalObject.cpp + ObjectIDList.cpp ORB.cpp corbafwd.cpp Policy_ForwardC.cpp @@ -96,6 +96,10 @@ project : acelib, taoversion, core { MProfile.cpp Stub.cpp Typecode.cpp + AbstractBase.cpp + ValueBase.cpp + ValueFactory.cpp + ValueFactory_Map.cpp CDR.cpp Client_Strategy_Factory.cpp debug.cpp @@ -111,6 +115,7 @@ project : acelib, taoversion, core { ClientRequestInfo_i.cpp RequestInfo_Util.cpp ClientInterceptorAdapter.cpp + ObjectReferenceTemplateC.cpp PortableInterceptorC.cpp PICurrent.cpp PICurrent_ORBInitializer.cpp @@ -120,7 +125,6 @@ project : acelib, taoversion, core { Codeset_Manager.cpp Codeset_Translator_Factory.cpp ORB_Core.cpp - ORB_Core_Auto_Ptr.cpp Collocation_Resolver.cpp Default_Collocation_Resolver.cpp Stub_Factory.cpp @@ -218,8 +222,9 @@ project : acelib, taoversion, core { Policy_Manager.cpp Buffering_Constraint_Policy.cpp Messaging_PolicyValueC.cpp - ServicesC.cpp + Services.cpp NVList.cpp + IFR_TypeCodes.cpp Dynamic_Adapter.cpp } } diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc index 7ce5af89d34..97a8ef209f0 100644 --- a/TAO/tests/AMI/AMI.mpc +++ b/TAO/tests/AMI/AMI.mpc @@ -1,4 +1,4 @@ -project(AMI Server): messaging { +project(*Server): messaging, taoserver { idlflags -= -Sc idlflags += -GC requires += ami @@ -9,7 +9,7 @@ project(AMI Server): messaging { } } -project(AMI Client): messaging { +project(*Client): messaging, taoserver { exename = client idlflags -= -Sc idlflags += -GC @@ -20,7 +20,7 @@ project(AMI Client): messaging { } } -project(AMI Simple Client): messaging { +project(*Simple Client): messaging, taoserver { exename = simple_client idlflags -= -Sc idlflags += -GC diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc index fca1a0543c7..522cf1f4d8f 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc @@ -1,4 +1,4 @@ -project(AMI Buffering Server): messaging { +project(*Server): messaging, taoserver { idlflags -= -Sc idlflags += -GC @@ -8,7 +8,7 @@ project(AMI Buffering Server): messaging { } } -project(AMI Buffering Client): messaging { +project(*Client): messaging, taoserver { idlflags -= -Sc idlflags += -GC exename = client @@ -20,7 +20,7 @@ project(AMI Buffering Client): messaging { } } -project(AMI Buffering Admin): messaging { +project(*Admin): messaging, taoserver { idlflags -= -Sc idlflags += -GC exename = admin diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc index 8bcd54269aa..89848db55a8 100644 --- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc +++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc @@ -1,4 +1,4 @@ -project(AMI Timeouts Server): messaging { +project(*Server): messaging, taoserver { idlflags -= -Sc idlflags += -GC @@ -9,7 +9,7 @@ project(AMI Timeouts Server): messaging { } } -project(AMI Timeouts Client): messaging { +project(*Client): messaging, taoserver { exename = client idlflags -= -Sc idlflags += -GC diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc index a9f15ef3c6d..02a14f75bd1 100644 --- a/TAO/tests/BiDirectional/BiDirectional.mpc +++ b/TAO/tests/BiDirectional/BiDirectional.mpc @@ -1,18 +1,12 @@ -project(BiDirectional Server): server, minimum_corba { - depends += BiDir_GIOP - libs += TAO_BiDirGIOP - +project(*Server): taoserver, minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp } } -project(BiDirectional Client): server, minimum_corba { - depends += BiDir_GIOP - libs += TAO_BiDirGIOP +project(*Client): taoserver, minimum_corba, bidir_giop { exename = client - 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 a351306e414..02a14f75bd1 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc +++ b/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc @@ -1,18 +1,12 @@ -project(BiDirectional Nested Upcall Server): server, minimum_corba { - depends += BiDir_GIOP - libs += TAO_BiDirGIOP - +project(*Server): taoserver, minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp } } -project(BiDirectional Nested Upcall Client): server, minimum_corba { - depends += BiDir_GIOP - libs += TAO_BiDirGIOP +project(*Client): taoserver, minimum_corba, bidir_giop { exename = client - 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 b137cc1ad71..ab5e4413354 100644 --- a/TAO/tests/Big_Oneways/Big_Oneways.mpc +++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc @@ -1,4 +1,4 @@ -project(Big Oneways Server): server { +project(*Server): taoserver { Source_Files { Coordinator.cpp Session_Control.cpp @@ -6,7 +6,7 @@ project(Big Oneways Server): server { } } -project(Big Oneways Client): server { +project(*Client): taoserver { exename = client Source_Files { Peer.cpp diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc index 5c70fce7d72..03dda1af90a 100644 --- a/TAO/tests/Big_Reply/Big_Reply.mpc +++ b/TAO/tests/Big_Reply/Big_Reply.mpc @@ -1,11 +1,11 @@ -project(Big Reply Server): server { +project(*Server): taoserver { Source_Files { Big_Reply_i.cpp server.cpp } } -project(Big Reply Client): server { +project(*Client): taoserver { exename = client Source_Files { Client_Task.cpp diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc index b825823f8b1..89f85954cea 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(Big Request Muxing Server): messaging, corba_messaging { +project(*Server): taoserver, messaging, corba_messaging { Source_Files { Payload_Receiver.cpp server.cpp } } -project(Big Request Muxing Client): messaging, corba_messaging { +project(*Client): taoclient, messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc index 0744a4ad311..c56ce775286 100644 --- a/TAO/tests/Big_Twoways/Big_Twoways.mpc +++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc @@ -1,4 +1,4 @@ -project(Big Twoways Server): server { +project(*Server): taoserver { Source_Files { Coordinator.cpp Session_Control.cpp @@ -6,7 +6,7 @@ project(Big Twoways Server): server { } } -project(Big Twoways Client): server { +project(*Client): taoserver { exename = client Source_Files { Peer.cpp diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc index b7584804121..3a4fc31ac23 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc @@ -1,11 +1,11 @@ -project(Blocking Sync None Server): messaging, corba_messaging { +project(*Server): taoserver, messaging, corba_messaging { Source_Files { Blocking_Sync_None.cpp server.cpp } } -project(Blocking Sync None Client): messaging, corba_messaging { +project(*Client): taoclient, messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/CDR/CDR.mpc b/TAO/tests/CDR/CDR.mpc index 6e60731e46a..87b6d97736f 100644 --- a/TAO/tests/CDR/CDR.mpc +++ b/TAO/tests/CDR/CDR.mpc @@ -1,4 +1,4 @@ -project(CDR Alignment) : taoexe { +project(*Alignment) : taoexe { exename = alignment Source_Files { @@ -6,7 +6,7 @@ project(CDR Alignment) : taoexe { } } -project(CDR Allocator) : taoexe { +project(*Allocator) : taoexe { exename = allocator Source_Files { @@ -14,7 +14,7 @@ project(CDR Allocator) : taoexe { } } -project(CDR Basic Types) : taoexe { +project(*Basic Types) : taoexe { exename = basic_types Source_Files { @@ -22,7 +22,7 @@ project(CDR Basic Types) : taoexe { } } -project(CDR Growth) : taoexe { +project(*Growth) : taoexe { exename = growth Source_Files { @@ -30,7 +30,7 @@ project(CDR Growth) : taoexe { } } -project(CDR Octet Sequence) : taoexe { +project(*Octet Sequence) : taoexe { exename = octet_sequence Source_Files { @@ -38,7 +38,7 @@ project(CDR Octet Sequence) : taoexe { } } -project(CDR Tc) : taoexe { +project(*Tc) : taoexe { exename = tc Source_Files { diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc index 9dbace6dc65..224d880b5a4 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(Cache Growth Test Server): server { +project(*Server): taoserver { Source_Files { Hello.cpp server.cpp } } -project(Cache Growth Test Client): client { +project(*Client): taoclient { 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 f48a848d484..10d2a8cc2a0 100644 --- a/TAO/tests/Client_Leaks/Client_Leaks.mpc +++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc @@ -1,4 +1,4 @@ -project(Client Leaks Server): server { +project(*Server): taoserver { Source_Files { Process_Factory.cpp Startup_Callback.cpp @@ -7,7 +7,7 @@ project(Client Leaks Server): server { } } -project(Client Leaks Client): client { +project(*Client): taoclient { Source_Files { TestC.cpp Client_Task.cpp @@ -15,7 +15,7 @@ project(Client Leaks Client): client { } } -project(Client Leaks Child): server { +project(*Child): taoserver { exename = child Source_Files { Process.cpp diff --git a/TAO/tests/Codec/Codec.mpc b/TAO/tests/Codec/Codec.mpc index db8ecb3fefc..6786698646b 100644 --- a/TAO/tests/Codec/Codec.mpc +++ b/TAO/tests/Codec/Codec.mpc @@ -1,4 +1,4 @@ -project(Codec Client): client { +project(*Client): taoclient { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc index 0c19ba79430..d785588c6b2 100644 --- a/TAO/tests/Collocation/Collocation.mpc +++ b/TAO/tests/Collocation/Collocation.mpc @@ -1,20 +1,19 @@ -project(Collocation Test Stub): taolib_with_idl { - sharedname = Collocation_Test_Stub - libs += TAO - idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd - dllflags = MY_STUB_BUILD_DLL +project(*Test Stub): taolib_with_idl { + sharedname = Collocation_Test_Stub + idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd + dynamicflags = MY_STUB_BUILD_DLL Source_Files { DiamondC.cpp } } -project(Collocation Diamond) : taolib_with_idl { - depends += PortableServer Collocation_Test_Stub - sharedname = Collocation_Diamond - libs += Collocation_Test_Stub TAO_PortableServer TAO - idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd - dllflags = DIAMOND_BUILD_DLL +project(*Diamond) : taolib_with_idl, portableserver { + after += Collocation_Test_Stub + sharedname = Collocation_Diamond + libs += Collocation_Test_Stub + idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd + dynamicflags = DIAMOND_BUILD_DLL Source_Files { Diamond_i.cpp @@ -22,8 +21,8 @@ project(Collocation Diamond) : taolib_with_idl { } } -project(Collocation Server) : strategies, server { - depends += Collocation_Test_Stub Collocation_Diamond +project(*Server) : strategies, taoserver { + after += Collocation_Test_Stub Collocation_Diamond exename = Collocation libs += Collocation_Test_Stub Collocation_Diamond diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc index 950c6b19fc4..224d880b5a4 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(Connect Strategy Test Server): server { +project(*Server): taoserver { Source_Files { Hello.cpp server.cpp } } -project(Connect Strategy Test Client): client { +project(*Client): taoclient { 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 05c15a94440..89dcd95be73 100644 --- a/TAO/tests/Connection_Purging/Connection_Purging.mpc +++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc @@ -1,11 +1,11 @@ -project(Connection Purging Server): strategies, server { +project(*Server): strategies, taoserver { Source_Files { test_i.cpp server.cpp } } -project(Connection Purging Client): strategies, client { +project(*Client): strategies, taoclient { 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 0ac01c5d487..87afbec141d 100644 --- a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc +++ b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc @@ -1,4 +1,4 @@ -project(client): messaging { +project(*client): messaging, taoserver { exename = client Source_Files { diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc index abd8acfceab..53f8d946646 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(Crash On Write Server): server { +project(*Server): taoserver { Source_Files { Oneway_Receiver.cpp Crash_Task.cpp @@ -6,7 +6,7 @@ project(Crash On Write Server): server { } } -project(Crash On Write Client): client { +project(*Client): taoclient { 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 f9c268aaadf..791650d5867 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc @@ -1,11 +1,11 @@ -project(Crashed Callback Server): messaging, corba_messaging { +project(*Server): taoserver, messaging, corba_messaging { Source_Files { Service.cpp server.cpp } } -project(Crashed Callback Client): messaging, corba_messaging { +project(*Client): taoserver, messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc index 5fd2045b809..039b402d33f 100644 --- a/TAO/tests/DLL_ORB/DLL_ORB.mpc +++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc @@ -1,8 +1,6 @@ -project(DLL ORB Test Client Module): taolib_with_idl { - sharedname = Test_Client_Module - libs += TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h - dllflags = TEST_CLIENT_MODULE_BUILD_DLL +project(*Test Client Module): taolib_with_idl { + sharedname = Test_Client_Module + dynamicflags = TEST_CLIENT_MODULE_BUILD_DLL Source_Files { TestC.cpp @@ -10,12 +8,9 @@ project(DLL ORB Test Client Module): taolib_with_idl { } } -project(DLL ORB Test Server Module) : taolib_with_idl { - depends += PortableServer - sharedname = Test_Server_Module - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h - dllflags = TEST_SERVER_MODULE_BUILD_DLL +project(*Test Server Module) : taolib_with_idl, portableserver { + sharedname = Test_Server_Module + dynamicflags = TEST_SERVER_MODULE_BUILD_DLL Source_Files { Test_Server_Module.cpp @@ -23,7 +18,7 @@ project(DLL ORB Test Server Module) : taolib_with_idl { } } -project(DLL ORB Server) : taoexe { +project(*Server) : taoexe { exename = server IDL_Files { } @@ -33,7 +28,7 @@ project(DLL ORB Server) : taoexe { } } -project(DLL ORB Client): client { +project(*Client): taoclient { IDL_Files { } diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc index f7fdc4a965e..30596502ace 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc +++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc @@ -1,29 +1,20 @@ -project(DSI Gateway Server): messaging, minimum_corba { - depends += Dynamic_Interface - libs += TAO_DynamicInterface - +project(*Server): taoserver, messaging, minimum_corba, dynamicinterface { Source_Files { test_i.cpp server.cpp } } -project(DSI Gateway Client): messaging, minimum_corba { +project(*Client): taoclient, messaging, minimum_corba, dynamicinterface { exename = client - depends += Dynamic_Interface - libs += TAO_DynamicInterface - Source_Files { testC.cpp client.cpp } } -project(DSI Gateway Gateway): messaging, minimum_corba { +project(*Gateway): taoserver, messaging, minimum_corba, dynamicinterface { exename = gateway - depends += Dynamic_Interface - libs += TAO_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 5e48cfe2a61..f79b581d2ed 100644 --- a/TAO/tests/DynAny_Test/DynAny_Test.mpc +++ b/TAO/tests/DynAny_Test/DynAny_Test.mpc @@ -1,6 +1,4 @@ -project(DynAny Basic Test): server { - depends += DynamicAny - libs += TAO_DynamicAny +project(*Basic): taoserver, 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 178c20336cd..97ea73757b1 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(Explicit Event Loop Server): server { +project(*Server): taoserver { Source_Files { server.cpp } } -project(Explicit Event Loop Client): client { +project(*Client): taoclient { Source_Files { timeC.cpp client.cpp diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc index 0e40233709d..35da46a474b 100644 --- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc +++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc @@ -1,4 +1,4 @@ -project(Exposed Policies Server): strategies, rt_server { +project(*Server): strategies, rt_server { Source_Files { Policy_Tester.cpp Policy_Verifier.cpp @@ -7,7 +7,7 @@ project(Exposed Policies Server): strategies, rt_server { } } -project(Exposed Policies Client): strategies, rt_server { +project(*Client): strategies, rt_server { exename = client Source_Files { diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc index dea017709bc..8cb0336f7a0 100644 --- a/TAO/tests/Faults/Faults.mpc +++ b/TAO/tests/Faults/Faults.mpc @@ -1,4 +1,4 @@ -project(Faults Server): server, minimum_corba { +project(*Server): taoserver, minimum_corba { IDL_Files { test.idl } @@ -11,7 +11,7 @@ project(Faults Server): server, minimum_corba { } } -project(Faults Middle): server, minimum_corba { +project(*Middle): taoserver, minimum_corba { exename = middle IDL_Files { @@ -26,7 +26,7 @@ project(Faults Middle): server, minimum_corba { } } -project(Faults Client): server, minimum_corba { +project(*Client): taoserver, minimum_corba { exename = client IDL_Files { @@ -41,7 +41,7 @@ project(Faults Client): server, minimum_corba { } } -project(Faults Ping): server, minimum_corba { +project(*Ping): taoserver, minimum_corba { exename = ping IDL_Files { @@ -56,7 +56,7 @@ project(Faults Ping): server, minimum_corba { } } -project(Faults Pong): server, minimum_corba { +project(*Pong): taoserver, minimum_corba { exename = pong IDL_Files { diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index 35ebd5156e5..be22c626b2d 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -1,11 +1,11 @@ -project(File IO Server): server, minimum_corba { +project(*Server): taoserver, minimum_corba { Source_Files { File_i.cpp server.cpp } } -project(File IO Client): client, minimum_corba { +project(*Client): taoclient, minimum_corba { Source_Files { FileC.cpp client.cpp diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc index feb2256f248..978c8f4a0b9 100644 --- a/TAO/tests/Forwarding/Forwarding.mpc +++ b/TAO/tests/Forwarding/Forwarding.mpc @@ -1,14 +1,11 @@ -project(Forwarding Server): server { - depends += IORTable - libs += TAO_IORTable - +project(*Server): taoserver, iortable { Source_Files { test_i.cpp server.cpp } } -project(Forwarding Client): client { +project(*Client): taoclient { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc index f505888c4e3..224d880b5a4 100644 --- a/TAO/tests/Hello/Hello.mpc +++ b/TAO/tests/Hello/Hello.mpc @@ -1,11 +1,11 @@ -project(Hello Server): server { +project(*Server): taoserver { Source_Files { Hello.cpp server.cpp } } -project(Hello Client): client { +project(*Client): taoclient { Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index 8140f64dc8a..390f9343ab3 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -1,4 +1,4 @@ -project(IDL Test Main): server { +project(*Main): taoserver { exename = main IDL_Files { @@ -23,6 +23,7 @@ project(IDL Test Main): server { sequence.idl typedef.idl union.idl + repo_id_mod.idl } Source_Files { @@ -58,6 +59,8 @@ project(IDL Test Main): server { typedefS.cpp unionC.cpp unionS.cpp + repo_id_modC.cpp + repo_id_modS.cpp namespace_check.cpp main.cpp } diff --git a/TAO/tests/IORManipulation/IORManipulation.mpc b/TAO/tests/IORManipulation/IORManipulation.mpc index b14fabf7ae3..cf5f9bd7565 100644 --- a/TAO/tests/IORManipulation/IORManipulation.mpc +++ b/TAO/tests/IORManipulation/IORManipulation.mpc @@ -1,5 +1,3 @@ -project(IORManipulation IORTest) : taoexe { - depends += IORManipulation - libs += TAO_IORManip +project(*IORTest) : taoexe, iormanip { exename = IORTest } diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc index 43f4c87c21d..f3c8befcfee 100644 --- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc +++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc @@ -1,8 +1,5 @@ -project(InterOp-Naming Server): server { - depends += IORTable - libs += TAO_IORTable +project(*Server): taoserver, iortable { exename = INS_test_server - Source_Files { INS_i.cpp Server_i.cpp @@ -10,7 +7,7 @@ project(InterOp-Naming Server): server { } } -project(InterOp-Naming Client): client { +project(*Client): taoclient { exename = INS_test_client Source_Files { diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc index 7293bf3e412..89dcd95be73 100644 --- a/TAO/tests/Leader_Followers/Leader_Followers.mpc +++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc @@ -1,11 +1,11 @@ -project(Leader Followers Server): strategies, server { +project(*Server): strategies, taoserver { Source_Files { test_i.cpp server.cpp } } -project(Leader Followers Client): strategies, client { +project(*Client): strategies, taoclient { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc index 52dd4d4ff86..2e1ee65d664 100644 --- a/TAO/tests/LongUpcalls/LongUpcalls.mpc +++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc @@ -1,4 +1,4 @@ -project(Long Upcalls Server): messaging { +project(*Server): messaging, taoserver { idlflags -= -Sc idlflags += -GC exename = blocking_server @@ -9,7 +9,7 @@ project(Long Upcalls Server): messaging { } } -project(Long Upcalls Client): messaging { +project(*Client): messaging, taoserver { idlflags -= -Sc idlflags += -GC exename = blocking_client @@ -20,7 +20,7 @@ project(Long Upcalls Client): messaging { } } -project(Long Upcalls AMI Server): messaging { +project(*AMI Server): messaging, taoserver { idlflags -= -Sc idlflags += -GC exename = ami_server @@ -31,7 +31,7 @@ project(Long Upcalls AMI Server): messaging { } } -project(Long Upcalls AMI Client): messaging { +project(*AMI Client): messaging, taoserver { idlflags -= -Sc idlflags += -GC exename = ami_client diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc index 688969a444d..322ca29c620 100644 --- a/TAO/tests/MProfile/MProfile.mpc +++ b/TAO/tests/MProfile/MProfile.mpc @@ -1,17 +1,11 @@ -project(MProfile Server): server { - depends += IORManipulation - libs += TAO_IORManip - +project(*Server): taoserver, iormanip { Source_Files { test_i.cpp server.cpp } } -project(MProfile Client): client { - depends += IORManipulation - libs += TAO_IORManip - +project(*Client): taoclient, 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 0f3fde88777..014dee61b55 100644 --- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc +++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc @@ -1,17 +1,11 @@ -project(MProfile Connection Timeout Server): server { - depends += IORManipulation Messaging - libs += TAO_IORManip Messaging - +project(*Server): taoserver, messaging, iormanip { Source_Files { test_i.cpp server.cpp } } -project(MProfile Connection Timeout Client): client { - depends += IORManipulation Messaging - libs += TAO_IORManip TAO_Messaging - +project(*Client): taoclient, 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 65a054eec08..70eceb0b291 100644 --- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc +++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc @@ -1,22 +1,19 @@ -project(MProfile Forwarding Server): server, minimum_corba { +project(*Server): taoserver, minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(MProfile Forwarding Client): client, minimum_corba { +project(*Client): taoclient, minimum_corba { Source_Files { testC.cpp client.cpp } } -project(MProfile Forwarding Manager): server, minimum_corba { - depends += IORManipulation - libs += TAO_IORManip +project(*Manager): taoserver, minimum_corba, iormanip { exename = Manager - 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 8e4df45cabd..887e9a5f9e0 100644 --- a/TAO/tests/MT_BiDir/MT_BiDir.mpc +++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc @@ -1,6 +1,4 @@ -project(MT BiDir Server): server, minimum_corba { - depends += BiDir_GIOP - libs += TAO_BiDirGIOP +project(*Server): taoserver, minimum_corba, bidir_giop { Source_Files { ReceiverC.cpp SenderC.cpp @@ -11,9 +9,7 @@ project(MT BiDir Server): server, minimum_corba { } } -project(MT BiDir Client): server, minimum_corba { - depends += BiDir_GIOP - libs += TAO_BiDirGIOP +project(*Client): taoserver, minimum_corba, bidir_giop { exename = client Source_Files { SenderC.cpp diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc index d7ca4735112..e58d1769369 100644 --- a/TAO/tests/MT_Client/MT_Client.mpc +++ b/TAO/tests/MT_Client/MT_Client.mpc @@ -1,11 +1,11 @@ -project(MT Client Server): server { +project(*Server): taoserver { Source_Files { test_i.cpp server.cpp } } -project(MT Client Client): client { +project(*Client): taoclient { 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 c03595ecc1d..e58d1769369 100644 --- a/TAO/tests/MT_Server/MT_Server.mpc +++ b/TAO/tests/MT_Server/MT_Server.mpc @@ -1,11 +1,11 @@ -project(MT Server Server): server { +project(*Server): taoserver { Source_Files { test_i.cpp server.cpp } } -project(MT Server Client): client { +project(*Client): taoclient { 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 6be27f85c11..ae74fd0a91f 100644 --- a/TAO/tests/MT_Timeout/MT_Timeout.mpc +++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc @@ -1,4 +1,4 @@ -project(MT Timeout Server): messaging, corba_messaging { +project(*Server): messaging, taoserver, corba_messaging { Source_Files { Sleep_Service.cpp Server_Task.cpp @@ -6,7 +6,7 @@ project(MT Timeout Server): messaging, corba_messaging { } } -project(MT Timeout Client): messaging, corba_messaging { +project(*Client): messaging, taoserver, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc index d734371cd30..ab44a516208 100644 --- a/TAO/tests/Multiple/Multiple.mpc +++ b/TAO/tests/Multiple/Multiple.mpc @@ -1,4 +1,4 @@ -project(Multiple Server): server { +project(*Server): taoserver { idlflags += -Gd Source_Files { @@ -8,7 +8,7 @@ project(Multiple Server): server { } } -project(Multiple Client): server { +project(*Client): taoserver { exename = client idlflags += -Gd diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc index 4d0d388f99f..1dc4055e416 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc @@ -1,10 +1,10 @@ -project(Multiple Inheritance Server): server { +project(*Server): taoserver { Source_Files { server.cpp } } -project(Multiple Inheritance Client): client { +project(*Client): taoclient { 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 8e19d7576f1..e58d1769369 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(Muxed GIOP Versions Server): server { +project(*Server): taoserver { Source_Files { test_i.cpp server.cpp } } -project(Muxed GIOP Versions Client): client { +project(*Client): taoclient { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc index 9f74171ce78..1c5f257faa2 100644 --- a/TAO/tests/Muxing/Muxing.mpc +++ b/TAO/tests/Muxing/Muxing.mpc @@ -1,4 +1,4 @@ -project(Muxing Server): server { +project(*Server): taoserver { Source_Files { Receiver.cpp Server_Task.cpp @@ -6,7 +6,7 @@ project(Muxing Server): server { } } -project(Muxing Client): server { +project(*Client): taoserver { exename = client Source_Files { diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc index 26cb90ce585..97a16abeef9 100644 --- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc +++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc @@ -1,4 +1,4 @@ -project(Native Exceptions Server): server { +project(*Server): taoserver { idlflags = -Ge 0 -Sc requires += exceptions @@ -8,7 +8,7 @@ project(Native Exceptions Server): server { } } -project(Native Exceptions Client): client { +project(*Client): taoclient { 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 46a1f4985de..9f73fc1890e 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc @@ -1,11 +1,11 @@ -project(Nested Upcall MT Client Test Server): server { +project(*Nested Upcall Server): taoserver { Source_Files { MT_Object_i.cpp server.cpp } } -project(Nested Upcall MT Client Test Client): server { +project(*Nested Upcall Client): taoserver { exename = client Source_Files { diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc index 9549cf50db1..67b662125c4 100644 --- a/TAO/tests/NestedUpcall/Simple/Simple.mpc +++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc @@ -1,11 +1,11 @@ -project(Nested Upcall Simple Server): server { +project(*Nested Upcall Server): taoserver { Source_Files { server_i.cpp server.cpp } } -project(Nested Upcall Simple Client): server { +project(*Nested Upcall Client): taoserver { exename = client Source_Files { diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc index e27e88dc7c3..d1ad918cc67 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc +++ b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.mpc @@ -1,4 +1,4 @@ -project(Nested Upcall Triangle Test Server_A): server { +project(*Nested Upcall Server_A): taoserver { exename = server_A Source_Files { @@ -7,7 +7,7 @@ project(Nested Upcall Triangle Test Server_A): server { } } -project(Nested Upcall Triangle Test Server_B): server { +project(*Nested Upcall Server_B): taoserver { exename = server_B Source_Files { @@ -16,7 +16,7 @@ project(Nested Upcall Triangle Test Server_B): server { } } -project(Nested Upcall Triangle Test Initiator): server { +project(*Nested Upcall Initiator): taoserver { exename = initiator Source_Files { diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc index 22ab032723b..528a51876a4 100644 --- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc +++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc @@ -1,11 +1,11 @@ -project(Nested Event Loop Server): strategies, server { +project(*Server): strategies, taoserver { Source_Files { test_i.cpp server.cpp } } -project(Nested Event Loop Client): strategies, server { +project(*Client): strategies, taoserver { exename = client Source_Files { diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc index 72f15e7eb39..1bfdec1e5b2 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(Nested Upcall Crash Server): messaging, corba_messaging { +project(*Server): messaging, taoserver, corba_messaging { Source_Files { Clock_Ticks.cpp Server_Peer.cpp @@ -6,7 +6,7 @@ project(Nested Upcall Crash Server): messaging, corba_messaging { } } -project(Nested Upcall Crash Scavenger): messaging, corba_messaging { +project(*Scavenger): messaging, taoserver, corba_messaging { exename = scavenger Source_Files { @@ -14,7 +14,7 @@ project(Nested Upcall Crash Scavenger): messaging, corba_messaging { } } -project(Nested Upcall Crash Client): messaging, corba_messaging { +project(*Client): messaging, taoserver, corba_messaging { exename = client Source_Files { 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 70d4d8f8753..e58d1769369 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(No Server MT Connect Test Server): server { +project(*Server): taoserver { Source_Files { test_i.cpp server.cpp } } -project(No Server MT Connect Test Client): client { +project(*Client): taoclient { 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 e175ea939c7..df56afdcf42 100644 --- a/TAO/tests/OBV/Any/OBV_Any.mpc +++ b/TAO/tests/OBV/Any/OBV_Any.mpc @@ -1,11 +1,15 @@ -project(OBV Any Server): server { +project(*Server): taoserver { + idlflags += -Gv + Source_Files { AnyS_impl.cpp server.cpp } } -project(OBV Any Client): client { +project(*Client): taoclient { + idlflags += -Gv + 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 26523c1ee6d..e40b6e9da77 100644 --- a/TAO/tests/OBV/Factory/OBV_Factory.mpc +++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc @@ -1,4 +1,6 @@ -project(OBV Factory Server): server { +project(*Server): taoserver { + idlflags += -Gv + Source_Files { FactoryC_impl.cpp FactoryS_impl.cpp @@ -6,7 +8,9 @@ project(OBV Factory Server): server { } } -project(OBV Factory Client): client { +project(*Client): taoclient { + idlflags += -Gv + 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 b922b13435b..9c6f5b58de7 100644 --- a/TAO/tests/OBV/Forward/OBV_Forward.mpc +++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc @@ -1,11 +1,15 @@ -project(OBV Forward Server): server { +project(*Server): taoserver { + idlflags += -Gv + Source_Files { Test_impl.cpp server.cpp } } -project(OBV Forward Client): client { +project(*Client): taoclient { + idlflags += -Gv + 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 e02b5948f67..0c092bbe89c 100644 --- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc +++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc @@ -1,14 +1,15 @@ -project(OBV TC Alignment Server): server { +project(*Server): taoserver { exename = server Source_Files { testS.cpp + testC.cpp test_i.cpp server.cpp } } -project(OBV TC Alignment Client): client { +project(*Client): taoclient { exename = client Source_Files { diff --git a/TAO/tests/ORB_destroy/ORB_destroy.mpc b/TAO/tests/ORB_destroy/ORB_destroy.mpc index 823686fffcb..4aa782275ba 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.mpc +++ b/TAO/tests/ORB_destroy/ORB_destroy.mpc @@ -1,4 +1,4 @@ -project(ORB Destroy): server { +project: taoserver { exename = ORB_destroy } diff --git a/TAO/tests/ORB_init/ORB_init.mpc b/TAO/tests/ORB_init/ORB_init.mpc index a09e2ad1f3e..b464f07b441 100644 --- a/TAO/tests/ORB_init/ORB_init.mpc +++ b/TAO/tests/ORB_init/ORB_init.mpc @@ -1,4 +1,4 @@ -project(ORB Init): taoexe { +project: taoexe { exename = ORB_init } diff --git a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc index 7cb8fde0332..ac968648076 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(ORB Init Portspan Server): server { +project(*Server): taoserver { } diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.mpc b/TAO/tests/ORB_shutdown/Foo_Bar.mpc index 210998ca79e..0f74dafe49d 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): server { +project(ORB Shutdown Server): taoserver { Source_Files { Foo_Bar.cpp server.cpp diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc index 77bf700a045..1d98de2569c 100644 --- a/TAO/tests/ORT/ORT.mpc +++ b/TAO/tests/ORT/ORT.mpc @@ -1,4 +1,4 @@ -project(ORT Server): server { +project(*Server): taoserver { requires += interceptors idlflags += -I$(TAO_ROOT) -Gv @@ -15,7 +15,7 @@ project(ORT Server): server { } } -project(ORT Client): client { +project(*Client): taoclient { 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 2c787ffd834..1c1c6eceb8b 100644 --- a/TAO/tests/Object_Loader/Object_Loader.mpc +++ b/TAO/tests/Object_Loader/Object_Loader.mpc @@ -1,9 +1,6 @@ -project(Object Loader Test): taolib_with_idl { - sharedname = Test_DLL - depends += PortableServer - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h - dllflags = OLT_BUILD_DLL +project(*Test): taolib_with_idl, portableserver { + sharedname = Test_DLL + dynamicflags = OLT_BUILD_DLL Source_Files { Test_i.cpp @@ -11,7 +8,7 @@ project(Object Loader Test): taolib_with_idl { } } -project(Object Loader Driver): server { +project(*Driver): taoserver { exename = driver Source_Files { diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc index 638e42edc52..e1549964c5e 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(Objref Sequence Test Server): server { +project(*Server): taoserver { Source_Files { server.cpp } } -project(Objref Sequence Test Client): client { +project(*Client): taoclient { Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc index 98f055558ee..2c388cb109e 100644 --- a/TAO/tests/OctetSeq/OctetSeq.mpc +++ b/TAO/tests/OctetSeq/OctetSeq.mpc @@ -1,18 +1,18 @@ -project(OctetSeq Server): server { +project(*Server): taoserver { Source_Files { test_i.cpp server.cpp } } -project(OctetSeq Client): client { +project(*Client): taoclient { Source_Files { testC.cpp client.cpp } } -project(OctetSeq OctetSeq): taoexe { +project(*OctetSeq): taoexe { exename = OctetSeq Source_Files { diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc index 466188d54b8..5d58c32e4d0 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc @@ -1,11 +1,11 @@ -project(Oneway Buffering Server): messaging, corba_messaging { +project(*Server): messaging, taoserver, corba_messaging { Source_Files { Oneway_Buffering.cpp server.cpp } } -project(Oneway Buffering Client): messaging, corba_messaging { +project(*Client): messaging, taoserver, corba_messaging { exename = client Source_Files { @@ -14,7 +14,7 @@ project(Oneway Buffering Client): messaging, corba_messaging { } } -project(Oneway Buffering Admin): messaging, corba_messaging { +project(*Admin): messaging, taoserver, corba_messaging { exename = admin Source_Files { diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc index adb0efef486..fd11e657858 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(Oneways Invoking Twoways Server): server { +project(*Server): taoserver { Source_Files { Server_Task.cpp Sender_i.cpp @@ -6,7 +6,7 @@ project(Oneways Invoking Twoways Server): server { } } -project(Oneways Invoking Twoways Client): server { +project(*Client): taoserver { exename = client Source_Files { diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc index 794a85513fa..5a360da82df 100644 --- a/TAO/tests/POA/Current/Current.mpc +++ b/TAO/tests/POA/Current/Current.mpc @@ -1,3 +1,3 @@ -project(POA Current): server { +project(POA Current): taoserver { exename = Current } diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc index adeab7fe638..c8372eac5e9 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc +++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc @@ -1,3 +1,3 @@ -project(POA Default Servant): server { +project(POA Default Servant): taoserver { exename = Default_Servant } diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc index c33a12b5158..ab5fa6d562e 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.mpc +++ b/TAO/tests/POA/Etherealization/Etherealization.mpc @@ -1,3 +1,3 @@ -project(POA Etherealization): server, minimum_corba { +project(POA Etherealization): taoserver, minimum_corba { exename = Etherealization } 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 87f3f24f832..005c4729836 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,3 @@ -project(POA Excessive Object Deactivations): server { +project(POA Excessive Object Deactivations): taoserver { exename = Excessive_Object_Deactivations } diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc index d1cdf79a190..cc20a8ce1c2 100644 --- a/TAO/tests/POA/Identity/Identity.mpc +++ b/TAO/tests/POA/Identity/Identity.mpc @@ -1,3 +1,3 @@ -project(POA Identity): server { +project(POA Identity): taoserver { exename = Identity } 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 95be69e35fc..b2023cd2b8c 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc @@ -1,3 +1,3 @@ -project(POA MT Servant Locator): server { +project(POA MT Servant Locator): taoserver { exename = MT_Servant_Locator } 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 de8665dd42a..d5c56e620c6 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,3 @@ -project(Nested Non Servant Upcalls): server { +project(Nested Non Servant Upcalls): server, minimum_corba { exename = Nested_Non_Servant_Upcalls } 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 e1ed4582136..f07dc96ddb7 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,3 @@ -project(POA Non Servant Upcalls): server { +project(POA Non Servant Upcalls): taoserver { exename = Non_Servant_Upcalls } diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc index 0a1e48d38af..fafe1e95a4d 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc @@ -1,3 +1,3 @@ -project(POA Object Reactivation): server { +project(POA Object Reactivation): taoserver { exename = Object_Reactivation } diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc index 1e69e041e19..c0b69b2d352 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc @@ -1,3 +1,3 @@ -project(POA Destruction): server { +project(POA Destruction): taoserver { exename = POA_Destruction } diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc index 66cb06f5691..6f40c6c3bf5 100644 --- a/TAO/tests/POA/Policies/Policies.mpc +++ b/TAO/tests/POA/Policies/Policies.mpc @@ -1,3 +1,3 @@ -project(POA Policies): server { +project(POA Policies): taoserver { exename = Policies } 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 f94ee3c90f2..1ad01c3e08a 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,3 @@ -project(POA Single Threaded POA): server, minimum_corba { +project(POA Single Threaded POA): taoserver, minimum_corba { exename = Single_Threaded_POA } 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 2f4a400ac3e..2dbe599e6c5 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,3 @@ -project(POA Wait For Completion): server { +project(POA Wait For Completion): taoserver { exename = wait_for_completion } diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index a1651fe1dd2..da8ef0020ab 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -1,15 +1,12 @@ -project(Param Test Server): messaging, minimum_corba { +project(*Server): messaging, taoserver, minimum_corba { Source_Files { - param_testC.cpp - param_testS.cpp param_test_i.cpp + tmplinst.cpp server.cpp } } -project(Param Test Client): messaging, minimum_corba { - depends += DynamicInterface - libs += TAO_DynamicInterface +project(*Client): messaging, taoserver, minimum_corba, dynamicinterface { exename = client Source_Files { @@ -18,6 +15,7 @@ project(Param Test Client): messaging, minimum_corba { options.cpp results.cpp helper.cpp + tmplinst.cpp any.cpp bd_long_seq.cpp bd_short_seq.cpp @@ -58,7 +56,7 @@ project(Param Test Client): messaging, minimum_corba { } } -project(Param Test Anyop): messaging, minimum_corba { +project(*Anyop): messaging, taoserver, minimum_corba { exename = anyop Source_Files { diff --git a/TAO/tests/Policies/Policies.mpc b/TAO/tests/Policies/Policies.mpc index 4e25b1d28f0..1cc73b82cae 100644 --- a/TAO/tests/Policies/Policies.mpc +++ b/TAO/tests/Policies/Policies.mpc @@ -1,3 +1,3 @@ -project(Policies Manipulation): messaging, corba_messaging { +project(Policies Manipulation): taoserver, messaging, corba_messaging { exename = Manipulation } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc index 1584dc3ce9e..e4f0e303723 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(Portable Interceptors Benchmark Server): server { +project(*Server): taoserver { requires += interceptors Source_Files { test_i.cpp @@ -10,7 +10,7 @@ project(Portable Interceptors Benchmark Server): server { } } -project(Portable Interceptors Benchmark Client): client { +project(*Client): taoclient { 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 41e9dedf84b..92270661896 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(Portable Interceptors Dynamic Server): server { +project(*Server): taoserver { requires += interceptors Source_Files { test_i.cpp @@ -8,7 +8,7 @@ project(Portable Interceptors Dynamic Server): server { } } -project(Portable Interceptors Dynamic Client): client { +project(*Client): taoclient { 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 df685f90ec1..8d10ec51ac9 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(Portable Interceptors ForwardRequest Server): server { +project(*Server): taoserver { requires += interceptors - idlflags += -DCORBA3 -I$(TAO_ROOT) + idlflags += -Gv -DCORBA3 -I$(TAO_ROOT) Source_Files { test_i.cpp @@ -10,9 +10,9 @@ project(Portable Interceptors ForwardRequest Server): server { } } -project(Portable Interceptors ForwardRequest Client): client { +project(*Client): taoclient { requires += interceptors - idlflags += -DCORBA3 -I$(TAO_ROOT) + idlflags += -Gv -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 2c9a6f9331d..53d67e4e809 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(Portable Interceptors IORInterceptor Server): server { +project(*Server): taoserver { requires += interceptors idlflags += -I$(TAO_ROOT) @@ -10,7 +10,7 @@ project(Portable Interceptors IORInterceptor Server): server { } } -project(Portable Interceptors IORInterceptor Client): client { +project(*Client): taoclient { 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 c9ebcdb333d..70e52a9fbbb 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(Portable Interceptors PICurrent Server): server { +project(*Server): taoserver { requires += interceptors Source_Files { test_i.cpp @@ -9,7 +9,7 @@ project(Portable Interceptors PICurrent Server): server { } } -project(Portable Interceptors PICurrent Client): client { +project(*Client): taoclient { 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 74027ad8389..4ad9a912846 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(Portable Interceptors Request Interceptor Flow Server): server { +project(*Server): taoserver { requires += interceptors Source_Files { test_i.cpp @@ -9,7 +9,7 @@ project(Portable Interceptors Request Interceptor Flow Server): server { } } -project(Portable Interceptors Request Interceptor Flow Client): client { +project(*Client): taoclient { 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 2f88d91c4c4..5f177c1bdf8 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(Portable Interceptors Server): server { +project(*Server): taoserver { requires += interceptors Source_Files { test_i.cpp @@ -8,7 +8,7 @@ project(Portable Interceptors Server): server { } } -project(Portable Interceptors Client): client { +project(*Client): taoclient { requires += interceptors Source_Files { testC.cpp diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc b/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc index b5f29897590..fa128e08982 100644 --- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc @@ -1,4 +1,4 @@ -project(Queued Message Test): taoexe { +project: taoexe { exename = Queued_Message_Test } diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Connections.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Connections.mpc index 1a863aa356e..f45d8c78609 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Connections.mpc +++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Connections.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Banded Connections Server): rt_server { +project(*Server): rt_server { Source_Files { server.cpp } } -project(RTCORBA Banded Connections Client): rt_client { +project(*Client): rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index ad553ec5462..811a69b2081 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Client Propagated Server): rt_server { +project(*Server): rt_server { Source_Files { server.cpp } } -project(RTCORBA Client Propagated Client): rt_client { +project(*Client): rt_client { Source_Files { testC.cpp interceptors.cpp diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc index c3528b55d71..0aee233bb3a 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc +++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Client Protocol Server): strategies, rt_server { +project(*Server): strategies, rt_server { Source_Files { server.cpp } } -project(RTCORBA Client Protocol Client): strategies, rt_client { +project(*Client): strategies, rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc index d33989bf03f..e0864c00140 100644 --- a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc +++ b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc @@ -1,4 +1,4 @@ -project(RTCORBA Collocation Server): rt_server { +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 0b98d192343..0b55ef2d169 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,4 +1,4 @@ -project(Destroy Thread Pool Server): rt_server { +project(*Server): rt_server { exename = Destroy_Thread_Pool } diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc index b954b5188fc..0aee233bb3a 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Explicit Binding Server): strategies, rt_server { +project(*Server): strategies, rt_server { Source_Files { server.cpp } } -project(RTCORBA Explicit Binding Client): strategies, rt_client { +project(*Client): strategies, rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc index 95cc06d7a14..f45d8c78609 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc +++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Linear Priority Server): rt_server { +project(*Server): rt_server { Source_Files { server.cpp } } -project(RTCORBA Linear Priority Client): rt_client { +project(*Client): rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc index d7d8dd49a8d..0aee233bb3a 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc @@ -1,10 +1,10 @@ -project(RTCORBA MT Client Protocol Priority Server): strategies, rt_server { +project(*Server): strategies, rt_server { Source_Files { server.cpp } } -project(RTCORBA MT Client Protocol Priority Client): strategies, rt_client { +project(*Client): strategies, rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc b/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc index 17b8540c871..b8c219f8130 100644 --- a/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc +++ b/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc @@ -1,4 +1,4 @@ -project(RTCORBA ORB Init): rt_client { +project: rt_client { exename = ORB_init } diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index b5c257a367b..10138dbe166 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Persistent IOR Server): rt_server { +project(*Server): rt_server { Source_Files { server.cpp } } -project(RTCORBA Persistent IOR Client): client { +project(*Client): taoclient { requires += rt_corba Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc index b0474d24311..6033396b49d 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.mpc +++ b/TAO/tests/RTCORBA/Policies/Policies.mpc @@ -1,3 +1,3 @@ -project(RTCORBA Policies Server): server { +project(RTCORBA Policies Server): rt_server { exename = Policies } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc index c84162f9044..f45d8c78609 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc +++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Policy Combinations Server): rt_server { +project(*Server): rt_server { Source_Files { server.cpp } } -project(RTCORBA Policy Combinations Client): rt_client { +project(*Client): rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc index 1461490f842..f45d8c78609 100644 --- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc +++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Private Connection Server): rt_server { +project(*Server): rt_server { Source_Files { server.cpp } } -project(RTCORBA Private Connection Client): rt_client { +project(*Client): rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc b/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc index f3ce8755abe..077bbcff34e 100644 --- a/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc +++ b/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc @@ -1,2 +1,2 @@ -project(RTCORBA RTMutex Server): rt_server { +project(*Server): rt_server { } diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc index a8df643a153..f45d8c78609 100644 --- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc +++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Server Declared Server): rt_server { +project(*Server): rt_server { Source_Files { server.cpp } } -project(RTCORBA Server Declared Client): rt_client { +project(*Client): rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc index a5a715bafa0..0aee233bb3a 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc +++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc @@ -1,10 +1,10 @@ -project(RTCORBA Server Protocol Server): strategies, rt_server { +project(*Server): strategies, rt_server { Source_Files { server.cpp } } -project(RTCORBA Server Protocol Client): strategies, rt_client { +project(*Client): strategies, rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc index fba6ec8da5d..a3206c05ae6 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc @@ -1,11 +1,11 @@ -project(RTCORBA Thread Pool Server): strategies, rt_server { +project(*Server): strategies, rt_server { Source_Files { test_i.cpp server.cpp } } -project(RTCORBA Thread Pool Client): strategies, rt_client { +project(*Client): strategies, rt_client { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc index 7f8832e5296..438e4e09db1 100644 --- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc +++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc @@ -1,4 +1,4 @@ -project(Reliable Oneways Server): messaging, corba_messaging { +project(*Server): messaging, taoserver, corba_messaging { Source_Files { Oneway_Receiver.cpp Shutdown_Helper.cpp @@ -6,7 +6,7 @@ project(Reliable Oneways Server): messaging, corba_messaging { } } -project(Reliable Oneways Client): messaging, corba_messaging { +project(*Client): messaging, taoserver, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc index 8ae3426e06f..499071ddcb3 100644 --- a/TAO/tests/Server_Leaks/Server_Leaks.mpc +++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc @@ -1,11 +1,11 @@ -project(Server Leaks Server): server { +project(*Server): taoserver { Source_Files { Ping_Service.cpp server.cpp } } -project(Server Leaks Client): client { +project(*Client): taoclient { 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 4dbb5af66b8..e58d1769369 100644 --- a/TAO/tests/Single_Read/Single_Read.mpc +++ b/TAO/tests/Single_Read/Single_Read.mpc @@ -1,11 +1,11 @@ -project(Single Read Server): server { +project(*Server): taoserver { Source_Files { test_i.cpp server.cpp } } -project(Single Read Client): client { +project(*Client): taoclient { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc index 8e23484588f..bbb78b1f3ef 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc +++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc @@ -1,4 +1,4 @@ -project(Smart Proxies Server): server { +project(*Server): taoserver, smart_proxies { idlflags += -Gsp Source_Files { @@ -6,7 +6,7 @@ project(Smart Proxies Server): server { } } -project(Smart Proxies Client): client { +project(*Client): taoclient, smart_proxies { idlflags += -Gsp Source_Files { diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc new file mode 100644 index 00000000000..d96e5e4b220 --- /dev/null +++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc @@ -0,0 +1,18 @@ +project(*Server): taoserver { + Source_Files { + TestC.cpp + TestS.cpp + server.cpp + Server_Task.cpp + Sender.cpp + } +} + +project(*Client): taoclient { + Source_Files { + TestC.cpp + client.cpp + Client_Task.cpp + } +} + diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc index b379fc71f30..2ae7a5561bb 100644 --- a/TAO/tests/Strategies/Strategies.mpc +++ b/TAO/tests/Strategies/Strategies.mpc @@ -1,11 +1,11 @@ -project(Strategies Server): strategies, messaging { +project(*Server): strategies, messaging, taoserver { Source_Files { simple_test_i.cpp server.cpp } } -project(Strategies Client): strategies, messaging { +project(*Client): strategies, messaging, taoserver { exename = client 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 6df63f99455..1e078cbf4c0 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc +++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc @@ -1,11 +1,11 @@ -project(Timed Buffered Oneways Server): messaging, corba_messaging { +project(*Server): messaging, taoserver, corba_messaging { Source_Files { test_i.cpp server.cpp } } -project(Timed Buffered Oneways Client): messaging, corba_messaging { +project(*Client): messaging, taoserver, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc index d522dfae2ce..44561e11012 100644 --- a/TAO/tests/Timeout/Timeout.mpc +++ b/TAO/tests/Timeout/Timeout.mpc @@ -1,11 +1,11 @@ -project(Timeout Server): server, corba_messaging { +project(*Server): taoserver, corba_messaging { Source_Files { test_i.cpp server.cpp } } -project(Timeout Client): messaging, corba_messaging { +project(*Client): messaging, taoserver, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc index 992002c6d27..3a5c5263bf9 100644 --- a/TAO/tests/Two_Objects/Two_Objects.mpc +++ b/TAO/tests/Two_Objects/Two_Objects.mpc @@ -1,4 +1,4 @@ -project(Two Objects Server): server { +project(*Server): taoserver { Source_Files { worker.cpp First_i.cpp @@ -8,7 +8,7 @@ project(Two Objects Server): server { } } -project(Two Objects Client): client { +project(*Client): taoclient { 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 cdfa8536412..7ddf8fbd920 100644 --- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc +++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc @@ -1,4 +1,4 @@ -project(Xt Stopwatch Server): server { +project(*Server): taoserver { Source_Files { test_i.cpp Stopwatch_display.cpp @@ -7,7 +7,7 @@ project(Xt Stopwatch Server): server { } } -project(Xt Stopwatch Client): client { +project(*Client): taoclient { Source_Files { testC.cpp Control.cpp diff --git a/TAO/tests/tests.mwc b/TAO/tests/tests.mwc new file mode 100644 index 00000000000..d90104a2381 --- /dev/null +++ b/TAO/tests/tests.mwc @@ -0,0 +1,2 @@ +workspace { +} diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc new file mode 100644 index 00000000000..f9922592ca1 --- /dev/null +++ b/TAO/utils/catior/catior.mpc @@ -0,0 +1,3 @@ +project : taoexe, rtcorba { + install = $(ACE_ROOT)/bin +}
\ No newline at end of file diff --git a/TAO/utils/utils.mwc b/TAO/utils/utils.mwc new file mode 100644 index 00000000000..753c85b5d81 --- /dev/null +++ b/TAO/utils/utils.mwc @@ -0,0 +1,4 @@ +workspace { + nslist + catior +} diff --git a/ace/QoS/qos.mpc b/ace/QoS/qos.mpc index 4725a31a174..e41937cb322 100644 --- a/ace/QoS/qos.mpc +++ b/ace/QoS/qos.mpc @@ -1,7 +1,6 @@ -project : acelib, core { - depends = ace - sharedname = ACE_QoS - dllflags = ACE_QoS_BUILD_DLL - libout = .. - include_dir = ace/QoS +project(QoS) : acelib, core { + requires += qos + sharedname = ACE_QoS + dynamicflags = ACE_QoS_BUILD_DLL + include_dir = ace/QoS } diff --git a/ace/RMCast/rmcast.mpc b/ace/RMCast/rmcast.mpc index 70c94e05251..982c95e16e4 100644 --- a/ace/RMCast/rmcast.mpc +++ b/ace/RMCast/rmcast.mpc @@ -1,7 +1,6 @@ -project : acelib, core { - depends = ace - sharedname = ACE_RMCast - dllflags = ACE_RMCAST_BUILD_DLL - libout = .. - include_dir = ace/RMCast +project(RMCast) : acelib, core { + requires += rmcast + sharedname = ACE_RMCast + dynamicflags = ACE_RMCAST_BUILD_DLL + include_dir = ace/RMCast } diff --git a/ace/SSL/ssl.mpc b/ace/SSL/ssl.mpc index e1f2657286e..41dfb6314a2 100644 --- a/ace/SSL/ssl.mpc +++ b/ace/SSL/ssl.mpc @@ -1,8 +1,7 @@ -project : acelib, core { - ssl = 1 - depends = ace - sharedname = ACE_SSL - dllflags = ACE_SSL_BUILD_DLL - libout = .. - include_dir = ace/SSL +project(SSL) : acelib, core { + ssl = 1 + requires += ssl + sharedname = ACE_SSL + dynamicflags = ACE_SSL_BUILD_DLL + include_dir = ace/SSL } diff --git a/ace/ace.mpc b/ace/ace.mpc index 8d739fad859..0399c1d02d0 100644 --- a/ace/ace.mpc +++ b/ace/ace.mpc @@ -1,9 +1,11 @@ -project : acelib, core, qt_moc, qt_reactor { - sharedname = ACE - install = - defaultlibs = - dllflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL - include_dir = ace +project(ACE) : acedefaults, aceversion, core, qt_moc, qt_reactor { + libout = $(ACE_ROOT)/lib + sharedname = ACE + dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL + include_dir = ace + + // This mpc file could be greatly simplified by putting the separate components + // in subdirectories. Source_Files(ACE_COMPONENTS) { OS { diff --git a/ace/ace.mwc b/ace/ace.mwc index 7f374d21c96..9c4de85f4a4 100644 --- a/ace/ace.mwc +++ b/ace/ace.mwc @@ -1,4 +1,6 @@ workspace { ace.mpc - RMCast/rmcast.mpc + RMCast + SSL + QoS } diff --git a/apps/apps.mwc b/apps/apps.mwc new file mode 100644 index 00000000000..d90104a2381 --- /dev/null +++ b/apps/apps.mwc @@ -0,0 +1,2 @@ +workspace { +} diff --git a/apps/gperf/src/gperf.mpc b/apps/gperf/src/gperf.mpc index 7457d0ea4ba..9c508a258ca 100644 --- a/apps/gperf/src/gperf.mpc +++ b/apps/gperf/src/gperf.mpc @@ -1,7 +1,6 @@ project(gperf_exe) : aceexe, core { + install = $(ACE_ROOT)/bin exename = gperf - install = ../../../bin - Source_Files { gperf.cpp Options.cpp diff --git a/apps/mkcsregdb/mkcsregdb.mpc b/apps/mkcsregdb/mkcsregdb.mpc index 06ff825a2ec..a3655ac98a7 100644 --- a/apps/mkcsregdb/mkcsregdb.mpc +++ b/apps/mkcsregdb/mkcsregdb.mpc @@ -1,3 +1,2 @@ project: aceexe { - install = $(ACE_ROOT)/bin } diff --git a/bin/MakeProjectCreator/README b/bin/MakeProjectCreator/README index 8d9d4399567..9abca592ab2 100644 --- a/bin/MakeProjectCreator/README +++ b/bin/MakeProjectCreator/README @@ -100,9 +100,10 @@ Project Keywords exename Specifies the name of the executable that will be created sharedname Specifies the name of the shared library that will be created staticname Specifies the name of the static library that will be created -dllout (Windows Only) Specifies where the dll will be placed -libout (Windows Only) Specifies where the lib will be placed -install Specifies where the executable (or library non-Windows) will go +dllout If defined, specifies where the dynamic libraries will be + placed. This overrides libout in the dynamic case. +libout Specifies where the dynamic and static libraries will be placed +install Specifies where executables will be installed idlflags Specifies the idl flags to be used when processing idl files idlgendir Specifies the output directory for idl generated files. If a listed idl file has a directory as part of the name, @@ -119,9 +120,10 @@ libpaths Specifies 1 or more locations to find libraries includes Specifies 1 or more locations to find include files libs Specifies 1 or more libraries to link into the exe or library defaultlibs Specifies 1 or more default libraries to link in -depends Specifies 1 or more project names upon which this project depends -dllflags Specifies preprocessor flags needed for dll's -libflags Specifies preprocessor flags needed for lib's +after Specifies that this project must be built after 1 or more + project names listed. +dynamicflags Specifies preprocessor flags needed for dynamic libraries +staticflags Specifies preprocessor flags needed for static libraries verbatim This allows arbitrary information to be place in a generated project file. The syntax is as follows: diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb index f30f84c4866..03f48f3c6f3 100644 --- a/bin/MakeProjectCreator/config/acedefaults.mpb +++ b/bin/MakeProjectCreator/config/acedefaults.mpb @@ -1,5 +1,5 @@ project: qt { - defaultlibs = ACE - dllout = $(ACE_ROOT)/bin - libout = . + staticflags += ACE_AS_STATIC_LIBS + includes += $(ACE_ROOT) + libpaths += $(ACE_ROOT)/lib } diff --git a/bin/MakeProjectCreator/config/aceexe.mpb b/bin/MakeProjectCreator/config/aceexe.mpb index 72ea4c138b5..f8e7ae617b0 100644 --- a/bin/MakeProjectCreator/config/aceexe.mpb +++ b/bin/MakeProjectCreator/config/aceexe.mpb @@ -1,6 +1,4 @@ project: acedefaults, aceversion { - depends += ace - includes += $(ACE_ROOT) - libpaths += $(ACE_ROOT)/ace - libflags += ACE_AS_STATIC_LIBS + after += ACE + libs += ACE } diff --git a/bin/MakeProjectCreator/config/acelib.mpb b/bin/MakeProjectCreator/config/acelib.mpb index 72ea4c138b5..637670a0f9f 100644 --- a/bin/MakeProjectCreator/config/acelib.mpb +++ b/bin/MakeProjectCreator/config/acelib.mpb @@ -1,6 +1,5 @@ project: acedefaults, aceversion { - depends += ace - includes += $(ACE_ROOT) - libpaths += $(ACE_ROOT)/ace - libflags += ACE_AS_STATIC_LIBS + after += ACE + libs += ACE + libout = $(ACE_ROOT)/lib } diff --git a/bin/MakeProjectCreator/config/acexml.mpb b/bin/MakeProjectCreator/config/acexml.mpb index ebbaae36b01..fddb6130db6 100644 --- a/bin/MakeProjectCreator/config/acexml.mpb +++ b/bin/MakeProjectCreator/config/acexml.mpb @@ -1,5 +1,5 @@ project { - depends += ACEXML_Parser ACEXML + after += ACEXML_Parser ACEXML libs += ACEXML_Parser ACEXML - libpaths += $(ACE_ROOT)/ACEXML/common $(ACE_ROOT)/ACEXML/parser/parser + includes += $(ACE_ROOT)/ACEXML/common } diff --git a/bin/MakeProjectCreator/config/avstreams.mpb b/bin/MakeProjectCreator/config/avstreams.mpb new file mode 100644 index 00000000000..18c80907209 --- /dev/null +++ b/bin/MakeProjectCreator/config/avstreams.mpb @@ -0,0 +1,6 @@ +project: property, naming, qos { + after += AV + libs += TAO_AV + comps += AV +} + diff --git a/bin/MakeProjectCreator/config/avstreamsexe.mpb b/bin/MakeProjectCreator/config/avstreamsexe.mpb index 925b4e5b4bc..1994cd20c50 100644 --- a/bin/MakeProjectCreator/config/avstreamsexe.mpb +++ b/bin/MakeProjectCreator/config/avstreamsexe.mpb @@ -1,6 +1,3 @@ -project: namingexe { - depends += AV CosProperty - libs += TAO_AV TAO_CosProperty - comps += AV +project: namingexe, avstreams { } diff --git a/bin/MakeProjectCreator/config/bidir_giop.mpb b/bin/MakeProjectCreator/config/bidir_giop.mpb new file mode 100644 index 00000000000..acf01fe59c4 --- /dev/null +++ b/bin/MakeProjectCreator/config/bidir_giop.mpb @@ -0,0 +1,4 @@ +project : taolib { + after += BiDir_GIOP + libs += TAO_BiDirGIOP +} diff --git a/bin/MakeProjectCreator/config/ciao_client.mpb b/bin/MakeProjectCreator/config/ciao_client.mpb index 1999552be7b..a95040bd18a 100644 --- a/bin/MakeProjectCreator/config/ciao_client.mpb +++ b/bin/MakeProjectCreator/config/ciao_client.mpb @@ -1,5 +1,5 @@ project : taolib_with_idl { - depends += CIAO_Client + after += CIAO_Client idlflags += -I$(CIAO_ROOT) -I$(TAO_ROOT)/CIAO/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs idlflags += -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" libs += TAO TAO_IFR_Client TAO_Valuetype TAO_Security CIAO_Client diff --git a/bin/MakeProjectCreator/config/ciao_component.mpb b/bin/MakeProjectCreator/config/ciao_component.mpb index 86bb7caa5ac..f6d3f17fe58 100644 --- a/bin/MakeProjectCreator/config/ciao_component.mpb +++ b/bin/MakeProjectCreator/config/ciao_component.mpb @@ -1,5 +1,5 @@ project : ciao_client { - depends += CIAO_Container + after += CIAO_Container libs += TAO_PortableServer TAO_IORInterceptor TAO_ObjRefTemplate CIAO_Container libpaths += $(TAO_ROOT)/tao/PortableServer $(TAO_ROOT)/tao/IORInterceptor $(TAO_ROOT)/tao/ObjRefTemplate diff --git a/bin/MakeProjectCreator/config/ciao_servant.mpb b/bin/MakeProjectCreator/config/ciao_servant.mpb index 5cc43db9b5e..f28a29b86cb 100644 --- a/bin/MakeProjectCreator/config/ciao_servant.mpb +++ b/bin/MakeProjectCreator/config/ciao_servant.mpb @@ -1,5 +1,5 @@ project : ciao_component { - depends += CIAO_Server + after += CIAO_Server libs += CIAO_Server Define_Custom(CIDL) { diff --git a/bin/MakeProjectCreator/config/ciao_server.mpb b/bin/MakeProjectCreator/config/ciao_server.mpb index a4a584e5742..ec4f9627a52 100644 --- a/bin/MakeProjectCreator/config/ciao_server.mpb +++ b/bin/MakeProjectCreator/config/ciao_server.mpb @@ -1,4 +1,4 @@ project : ciao_component { - depends += CIAO_Server + after += CIAO_Server libs += CIAO_Server } diff --git a/bin/MakeProjectCreator/config/client.mpb b/bin/MakeProjectCreator/config/client.mpb index 6b398fc9da9..fa33fcf2fb8 100644 --- a/bin/MakeProjectCreator/config/client.mpb +++ b/bin/MakeProjectCreator/config/client.mpb @@ -1,3 +1,2 @@ -project(client) : taoexe { - exename = client +project : taoclient { }
\ No newline at end of file diff --git a/bin/MakeProjectCreator/config/concurrency.mpb b/bin/MakeProjectCreator/config/concurrency.mpb new file mode 100644 index 00000000000..9a57c9f34f2 --- /dev/null +++ b/bin/MakeProjectCreator/config/concurrency.mpb @@ -0,0 +1,5 @@ +project : portableserver { + after += CosConcurrency + libs += TAO_CosConcurrency + comps += Concurrency +} diff --git a/bin/MakeProjectCreator/config/dslogadmin.mpb b/bin/MakeProjectCreator/config/dslogadmin.mpb new file mode 100644 index 00000000000..f86ff0adfd7 --- /dev/null +++ b/bin/MakeProjectCreator/config/dslogadmin.mpb @@ -0,0 +1,4 @@ +project : svc_utils, etcl, dynamicany { + after += DsLogAdmin + libs += TAO_DsLogAdmin +} diff --git a/bin/MakeProjectCreator/config/dynamicany.mpb b/bin/MakeProjectCreator/config/dynamicany.mpb new file mode 100644 index 00000000000..8853cb67031 --- /dev/null +++ b/bin/MakeProjectCreator/config/dynamicany.mpb @@ -0,0 +1,4 @@ +project : taolib { + after += DynamicAny + libs += TAO_DynamicAny +} diff --git a/bin/MakeProjectCreator/config/dynamicinterface.mpb b/bin/MakeProjectCreator/config/dynamicinterface.mpb new file mode 100644 index 00000000000..c5755b66d9e --- /dev/null +++ b/bin/MakeProjectCreator/config/dynamicinterface.mpb @@ -0,0 +1,4 @@ +project : portableserver { + after += DynamicInterface + libs += TAO_DynamicInterface +} diff --git a/bin/MakeProjectCreator/config/etcl.mpb b/bin/MakeProjectCreator/config/etcl.mpb new file mode 100644 index 00000000000..7186bafc7db --- /dev/null +++ b/bin/MakeProjectCreator/config/etcl.mpb @@ -0,0 +1,4 @@ +project : taolib { + after += ETCL + libs += TAO_ETCL +} diff --git a/bin/MakeProjectCreator/config/event.mpb b/bin/MakeProjectCreator/config/event.mpb new file mode 100644 index 00000000000..48aaaf66e52 --- /dev/null +++ b/bin/MakeProjectCreator/config/event.mpb @@ -0,0 +1,5 @@ +project : naming, messaging { + after += CosEvent + libs += TAO_CosEvent + comps += CosEvent +} diff --git a/bin/MakeProjectCreator/config/ftorb.mpb b/bin/MakeProjectCreator/config/ftorb.mpb new file mode 100644 index 00000000000..ee7fe2d1c65 --- /dev/null +++ b/bin/MakeProjectCreator/config/ftorb.mpb @@ -0,0 +1,5 @@ +project : iormanip, portableserver { + after += FTORB + libs += TAO_FTORB + comps += FTORB +} diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features index a1f91d00fc1..dce01fac5d4 100644 --- a/bin/MakeProjectCreator/config/global.features +++ b/bin/MakeProjectCreator/config/global.features @@ -22,3 +22,4 @@ repo = 0 minimum_corba = 0 java = 0 qt = 0 +wxwindows = 0 diff --git a/bin/MakeProjectCreator/config/global.mpb b/bin/MakeProjectCreator/config/global.mpb index 31fd4ed706b..67b20056711 100644 --- a/bin/MakeProjectCreator/config/global.mpb +++ b/bin/MakeProjectCreator/config/global.mpb @@ -1,4 +1,3 @@ project { - dllout = . libout = . } diff --git a/bin/MakeProjectCreator/config/ifr_client.mpb b/bin/MakeProjectCreator/config/ifr_client.mpb new file mode 100644 index 00000000000..eda60f0b55b --- /dev/null +++ b/bin/MakeProjectCreator/config/ifr_client.mpb @@ -0,0 +1,4 @@ +project : taolib { + libs += TAO_IFR_Client + after += IFR_Client +} diff --git a/bin/MakeProjectCreator/config/ifrservice.mpb b/bin/MakeProjectCreator/config/ifrservice.mpb new file mode 100644 index 00000000000..b7a95bde237 --- /dev/null +++ b/bin/MakeProjectCreator/config/ifrservice.mpb @@ -0,0 +1,4 @@ +project : iortable, svc_utils, typecodefactory { + after += IFRService + libs += TAO_IFRService +} diff --git a/bin/MakeProjectCreator/config/iorinterceptor.mpb b/bin/MakeProjectCreator/config/iorinterceptor.mpb index 4c6a6c99cb6..353cd27b8bb 100644 --- a/bin/MakeProjectCreator/config/iorinterceptor.mpb +++ b/bin/MakeProjectCreator/config/iorinterceptor.mpb @@ -1,5 +1,5 @@ project { - depends += IORInterceptor + after += IORInterceptor libs += TAO_IORInterceptor libpaths += $(TAO_ROOT)/tao/IORInterceptor } diff --git a/bin/MakeProjectCreator/config/iormanip.mpb b/bin/MakeProjectCreator/config/iormanip.mpb new file mode 100644 index 00000000000..88a0954b5a2 --- /dev/null +++ b/bin/MakeProjectCreator/config/iormanip.mpb @@ -0,0 +1,4 @@ +project : taolib { + after += IORManipulation + libs += TAO_IORManip +} diff --git a/bin/MakeProjectCreator/config/iortable.mpb b/bin/MakeProjectCreator/config/iortable.mpb new file mode 100644 index 00000000000..ed21ba835c7 --- /dev/null +++ b/bin/MakeProjectCreator/config/iortable.mpb @@ -0,0 +1,4 @@ +project : taolib { + after += IORTable + libs += TAO_IORTable +} diff --git a/bin/MakeProjectCreator/config/lifecycle.mpb b/bin/MakeProjectCreator/config/lifecycle.mpb new file mode 100644 index 00000000000..cfe2108f32e --- /dev/null +++ b/bin/MakeProjectCreator/config/lifecycle.mpb @@ -0,0 +1,4 @@ +project : naming { + libs += TAO_CosLifeCycle + after += CosLifeCycle +} diff --git a/bin/MakeProjectCreator/config/loadbalancing.mpb b/bin/MakeProjectCreator/config/loadbalancing.mpb new file mode 100644 index 00000000000..1c106670224 --- /dev/null +++ b/bin/MakeProjectCreator/config/loadbalancing.mpb @@ -0,0 +1,5 @@ +project : messaging, naming, portablegroup { + libs += TAO_CosLoadBalancing + after += LoadBalancing + comps += CosLoadBalancing +} diff --git a/bin/MakeProjectCreator/config/messaging.mpb b/bin/MakeProjectCreator/config/messaging.mpb index a7554cfaea2..afbc5739748 100644 --- a/bin/MakeProjectCreator/config/messaging.mpb +++ b/bin/MakeProjectCreator/config/messaging.mpb @@ -1,2 +1,4 @@ -project : server, messaging_only { +project : portableserver { + after += Messaging + libs += TAO_Messaging } diff --git a/bin/MakeProjectCreator/config/messaging_only.mpb b/bin/MakeProjectCreator/config/messaging_only.mpb index e272e8c729b..747e18e0542 100644 --- a/bin/MakeProjectCreator/config/messaging_only.mpb +++ b/bin/MakeProjectCreator/config/messaging_only.mpb @@ -1,5 +1,5 @@ project { - depends += Messaging + after += Messaging libs += TAO_Messaging libpaths += $(TAO_ROOT)/tao/Messaging } diff --git a/bin/MakeProjectCreator/config/naming.mpb b/bin/MakeProjectCreator/config/naming.mpb new file mode 100644 index 00000000000..c46e30dc84a --- /dev/null +++ b/bin/MakeProjectCreator/config/naming.mpb @@ -0,0 +1,5 @@ +project : iortable, svc_utils { + after += CosNaming + libs += TAO_CosNaming + comps += Naming +} diff --git a/bin/MakeProjectCreator/config/namingexe.mpb b/bin/MakeProjectCreator/config/namingexe.mpb index 565bc04c674..8ced70aa732 100644 --- a/bin/MakeProjectCreator/config/namingexe.mpb +++ b/bin/MakeProjectCreator/config/namingexe.mpb @@ -1,6 +1,2 @@ -project : server, orbsvcsexe { - depends += CosNaming Svc_Utils IORTable - libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable - comps += Naming - libpaths += $(TAO_ROOT)/tao/IORTable +project : taoserver, orbsvcsexe, naming { } diff --git a/bin/MakeProjectCreator/config/notification.mpb b/bin/MakeProjectCreator/config/notification.mpb new file mode 100644 index 00000000000..9cc453facbc --- /dev/null +++ b/bin/MakeProjectCreator/config/notification.mpb @@ -0,0 +1,5 @@ +project : event, etcl, dynamicany { + after += CosNotification + libs += TAO_CosNotification + comps += Notify +} diff --git a/bin/MakeProjectCreator/config/notify.mpb b/bin/MakeProjectCreator/config/notify.mpb index 5ffdbe8a278..832dfb3e979 100644 --- a/bin/MakeProjectCreator/config/notify.mpb +++ b/bin/MakeProjectCreator/config/notify.mpb @@ -1,5 +1,2 @@ -project { - depends += CosNotification ETCL CosNaming Svc_Utils IORTable DynamicAny PortableServer TAO - libs += TAO_CosNotification TAO_ETCL TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO - comps += Notify Naming +project : notification { } diff --git a/bin/MakeProjectCreator/config/notifytest.mpb b/bin/MakeProjectCreator/config/notifytest.mpb index 1be2c3a6652..b5884fa3a61 100644 --- a/bin/MakeProjectCreator/config/notifytest.mpb +++ b/bin/MakeProjectCreator/config/notifytest.mpb @@ -1,6 +1,5 @@ project: orbsvcsexe, notify { - depends += Notify_Lib - libs += TAO_NotifyTests - libpaths += $(TAO_ROOT)/orbsvcs/tests/Notify/lib + after += NotifyTests_Lib + libs += NotifyTests includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib }
\ No newline at end of file diff --git a/bin/MakeProjectCreator/config/objreftemplate.mpb b/bin/MakeProjectCreator/config/objreftemplate.mpb index 63b3a74e009..52f9fd673eb 100644 --- a/bin/MakeProjectCreator/config/objreftemplate.mpb +++ b/bin/MakeProjectCreator/config/objreftemplate.mpb @@ -1,5 +1,5 @@ project { - depends += ObjRefTemplate + after += ObjRefTemplate libs += TAO_ObjRefTemplate libpaths += $(TAO_ROOT)/tao/ObjRefTemplate } diff --git a/bin/MakeProjectCreator/config/orbsvcs_output.mpb b/bin/MakeProjectCreator/config/orbsvcs_output.mpb new file mode 100644 index 00000000000..bb0efdc3a1d --- /dev/null +++ b/bin/MakeProjectCreator/config/orbsvcs_output.mpb @@ -0,0 +1,7 @@ +project { + staticflags += TAO_AS_STATIC_LIBS + // We tested with all orbsvcs libs going to $(TAO_ROOT)/orbsvcs/lib, but + // decided that it was easier to deal with all libs in one place. + libpaths += $(ACE_ROOT)/lib + libout = $(ACE_ROOT)/lib +}
\ No newline at end of file diff --git a/bin/MakeProjectCreator/config/orbsvcsexe.mpb b/bin/MakeProjectCreator/config/orbsvcsexe.mpb index 505d10186b2..a8d45059fa4 100644 --- a/bin/MakeProjectCreator/config/orbsvcsexe.mpb +++ b/bin/MakeProjectCreator/config/orbsvcsexe.mpb @@ -1,5 +1,5 @@ project : taoexe { includes += $(TAO_ROOT)/orbsvcs - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs + libpaths += $(ACE_ROOT)/lib compname = --orbsvcs } diff --git a/bin/MakeProjectCreator/config/orbsvcslib.mpb b/bin/MakeProjectCreator/config/orbsvcslib.mpb index 5f89746afa7..ca4c44dcd0d 100644 --- a/bin/MakeProjectCreator/config/orbsvcslib.mpb +++ b/bin/MakeProjectCreator/config/orbsvcslib.mpb @@ -1,7 +1,7 @@ -project : taolib_with_idl { - includes += $(TAO_ROOT)/orbsvcs - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs - idlflags += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs - compname = --orbsvcs - tagname = TAO_ORBSVCS +project : taolib_with_idl, orbsvcs_output { + includes += $(TAO_ROOT)/orbsvcs + idlflags += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs + compname = --orbsvcs + tagname = TAO_ORBSVCS + include_dir = orbsvcs } diff --git a/bin/MakeProjectCreator/config/portablegroup.mpb b/bin/MakeProjectCreator/config/portablegroup.mpb new file mode 100644 index 00000000000..0331899d194 --- /dev/null +++ b/bin/MakeProjectCreator/config/portablegroup.mpb @@ -0,0 +1,4 @@ +project : naming { + libs += TAO_PortableGroup + after += PortableGroup +} diff --git a/bin/MakeProjectCreator/config/portableserver.mpb b/bin/MakeProjectCreator/config/portableserver.mpb new file mode 100644 index 00000000000..a9df7e3cb13 --- /dev/null +++ b/bin/MakeProjectCreator/config/portableserver.mpb @@ -0,0 +1,4 @@ +project : taolib { + after += PortableServer + libs += TAO_PortableServer +} diff --git a/bin/MakeProjectCreator/config/property.mpb b/bin/MakeProjectCreator/config/property.mpb new file mode 100644 index 00000000000..88e4df4d7f0 --- /dev/null +++ b/bin/MakeProjectCreator/config/property.mpb @@ -0,0 +1,5 @@ +project : portableserver { + after += CosProperty + libs += TAO_CosProperty + comps += Property +} diff --git a/bin/MakeProjectCreator/config/qos.mpb b/bin/MakeProjectCreator/config/qos.mpb new file mode 100644 index 00000000000..7e3b9eb695b --- /dev/null +++ b/bin/MakeProjectCreator/config/qos.mpb @@ -0,0 +1,5 @@ +project : acelib { + requires += qos + after += QoS + libs += ACE_QoS +} diff --git a/bin/MakeProjectCreator/config/qt_moc.mpb b/bin/MakeProjectCreator/config/qt_moc.mpb index e570060da5c..79f366e9847 100644 --- a/bin/MakeProjectCreator/config/qt_moc.mpb +++ b/bin/MakeProjectCreator/config/qt_moc.mpb @@ -1,4 +1,4 @@ -project { +project : qt { Define_Custom(MOC) { automatic = 0 command = $(ACE_ROOT)/bin/pch_cmd.pl -t -o diff --git a/bin/MakeProjectCreator/config/rmcast.mpb b/bin/MakeProjectCreator/config/rmcast.mpb new file mode 100644 index 00000000000..5255c32ef4c --- /dev/null +++ b/bin/MakeProjectCreator/config/rmcast.mpb @@ -0,0 +1,4 @@ +project : acelib { + after += RMCast + libs += ACE_RMCast +} diff --git a/bin/MakeProjectCreator/config/rt_client.mpb b/bin/MakeProjectCreator/config/rt_client.mpb index 635546d1ec5..5516e757658 100644 --- a/bin/MakeProjectCreator/config/rt_client.mpb +++ b/bin/MakeProjectCreator/config/rt_client.mpb @@ -1,6 +1,2 @@ -project : client { - depends += RTCORBA - libs += TAO_RTCORBA - requires += rt_corba - libpaths += $(TAO_ROOT)/tao/RTCORBA +project : taoclient, rtcorba { } diff --git a/bin/MakeProjectCreator/config/rt_server.mpb b/bin/MakeProjectCreator/config/rt_server.mpb index 146a7bfdbed..5173aa9f018 100644 --- a/bin/MakeProjectCreator/config/rt_server.mpb +++ b/bin/MakeProjectCreator/config/rt_server.mpb @@ -1,6 +1,2 @@ -project : server { - depends += RTPortableServer RTCORBA - libs += TAO_RTCORBA TAO_RTPortableServer - requires += rt_corba - libpaths += $(TAO_ROOT)/tao/RTCORBA $(TAO_ROOT)/tao/RTPortableServer +project : taoserver, rtportableserver, rtcorba { } diff --git a/bin/MakeProjectCreator/config/rtcorba.mpb b/bin/MakeProjectCreator/config/rtcorba.mpb new file mode 100644 index 00000000000..ac03672b89f --- /dev/null +++ b/bin/MakeProjectCreator/config/rtcorba.mpb @@ -0,0 +1,5 @@ +project : taolib { + after += RTCORBA + libs += TAO_RTCORBA + requires += rt_corba +} diff --git a/bin/MakeProjectCreator/config/rtcorbacommon.mpb b/bin/MakeProjectCreator/config/rtcorbacommon.mpb new file mode 100644 index 00000000000..302e9a2cad6 --- /dev/null +++ b/bin/MakeProjectCreator/config/rtcorbacommon.mpb @@ -0,0 +1,5 @@ +project { + after += RTCORBA_Common + libs += RTCORBA_Common + includes += ../Common +} diff --git a/bin/MakeProjectCreator/config/rtcorbaevent.mpb b/bin/MakeProjectCreator/config/rtcorbaevent.mpb new file mode 100644 index 00000000000..292ff257a9c --- /dev/null +++ b/bin/MakeProjectCreator/config/rtcorbaevent.mpb @@ -0,0 +1,4 @@ +project : rtportableserver, rtevent { + after += RTCORBAEvent + libs += TAO_RTCORBAEvent +} diff --git a/bin/MakeProjectCreator/config/rtevent.mpb b/bin/MakeProjectCreator/config/rtevent.mpb new file mode 100644 index 00000000000..89f0e5422b3 --- /dev/null +++ b/bin/MakeProjectCreator/config/rtevent.mpb @@ -0,0 +1,5 @@ +project : messaging, svc_utils { + after += RTEvent + libs += TAO_RTEvent + comps += RTEvent +} diff --git a/bin/MakeProjectCreator/config/rteventexe.mpb b/bin/MakeProjectCreator/config/rteventexe.mpb index 89fb3da58c8..7d053241fd3 100644 --- a/bin/MakeProjectCreator/config/rteventexe.mpb +++ b/bin/MakeProjectCreator/config/rteventexe.mpb @@ -1,5 +1,2 @@ -project: server, orbsvcsexe { - depends += RTEvent Svc_Utils - libs += TAO_RTEvent TAO_Svc_Utils - comps += RTEvent +project: server, orbsvcsexe, rtevent { } diff --git a/bin/MakeProjectCreator/config/rtoldevent.mpb b/bin/MakeProjectCreator/config/rtoldevent.mpb new file mode 100644 index 00000000000..e2a50f456ab --- /dev/null +++ b/bin/MakeProjectCreator/config/rtoldevent.mpb @@ -0,0 +1,4 @@ +project : rtevent, rtsched { + after += RTOLDEvent + libs += TAO_RTOLDEvent +} diff --git a/bin/MakeProjectCreator/config/rtportableserver.mpb b/bin/MakeProjectCreator/config/rtportableserver.mpb new file mode 100644 index 00000000000..b4bc5b0db0f --- /dev/null +++ b/bin/MakeProjectCreator/config/rtportableserver.mpb @@ -0,0 +1,4 @@ +project : portableserver, rtcorba { + after += RTPortableServer + libs += TAO_RTPortableServer +} diff --git a/bin/MakeProjectCreator/config/rtsched.mpb b/bin/MakeProjectCreator/config/rtsched.mpb new file mode 100644 index 00000000000..21482dcbbc3 --- /dev/null +++ b/bin/MakeProjectCreator/config/rtsched.mpb @@ -0,0 +1,5 @@ +project : naming { + after += RTSched + libs += TAO_RTSched + comps += Sched +} diff --git a/bin/MakeProjectCreator/config/rtschedevent.mpb b/bin/MakeProjectCreator/config/rtschedevent.mpb new file mode 100644 index 00000000000..1a49dd63eb6 --- /dev/null +++ b/bin/MakeProjectCreator/config/rtschedevent.mpb @@ -0,0 +1,4 @@ +project : rtsched, rtevent { + after += RTSchedEvent + libs += TAO_RTSchedEvent +} diff --git a/bin/MakeProjectCreator/config/security.mpb b/bin/MakeProjectCreator/config/security.mpb new file mode 100644 index 00000000000..03b8d1498a5 --- /dev/null +++ b/bin/MakeProjectCreator/config/security.mpb @@ -0,0 +1,4 @@ +project : portableserver { + after += Security + libs += TAO_Security +} diff --git a/bin/MakeProjectCreator/config/server.mpb b/bin/MakeProjectCreator/config/server.mpb index 4c97e282d11..5a5e667565c 100644 --- a/bin/MakeProjectCreator/config/server.mpb +++ b/bin/MakeProjectCreator/config/server.mpb @@ -1,6 +1,2 @@ -project(server) : taoexe { - depends += PortableServer - exename = server - libs += TAO_PortableServer - libpaths += $(TAO_ROOT)/tao/PortableServer +project : taoserver { } diff --git a/bin/MakeProjectCreator/config/smart_proxies.mpb b/bin/MakeProjectCreator/config/smart_proxies.mpb index 21f0116012a..3f9625ab049 100644 --- a/bin/MakeProjectCreator/config/smart_proxies.mpb +++ b/bin/MakeProjectCreator/config/smart_proxies.mpb @@ -1,5 +1,5 @@ -project { - depends += SmartProxies +project : taolib { + after += SmartProxies libs += TAO_SmartProxies requires += smart_proxies } diff --git a/bin/MakeProjectCreator/config/ssl.mpb b/bin/MakeProjectCreator/config/ssl.mpb new file mode 100644 index 00000000000..4e7373191c9 --- /dev/null +++ b/bin/MakeProjectCreator/config/ssl.mpb @@ -0,0 +1,6 @@ +project : acelib { + after += SSL + libs += ACE_SSL + requires += ssl + ssl = 1 +} diff --git a/bin/MakeProjectCreator/config/strategies.mpb b/bin/MakeProjectCreator/config/strategies.mpb index 1fdf735b933..51005b4d847 100644 --- a/bin/MakeProjectCreator/config/strategies.mpb +++ b/bin/MakeProjectCreator/config/strategies.mpb @@ -1,4 +1,4 @@ -project { - depends += Strategies +project : taolib { + after += Strategies libs += TAO_Strategies } diff --git a/bin/MakeProjectCreator/config/svc_utils.mpb b/bin/MakeProjectCreator/config/svc_utils.mpb new file mode 100644 index 00000000000..c93f568c91d --- /dev/null +++ b/bin/MakeProjectCreator/config/svc_utils.mpb @@ -0,0 +1,4 @@ +project : portableserver, taolib_with_idl { + after += Svc_Utils + libs += TAO_Svc_Utils +} diff --git a/bin/MakeProjectCreator/config/tao_output.mpb b/bin/MakeProjectCreator/config/tao_output.mpb new file mode 100644 index 00000000000..95a33ef9aaf --- /dev/null +++ b/bin/MakeProjectCreator/config/tao_output.mpb @@ -0,0 +1,6 @@ +project { + libout = $(ACE_ROOT)/lib + libpaths += $(ACE_ROOT)/lib + staticflags += TAO_AS_STATIC_LIBS +} + diff --git a/bin/MakeProjectCreator/config/taoclient.mpb b/bin/MakeProjectCreator/config/taoclient.mpb new file mode 100644 index 00000000000..c8223942568 --- /dev/null +++ b/bin/MakeProjectCreator/config/taoclient.mpb @@ -0,0 +1,3 @@ +project(taoclient) : taoexe { + exename = client +}
\ No newline at end of file diff --git a/bin/MakeProjectCreator/config/taoexe.mpb b/bin/MakeProjectCreator/config/taoexe.mpb index 848f6c6a61d..b1ad229706f 100644 --- a/bin/MakeProjectCreator/config/taoexe.mpb +++ b/bin/MakeProjectCreator/config/taoexe.mpb @@ -1,8 +1,8 @@ project : aceexe, taoversion { - depends += tao TAO_IDL_EXE - includes += $(TAO_ROOT) $(TAO_ROOT)/tao - libpaths += $(TAO_ROOT)/tao - idlflags = -Ge 1 -Sc - libflags += TAO_AS_STATIC_LIBS - libs += TAO + after += TAO TAO_IDL_EXE + includes += $(TAO_ROOT) $(TAO_ROOT)/tao + libpaths += $(ACE_ROOT)/lib + idlflags += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h + staticflags += TAO_AS_STATIC_LIBS + libs += TAO } diff --git a/bin/MakeProjectCreator/config/taolib.mpb b/bin/MakeProjectCreator/config/taolib.mpb index 5be03113fd6..db3546ceca5 100644 --- a/bin/MakeProjectCreator/config/taolib.mpb +++ b/bin/MakeProjectCreator/config/taolib.mpb @@ -1,6 +1,5 @@ -project : acelib, taoversion { - depends += tao +project : acelib, taoversion, tao_output { + after += TAO + libs += TAO includes += $(TAO_ROOT) $(TAO_ROOT)/tao - libpaths += $(TAO_ROOT)/tao - libflags += TAO_AS_STATIC_LIBS } diff --git a/bin/MakeProjectCreator/config/taolib_with_idl.mpb b/bin/MakeProjectCreator/config/taolib_with_idl.mpb index a9cae7d10b6..29fdbea8ba1 100644 --- a/bin/MakeProjectCreator/config/taolib_with_idl.mpb +++ b/bin/MakeProjectCreator/config/taolib_with_idl.mpb @@ -1,4 +1,4 @@ project : taolib { - depends += TAO_IDL_EXE - idlflags = -Ge 1 -Sc + after += TAO_IDL_EXE + idlflags += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h } diff --git a/bin/MakeProjectCreator/config/taoserver.mpb b/bin/MakeProjectCreator/config/taoserver.mpb new file mode 100644 index 00000000000..acca3a5998d --- /dev/null +++ b/bin/MakeProjectCreator/config/taoserver.mpb @@ -0,0 +1,3 @@ +project : taoexe, portableserver { + exename = server +} diff --git a/bin/MakeProjectCreator/config/taoversion.mpb b/bin/MakeProjectCreator/config/taoversion.mpb index a996835285f..87265e2c59b 100644 --- a/bin/MakeProjectCreator/config/taoversion.mpb +++ b/bin/MakeProjectCreator/config/taoversion.mpb @@ -1,3 +1,3 @@ project { - version = 1.3.3 + version = 1.3.1 } diff --git a/bin/MakeProjectCreator/config/time.mpb b/bin/MakeProjectCreator/config/time.mpb new file mode 100644 index 00000000000..20fe675c0ea --- /dev/null +++ b/bin/MakeProjectCreator/config/time.mpb @@ -0,0 +1,5 @@ +project : naming { + after += CosTime + libs += TAO_CosTime + comps += Time +} diff --git a/bin/MakeProjectCreator/config/trading.mpb b/bin/MakeProjectCreator/config/trading.mpb new file mode 100644 index 00000000000..48f789e0257 --- /dev/null +++ b/bin/MakeProjectCreator/config/trading.mpb @@ -0,0 +1,5 @@ +project : dynamicany, portableserver { + after += CosTrading + libs += TAO_CosTrading + comps += Trader +} diff --git a/bin/MakeProjectCreator/config/typecodefactory.mpb b/bin/MakeProjectCreator/config/typecodefactory.mpb new file mode 100644 index 00000000000..4439905f170 --- /dev/null +++ b/bin/MakeProjectCreator/config/typecodefactory.mpb @@ -0,0 +1,4 @@ +project : ifr_client { + libs += TAO_TypeCodeFactory + after += TypeCodeFactory +} diff --git a/bin/MakeProjectCreator/config/valuetype.mpb b/bin/MakeProjectCreator/config/valuetype.mpb index 5a9c7e947a2..fa80fccabf8 100644 --- a/bin/MakeProjectCreator/config/valuetype.mpb +++ b/bin/MakeProjectCreator/config/valuetype.mpb @@ -1,5 +1,5 @@ project { - depends += Valuetype + after += Valuetype libs += TAO_Valuetype libpaths += $(TAO_ROOT)/tao/Valuetype } diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm index d2b5dbab873..0e38bd0525e 100644 --- a/bin/MakeProjectCreator/modules/ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm @@ -43,7 +43,7 @@ my(%validNames) = ('exename' => 1, 'idlflags' => 1, 'idlpreprocessor' => 1, 'defaultlibs' => 1, - 'depends' => 1, + 'after' => 1, 'libs' => 1, 'lit_libs' => 1, 'pch_header' => 1, @@ -51,8 +51,8 @@ my(%validNames) = ('exename' => 1, 'ssl' => 1, 'dllout' => 1, 'libout' => 1, - 'dllflags' => 1, - 'libflags' => 1, + 'dynamicflags' => 1, + 'staticflags' => 1, 'version' => 1, 'requires' => 1, 'avoids' => 1, @@ -2306,7 +2306,7 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'after' && $val ne '') { my($arr) = $self->create_array($val); $val = ''; foreach my $entry (@$arr) { diff --git a/bin/MakeProjectCreator/modules/TemplateParser.pm b/bin/MakeProjectCreator/modules/TemplateParser.pm index b082b31baa1..118db647f6a 100644 --- a/bin/MakeProjectCreator/modules/TemplateParser.pm +++ b/bin/MakeProjectCreator/modules/TemplateParser.pm @@ -834,7 +834,7 @@ sub collect_data { $prjc->update_project_info($self, 0, ['project_name']); ## This is for all projects - $prjc->update_project_info($self, 1, ['depends']); + $prjc->update_project_info($self, 1, ['after']); ## VC7 Projects need to know the GUID. ## We need to save this value in our known values diff --git a/bin/MakeProjectCreator/modules/VA4ProjectCreator.pm b/bin/MakeProjectCreator/modules/VA4ProjectCreator.pm index 942be40a726..17b893f686e 100644 --- a/bin/MakeProjectCreator/modules/VA4ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/VA4ProjectCreator.pm @@ -32,7 +32,7 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'after' && $val ne '') { my($wt) = $self->get_writing_type(); my($arr) = $self->create_array($val); $val = ''; diff --git a/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm b/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm index a02931a032c..fa0edd3126f 100644 --- a/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm @@ -46,7 +46,7 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'after' && $val ne '') { my($arr) = $self->create_array($val); $val = ''; diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd index fa4fe858480..8b89a81ff07 100644 --- a/bin/MakeProjectCreator/templates/bor.mpd +++ b/bin/MakeProjectCreator/templates/bor.mpd @@ -64,11 +64,11 @@ RESOURCE =<%foreach(resource_files)%> $(OBJDIR)\<%noextension(resource_file)%>.r <%endif%> !ifdef STATIC -LIB_FLAGS =<%foreach(libflags)%> -D<%libflag%><%endfor%> +LIB_FLAGS =<%foreach(staticflags)%> -D<%staticflag%><%endfor%> DLL_FLAGS = !else LIB_FLAGS = -DLL_FLAGS =<%foreach(dllflags)%> -D<%dllflag%><%endfor%> +DLL_FLAGS =<%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%> !endif CFLAGS = \ @@ -121,11 +121,15 @@ BASE_BINDIR = <%install%> !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> <%endif%> -<%endif%> -<%if(sharedname)%> +<%else%> <%if(dllout)%> BASE_BINDIR = <%dllout%> +<%else%> +<%if(libout)%> + +BASE_BINDIR = <%libout%> +<%endif%> <%endif%> <%if(core)%> diff --git a/bin/MakeProjectCreator/templates/bordll.mpt b/bin/MakeProjectCreator/templates/bordll.mpt index 83c14560af6..e9b6ac22e6c 100644 --- a/bin/MakeProjectCreator/templates/bordll.mpt +++ b/bin/MakeProjectCreator/templates/bordll.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + type_is_binary = 1 type_is_dynamic = 1 common_defines = WIN32 diff --git a/bin/MakeProjectCreator/templates/borexe.mpt b/bin/MakeProjectCreator/templates/borexe.mpt index 27daf4c7f80..5d4d47b405d 100644 --- a/bin/MakeProjectCreator/templates/borexe.mpt +++ b/bin/MakeProjectCreator/templates/borexe.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + type_is_binary = 1 common_defines = WIN32 conditional_include "zziplib" diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd index 1b698ad5ad0..819d950d24d 100644 --- a/bin/MakeProjectCreator/templates/em3vcp.mpd +++ b/bin/MakeProjectCreator/templates/em3vcp.mpd @@ -61,7 +61,7 @@ LINK32=link.exe -lib RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r CPP=<%cpp("cl.exe")%> -# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c +# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c <%if(compile_flags_removed)%> # SUBTRACT CPP <%compile_flags_removed%> <%endif%> @@ -197,7 +197,8 @@ InputName=<%basenoextension(idl_file)%> InputDir=<%dirname(idl_file)%> BuildCmds= \ - <%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath) + PATH=%PATH%;<%idl_compiler_libs%> \ + <%idl_compiler%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath) "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) diff --git a/bin/MakeProjectCreator/templates/em3vcpdll.mpt b/bin/MakeProjectCreator/templates/em3vcpdll.mpt index 3fa0d33f714..de5e2768749 100644 --- a/bin/MakeProjectCreator/templates/em3vcpdll.mpt +++ b/bin/MakeProjectCreator/templates/em3vcpdll.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + configurations = Release Debug platform_longs = "WCE ARM" "WCE x86" "WCE emulator" default_configuration = Debug diff --git a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt index e9f51c2ef43..307953ee92e 100644 --- a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt +++ b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + type_description = "Application" platform_longs = "WCE ARM" "WCE x86" "WCE emulator" default_configuration = Debug diff --git a/bin/MakeProjectCreator/templates/em3vcplib.mpt b/bin/MakeProjectCreator/templates/em3vcplib.mpt index 72360c63ebe..fb647367343 100644 --- a/bin/MakeProjectCreator/templates/em3vcplib.mpt +++ b/bin/MakeProjectCreator/templates/em3vcplib.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + type_description = "Static Library" platform_longs = "WCE ARM" "WCE x86" "WCE emulator" default_configuration = "Static Debug" @@ -5,7 +7,7 @@ default_platform_long = "WCE ARM" configurations = "Static Release" "Static Debug" common_defines = UNICODE _UNICODE type_is_static = 1 -need_libflags = 1 +need_staticflags = 1 stack = WCE x86 { diff --git a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt index a8724c29e13..8ef62af7cf2 100644 --- a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt +++ b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + type_description = "Application" platform_longs = "WCE ARM" "WCE x86" "WCE emulator" default_configuration = "Static Debug" @@ -6,8 +8,7 @@ configurations = "Static Release" "Static Debug" type_is_binary = 1 common_defines = UNICODE _UNICODE ssl_libs = libeay32 ssleay32 -zzip_libs = z zzip -need_libflags = 1 +need_staticflags = 1 pdb = 1 stack = diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 58cc590a172..3c6578d8c78 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -24,6 +24,7 @@ endif <%endif%> <%if(idl_files)%> +TAO_IDL = <%idl_compiler%> IDL_FILES =<%foreach(idl_files)%> <%noextension(idl_file)%><%endfor%> IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) <%endif%> @@ -194,6 +195,7 @@ ifeq (<%comp%>, $(findstring <%comp%>, $(CURRENT_COMPONENTS))) endif <%endfor%> <%endif%> +ACELIB =<%foreach(defaultlibs)%> -l<%defaultlib%><%endfor%> include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU @@ -208,11 +210,19 @@ else INSBIN = $(INSTALL_CHECK) INSTALL = $(VBIN:%=$(INSBIN)/%$(EXEEXT)) <%endif%> -<%if(sharedname)%> +endif +<%else%> +<%if(!exename)%> + +INSTALL_CHECK = <%if(dllout)%><%dllout%><%else%><%libout%><%endif%> +ifeq ($(INSTALL_CHECK),.) + INSLIB = $(PWD) +else INSLIB = $(INSTALL_CHECK) -<%endif%> endif <%endif%> + +<%endif%> <%if(sharedname)%> include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU <%endif%> @@ -238,17 +248,17 @@ else CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\"$(subst \,\,$(TAO_IDL_PREPROCESSOR))\" endif <%endif%> -<%if(dllflags)%> +<%if(dynamicflags)%> ifeq ($(shared_libs),1) ifneq ($(SHLIB),) - CPPFLAGS +=<%foreach(dllflags)%> -D<%dllflag%><%endfor%> + CPPFLAGS +=<%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%> endif endif <%endif%> -<%if(libflags)%> +<%if(staticflags)%> ifeq ($(static_libs),1) ifneq ($(LIB),) - CPPFLAGS +=<%foreach(libflags)%> -D<%libflag%><%endfor%> + CPPFLAGS +=<%foreach(staticflags)%> -D<%staticflag%><%endfor%> endif endif <%endif%> diff --git a/bin/MakeProjectCreator/templates/gnudll.mpt b/bin/MakeProjectCreator/templates/gnudll.mpt index e6b020aca8b..7d4f84e9b67 100644 --- a/bin/MakeProjectCreator/templates/gnudll.mpt +++ b/bin/MakeProjectCreator/templates/gnudll.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler" + ssl_libs = ssl crypto zzip_libs = z zzip conditional_include "zziplib" diff --git a/bin/MakeProjectCreator/templates/gnuexe.mpt b/bin/MakeProjectCreator/templates/gnuexe.mpt index e6b020aca8b..7d4f84e9b67 100644 --- a/bin/MakeProjectCreator/templates/gnuexe.mpt +++ b/bin/MakeProjectCreator/templates/gnuexe.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler" + ssl_libs = ssl crypto zzip_libs = z zzip conditional_include "zziplib" diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd index 2ca6a2752d3..c13dc33033c 100644 --- a/bin/MakeProjectCreator/templates/make.mpd +++ b/bin/MakeProjectCreator/templates/make.mpd @@ -106,7 +106,7 @@ $(BIN): $(OBJS) <%endif%> <%if(sharedname)%> -all: $(SHLIB) <%if(install)%>install<%endif%> +all: $(SHLIB) <%if(install)%>install<%else%><%if(!exename)%>install<%endif%><%endif%> $(SHLIB): $(OBJS) $(LINK.cc) $(SHFLAGS) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS) @@ -123,7 +123,15 @@ $(LIB): $(OBJS) <%if(install)%> <%if(exename)%> INSTARGET = $(BIN) +install: + @echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)" + @mkdir -p "<%install%>" + @$(RM) "<%install%>/$(INSTARGET)" + @ln -s "$(PWD)/$(INSTARGET)" "<%install%>" + +<%endif%> <%else%> +<%if(!exename)%> <%if(sharedname)%> INSTARGET = $(SHLIB) <%else%> @@ -131,13 +139,11 @@ INSTARGET = $(SHLIB) INSTARGET = $(LIB) <%endif%> <%endif%> -<%endif%> install: - @echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)" - @mkdir -p "<%install%>" - @$(RM) "<%install%>/$(INSTARGET)" - @ln -s "$(PWD)/$(INSTARGET)" "<%install%>" - + @mkdir -p "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" + @$(RM) "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/$(INSTARGET)" + @ln -s "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" +<%endif%> <%endif%> clean: -$(RM) $(OBJS) diff --git a/bin/MakeProjectCreator/templates/makedll.mpt b/bin/MakeProjectCreator/templates/makedll.mpt index 15e8c50f132..0ae2c4a947a 100644 --- a/bin/MakeProjectCreator/templates/makedll.mpt +++ b/bin/MakeProjectCreator/templates/makedll.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler" + configurations = gcc soext = so ssl_libs = ssl crypto diff --git a/bin/MakeProjectCreator/templates/makeexe.mpt b/bin/MakeProjectCreator/templates/makeexe.mpt index e3504056f1b..ca465a3e1d1 100644 --- a/bin/MakeProjectCreator/templates/makeexe.mpt +++ b/bin/MakeProjectCreator/templates/makeexe.mpt @@ -1 +1,2 @@ conditional_include "makedll" + diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd index acf4a359218..5bdec1d8374 100644 --- a/bin/MakeProjectCreator/templates/nmake.mpd +++ b/bin/MakeProjectCreator/templates/nmake.mpd @@ -48,10 +48,10 @@ OUTDIR=<%libout%> <%endif%> INTDIR=<%intermediate_dir%>\<%noextension(project_file)%> -ALL : <%if(idl_files)%>IDL_STUBS <%endif%><%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>"<%endfor%><%endfor%><%endfor%> +ALL : <%if(idl_files)%>IDL_STUBS <%endif%><%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>"<%endfor%><%endfor%><%endfor%> DEPEND : - perl <%depgen("$(ACE_ROOT)\\bin\\depgen.pl")%><%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines macros)%> -D<%define%><%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%> -D<%dllflag%><%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> -D<%zzip_define%><%endfor%> -I"$(ZZIP_ROOT)\include" <%endif%><%if(need_libflags)%><%foreach(libflags)%> -D<%libflag%><%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%> + perl <%depgen("$(ACE_ROOT)\\bin\\depgen.pl")%><%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines macros)%> -D<%define%><%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%> -D<%staticflag%><%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%> <%if(idl_files)%> IDL_STUBS :<%foreach(idl_files)%> "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%dirname(idl_file)%><%endif%><%endif%>\<%basenoextension(idl_file)%>C.cpp"<%endfor%> @@ -76,7 +76,7 @@ REALCLEAN : CLEAN <%endif%> <%endif%> <%if(type_is_dynamic)%> - -@erase "<%dllout%>\<%sharedname%><%lib_modifier%>.dll" + -@erase "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll" <%endif%> <%if(exename)%> -@erase "$(INSTALLDIR)\<%exename%>.exe" @@ -110,7 +110,7 @@ REALCLEAN : CLEAN if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=cl.exe -CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%><%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c +CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%><%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -199,7 +199,7 @@ SOURCE=.\<%pch_source%> <%foreach(configurations)%> !<%fornotfirst("ELSE")%>IF "$(CFG)" == "<%platform%> <%configuration%>" -CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c +CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c "$(INTDIR)\<%basenoextension(pch_source)%>.obj" "$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -238,7 +238,7 @@ InputDir=<%dirname(idl_file)%> "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.h" "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.i" "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.cpp" "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)S.h" "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)S.i" "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" <<tempfile.bat @echo off - <%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%> + <%idl_compiler%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%> << <%endfor%> @@ -288,3 +288,4 @@ SOURCE=.\<%resource_file%> <%endfor%> !ENDIF + diff --git a/bin/MakeProjectCreator/templates/nmakedll.mpt b/bin/MakeProjectCreator/templates/nmakedll.mpt index 1e45e05b236..3c514b15db3 100644 --- a/bin/MakeProjectCreator/templates/nmakedll.mpt +++ b/bin/MakeProjectCreator/templates/nmakedll.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + configurations = Release Debug "Static Release" "Static Debug" platforms = Win32 default_configuration = Debug @@ -59,7 +61,7 @@ Static Release { lib_modifier = s debug_switch = type_is_static = 1 - need_libflags = 1 + need_staticflags = 1 } Static Debug { @@ -73,7 +75,7 @@ Static Debug { intermediate_dir = Static_Debug lib_modifier = sd type_is_static = 1 - need_libflags = 1 + need_staticflags = 1 } MFC Release { @@ -121,7 +123,7 @@ Static MFC Release { lib_modifier = mfcs debug_switch = type_is_static = 1 - need_libflags = 1 + need_staticflags = 1 } Static MFC Debug { @@ -135,7 +137,7 @@ Static MFC Debug { intermediate_dir = Static_MFC_Debug lib_modifier = mfcsd type_is_static = 1 - need_libflags = 1 + need_staticflags = 1 } conditional_include "vcfullmacros" diff --git a/bin/MakeProjectCreator/templates/nmakeexe.mpt b/bin/MakeProjectCreator/templates/nmakeexe.mpt index 8db3cd2d38a..eca1cc7003f 100644 --- a/bin/MakeProjectCreator/templates/nmakeexe.mpt +++ b/bin/MakeProjectCreator/templates/nmakeexe.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + type_description = "Console Application" type_code = 0x0103 configurations = Release Debug "Static Release" "Static Debug" @@ -50,7 +52,7 @@ Static Release { defines = NDEBUG compile_flags_removed = /YX lib_modifier = s - need_libflags = 1 + need_staticflags = 1 output_dir = Static_Release intermediate_dir = Static_Release debug_switch = @@ -62,7 +64,7 @@ Static Debug { defines = _DEBUG compile_flags_removed = /YX lib_modifier = sd - need_libflags = 1 + need_staticflags = 1 output_dir = Static_Debug intermediate_dir = Static_Debug } @@ -101,7 +103,7 @@ Static MFC Release { defines = NDEBUG _AFXDLL compile_flags_removed = /YX lib_modifier = mfcs - need_libflags = 1 + need_staticflags = 1 output_dir = Static_MFC_Release intermediate_dir = Static_MFC_Release debug_switch = @@ -114,7 +116,7 @@ Static MFC Debug { defines = _DEBUG _AFXDLL compile_flags_removed = /YX lib_modifier = mfcsd - need_libflags = 1 + need_staticflags = 1 output_dir = Static_MFC_Debug intermediate_dir = Static_MFC_Debug } diff --git a/bin/MakeProjectCreator/templates/va4icc.mpd b/bin/MakeProjectCreator/templates/va4icc.mpd index 086effa1c2c..51107033e86 100644 --- a/bin/MakeProjectCreator/templates/va4icc.mpd +++ b/bin/MakeProjectCreator/templates/va4icc.mpd @@ -12,13 +12,13 @@ if $__TOS_WIN__ { <%endfor%> <%endif%> <%if(type_is_dynamic)%> -<%foreach(dllflags)%> - define ("<%dllflag%>", "1"), +<%foreach(dynamicflags)%> + define ("<%dynamicflag%>", "1"), <%endfor%> <%endif%> -<%if(need_libflags)%> -<%foreach(libflags)%> - define ("<%libflag%>", "1"), +<%if(need_staticflags)%> +<%foreach(staticflags)%> + define ("<%staticflag%>", "1"), <%endfor%> <%endif%> define ("_stricmp", "stricmp"), diff --git a/bin/MakeProjectCreator/templates/va4iccdll.mpt b/bin/MakeProjectCreator/templates/va4iccdll.mpt index 4be92945f2d..bc49da13786 100644 --- a/bin/MakeProjectCreator/templates/va4iccdll.mpt +++ b/bin/MakeProjectCreator/templates/va4iccdll.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + common_defines = _WINDOWS WIN32 type_is_dynamic = 1 lib_modifier = d diff --git a/bin/MakeProjectCreator/templates/va4iccdllexe.mpt b/bin/MakeProjectCreator/templates/va4iccdllexe.mpt index d72d9958011..893387a107f 100644 --- a/bin/MakeProjectCreator/templates/va4iccdllexe.mpt +++ b/bin/MakeProjectCreator/templates/va4iccdllexe.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + common_defines = _WINDOWS _CONSOLE type_is_binary = 1 lib_modifier = d diff --git a/bin/MakeProjectCreator/templates/va4icclib.mpt b/bin/MakeProjectCreator/templates/va4icclib.mpt index e7a0d8740f3..95237c4a883 100644 --- a/bin/MakeProjectCreator/templates/va4icclib.mpt +++ b/bin/MakeProjectCreator/templates/va4icclib.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + common_defines = _WINDOWS WIN32 type_is_static = 1 lib_modifier = d diff --git a/bin/MakeProjectCreator/templates/va4icclibexe.mpt b/bin/MakeProjectCreator/templates/va4icclibexe.mpt index d21d7e76143..01da5ffbb0f 100644 --- a/bin/MakeProjectCreator/templates/va4icclibexe.mpt +++ b/bin/MakeProjectCreator/templates/va4icclibexe.mpt @@ -1,6 +1,9 @@ +conditional_include "idl_compiler_win32" + common_defines = _WINDOWS _CONSOLE type_is_binary = 1 lib_modifier = d defines = _DEBUG -need_libflags = 1 +need_staticflags = 1 conditional_include "zziplib" + diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd index f4aceaf1508..8b45ae8670d 100644 --- a/bin/MakeProjectCreator/templates/vc6dsp.mpd +++ b/bin/MakeProjectCreator/templates/vc6dsp.mpd @@ -52,7 +52,7 @@ RSC=rc.exe <%if(type_is_static)%> LINK32=link.exe -lib <%endif%> -# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c +# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c <%if(compile_flags_removed)%> # SUBTRACT CPP <%compile_flags_removed%> <%endif%> diff --git a/bin/MakeProjectCreator/templates/vc6dspdll.mpt b/bin/MakeProjectCreator/templates/vc6dspdll.mpt index a82981f944e..478e8c601fa 100644 --- a/bin/MakeProjectCreator/templates/vc6dspdll.mpt +++ b/bin/MakeProjectCreator/templates/vc6dspdll.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + configurations = Release Debug type_is_binary = 1 type_is_dynamic = 1 diff --git a/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt b/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt index aba7ee7617f..6ddbfe38754 100644 --- a/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt +++ b/bin/MakeProjectCreator/templates/vc6dspdllexe.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + type_description = "Console Application" type_code = 0x0103 configurations = Release Debug diff --git a/bin/MakeProjectCreator/templates/vc6dsplib.mpt b/bin/MakeProjectCreator/templates/vc6dsplib.mpt index e1e9b9b7395..4a75f918be1 100644 --- a/bin/MakeProjectCreator/templates/vc6dsplib.mpt +++ b/bin/MakeProjectCreator/templates/vc6dsplib.mpt @@ -1,29 +1,32 @@ +conditional_include "idl_compiler_win32" + type_description = "Static Library" type_code = 0x0104 -configurations = "Static Release" "Static Debug" -default_configuration = "Static Debug" +configurations = Release Debug +default_configuration = Debug common_defines = WIN32 _WINDOWS type_is_static = 1 -need_libflags = 1 +need_staticflags = 1 + -Static Release { +Release { use_debug_libraries = 0 compile_flags = /G5 /W3 /GX /O2 /MD /Zi /GR defines = NDEBUG compile_flags_removed = /YX - output_dir = Static_Release - intermediate_dir = Static_Release + output_dir = Release + intermediate_dir = Release lib_modifier = s debug_switch = } -Static Debug { +Debug { use_debug_libraries = 1 compile_flags = /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd defines = _DEBUG compile_flags_removed = /Fr /YX - output_dir = Static_Debug - intermediate_dir = Static_Debug + output_dir = Debug + intermediate_dir = Debug lib_modifier = sd pdb = 1 } diff --git a/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt b/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt index a618518af80..2fd53c5e10b 100644 --- a/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt +++ b/bin/MakeProjectCreator/templates/vc6dsplibexe.mpt @@ -1,34 +1,37 @@ +conditional_include "idl_compiler_win32" + type_description = "Console Application" type_code = 0x0103 -configurations = "Static Release" "Static Debug" -default_configuration = "Static Debug" +configurations = Release Debug +default_configuration = Debug type_is_binary = 1 common_defines = WIN32 _CONSOLE subsystem = console ssl_libs = libeay32 ssleay32 zzip_libs = z zzip -need_libflags = 1 +need_staticflags = 1 pdb = 1 -Static Release { + +Release { use_debug_libraries = 0 compile_flags = /W3 /GX /O2 /MD /GR defines = NDEBUG compile_flags_removed = /YX lib_modifier = s - output_dir = Static_Release - intermediate_dir = Static_Release + output_dir = Release + intermediate_dir = Release debug_switch = } -Static Debug { +Debug { use_debug_libraries = 1 compile_flags = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy defines = _DEBUG compile_flags_removed = /YX lib_modifier = sd - output_dir = Static_Debug - intermediate_dir = Static_Debug + output_dir = Debug + intermediate_dir = Debug } MFC Release { diff --git a/bin/MakeProjectCreator/templates/vc7.mpd b/bin/MakeProjectCreator/templates/vc7.mpd index 7cff53ca0bc..e98557baa96 100644 --- a/bin/MakeProjectCreator/templates/vc7.mpd +++ b/bin/MakeProjectCreator/templates/vc7.mpd @@ -28,7 +28,7 @@ InlineFunctionExpansion="<%inline("2")%>" <%endif%> AdditionalIncludeDirectories="<%foreach(includes)%><%include%><%fornotlast(",")%><%endfor%><%if(zzip)%>,$(ZZIP_ROOT)\include<%endif%>" - PreprocessorDefinitions="<%if(type_is_dynamic)%><%foreach(dllflags)%><%dllflag%>;<%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%><%zzip_define%>;<%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%><%libflag%>;<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%><%pch_define%>;<%endfor%><%endif%><%foreach(defines common_defines macros)%><%define%><%fornotlast(";")%><%endfor%>" + PreprocessorDefinitions="<%if(type_is_dynamic)%><%foreach(dynamicflags)%><%dllflag%>;<%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%><%zzip_define%>;<%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%><%libflag%>;<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%><%pch_define%>;<%endfor%><%endif%><%foreach(defines common_defines macros)%><%define%><%fornotlast(";")%><%endfor%>" <%if(!debug)%> StringPooling="<%string_pooling("TRUE")%>" <%endif%> @@ -66,7 +66,7 @@ <%endif%> <%if(pdb)%> <%if(sharedname)%> - ProgramDatabaseFile="<%dllout%>\<%sharedname%><%lib_modifier%>.pdb" + ProgramDatabaseFile="<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb" <%else%> <%if(exename)%> ProgramDatabaseFile="<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb" @@ -154,18 +154,22 @@ Name="VCCustomBuildTool" Description="Invoking IDL Compiler on <%basename(idl_file)%> located in <%dirname(idl_file)%>" <%if(flag_overrides(idl_file, idlgendir))%> - CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" + CommandLine="PATH=%PATH%;<%idl_compiler_libs%> +<%idl_compiler%> -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" Outputs="<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.h;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.i;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.cpp;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.h;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.i;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.cpp"/> <%else%> <%if(idlgendir)%> - CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" + CommandLine="PATH=%PATH%;<%idl_compiler_libs%> +<%idl_compiler%> -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" Outputs="<%idlgendir%>\<%basenoextension(idl_file)%>C.h;<%idlgendir%>\<%basenoextension(idl_file)%>C.i;<%idlgendir%>\<%basenoextension(idl_file)%>C.cpp;<%idlgendir%>\<%basenoextension(idl_file)%>S.h;<%idlgendir%>\<%basenoextension(idl_file)%>S.i;<%idlgendir%>\<%basenoextension(idl_file)%>S.cpp"/> <%else%> <%if(dirname_found)%> - CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" + CommandLine="PATH=%PATH%;<%idl_compiler_libs%> +<%idl_compiler%> -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" Outputs="<%basenoextension(idl_file)%>C.h;<%basenoextension(idl_file)%>C.i;<%basenoextension(idl_file)%>C.cpp;<%basenoextension(idl_file)%>S.h;<%basenoextension(idl_file)%>S.i;<%basenoextension(idl_file)%>S.cpp"/> <%else%> - CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" + CommandLine="PATH=%PATH%;<%idl_compiler_libs%> +<%idl_compiler%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" Outputs="<%noextension(idl_file)%>C.h;<%noextension(idl_file)%>C.i;<%noextension(idl_file)%>C.cpp;<%noextension(idl_file)%>S.h;<%noextension(idl_file)%>S.i;<%noextension(idl_file)%>S.cpp"/> <%endif%> <%endif%> diff --git a/bin/MakeProjectCreator/templates/vc7dll.mpt b/bin/MakeProjectCreator/templates/vc7dll.mpt index 96b65d1cfc2..8e00dfa00fe 100644 --- a/bin/MakeProjectCreator/templates/vc7dll.mpt +++ b/bin/MakeProjectCreator/templates/vc7dll.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + configurations = Release Debug "Static Release" "Static Debug" common_defines = WIN32 _WINDOWS ssl_libs = libeay32 ssleay32 @@ -32,7 +34,7 @@ Static Release { output_dir = Static_Release intermediate_dir = Static_Release lib_modifier = s - need_libflags = 1 + need_staticflags = 1 runtime_library = 2 } @@ -44,7 +46,7 @@ Static Debug { output_dir = Static_Debug intermediate_dir = Static_Debug lib_modifier = sd - need_libflags = 1 + need_staticflags = 1 runtime_library = 3 } @@ -80,7 +82,7 @@ Static MFC Release { output_dir = Static_MFC_Release intermediate_dir = Static_MFC_Release lib_modifier = mfcs - need_libflags = 1 + need_staticflags = 1 runtime_library = 2 use_mfc = 2 } @@ -93,7 +95,7 @@ Static MFC Debug { output_dir = Static_MFC_Debug intermediate_dir = Static_MFC_Debug lib_modifier = mfcsd - need_libflags = 1 + need_staticflags = 1 runtime_library = 3 use_mfc = 2 } diff --git a/bin/MakeProjectCreator/templates/vc7exe.mpt b/bin/MakeProjectCreator/templates/vc7exe.mpt index e39356dc2a8..a2eaebe1f05 100644 --- a/bin/MakeProjectCreator/templates/vc7exe.mpt +++ b/bin/MakeProjectCreator/templates/vc7exe.mpt @@ -1,3 +1,5 @@ +conditional_include "idl_compiler_win32" + configurations = Release Debug "Static Release" "Static Debug" type_is_binary = 1 common_defines = WIN32 _CONSOLE @@ -29,7 +31,7 @@ Static Release { output_dir = Static_Release intermediate_dir = Static_Release lib_modifier = s - need_libflags = 1 + need_staticflags = 1 runtime_library = 2 } @@ -40,7 +42,7 @@ Static Debug { output_dir = Static_Debug intermediate_dir = Static_Debug lib_modifier = sd - need_libflags = 1 + need_staticflags = 1 runtime_library = 3 } @@ -71,7 +73,7 @@ Static MFC Release { output_dir = Static_MFC_Release intermediate_dir = Static_MFC_Release lib_modifier = mfcs - need_libflags = 1 + need_staticflags = 1 runtime_library = 2 use_mfc = 2 } @@ -83,7 +85,7 @@ Static MFC Debug { output_dir = Static_MFC_Debug intermediate_dir = Static_MFC_Debug lib_modifier = mfcsd - need_libflags = 1 + need_staticflags = 1 runtime_library = 3 use_mfc = 2 } diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm index bb1d6bb3271..ae656da8747 100644 --- a/bin/PerlACE/Process_Unix.pm +++ b/bin/PerlACE/Process_Unix.pm @@ -333,13 +333,18 @@ sub Kill () $self->{RUNNING} = 0; } -sub Wait () +# Wait until a process exits. +# return -1 if the process is still alive. +sub Wait ($) { my $self = shift; - + my $timeout = shift; + if (!defined $timeout || $timeout < 0) { waitpid ($self->{PROCESS}, 0); + } else { + return TimedWait($self, $timeout); + } - $self->{RUNNING} = 0; } sub TimedWait ($) diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm index 8369862e081..b0b9347029f 100644 --- a/bin/PerlACE/Process_Win32.pm +++ b/bin/PerlACE/Process_Win32.pm @@ -339,16 +339,28 @@ sub TerminateWaitKill ($) # Wait until a process exits. +# return -1 if the process is still alive. -sub Wait () +sub Wait ($) { my $self = shift; + my $timeout = shift; + if (!defined $timeout || $timeout < 0) { + $timeout = INFINITE; + } else { + $timeout = $timeout * 1000 * $PerlACE::Process::WAIT_DELAY_FACTOR; + } + + my $result = 0; if ($self->{RUNNING}) { - Win32::Process::Wait ($self->{PROCESS}, INFINITE); + $result = Win32::Process::Wait ($self->{PROCESS}, $timeout); + if ($result == 0) { + return -1; + } } - - $self->{RUNNING} = 0; + Win32::Process::GetExitCode ($self->{PROCESS}, $result); + return $result; } @@ -356,36 +368,9 @@ sub Wait () sub TimedWait ($) { - my $self = shift; - my $timeout = shift; - - if (!$self->{RUNNING}) { - return 0; - } - - if (Win32::Process::Wait ($self->{PROCESS}, - $timeout * 1000 * $PerlACE::Process::WAIT_DELAY_FACTOR) == 0) { - return -1; - } - - my $status = 0; - Win32::Process::GetExitCode ($self->{PROCESS}, $status); - - # If this was a WinCE test, the log file was copied back to the log - # directory but is named .txt, not .log. Rename it so the log analyzer - # can find it. - if (defined $self->{WINCE_CTL}) { - my $log_name_txt; - $log_name_txt = dirname($self->{EXECUTABLE})."\\log\\"; - $log_name_txt .= basename($self->{EXECUTABLE},'.EXE').".txt"; - if (-e $log_name_txt) { - my $log_name = $log_name_txt; - $log_name =~ s/\.txt$/.log/i; - rename($log_name_txt, $log_name); - } - } - - return $status; + my($self) = shift; + my($timeout) = shift; + return $self->Wait($timeout); } 1; diff --git a/bin/create_ace_build.pl b/bin/create_ace_build.pl new file mode 100755 index 00000000000..0891612932e --- /dev/null +++ b/bin/create_ace_build.pl @@ -0,0 +1,391 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# +# Creates an ACE build tree in directory "build/<build name>" below the $ACE_ROOT +# directory. The build tree directory structure mirrors that of the ACE +# top level directory structure, except that instead of containing any plain +# files, it contains only links to the files in the ACE top level structure. +# Symbolic links will be used instead of hard links if available. +# +# Makefiles, projects, and other build files are not linked. This allows +# use of MPC to generate the correct project types as needed. Use the +# -nompc option to disable this. +# +# This program has a similar purpose to "clone", but in addition to +# only creating symlinks (clone creates hard links, by default), this +# script: +# 1) uses relative rather than absolute symlinks, +# 2) tries not to put junk files into the build tree, +# 3) only creates a new tree in a build/ directory below the current, +# top level ACE directory (it's a feature :-), but it does enforce +# consistency). +# +# This program can be re-run on a build tree at any time in order to +# update it. It will add links for newly added files, and remove +# any that are no longer valid. +# Specifying no command line options will cause all current builds +# to be updated. +# +# If the <build name> starts with "build/", that part will be removed +# from it. + +use File::Find (); +use File::Basename; +use FileHandle; +use File::stat; + +$usage = "usage: $0 -? | [-d <directory mode>] [-v] [-nompc] <build name>\n"; +$directory_mode = 0777; #### Will be modified by umask, also. +$verbose = 0; +$mpc = 1; #### When using mpc, we don't want links created for mpc-generated files. +$update_all = 1; +$source='.'; + +#### +#### Check that we're in an ACE "top level" directory. +#### +unless (-d 'ace' && -d 'include') { + die "Must be in an ACE top level (ACE_ROOT) directory!\n"; +} +if (-e 'create_ace_build.links') { + die "Must be in an ACE top level (ACE_ROOT) directory!\n"; +} + +$perl_version = $] + 0; +if ($perl_version >= 5) { + #### Use an eval so that this script will compile with perl4. + eval <<'PERL5_CWD' + require Cwd; + sub cwd { + Cwd::getcwd (); + } +PERL5_CWD +} else { + sub cwd { + local ($pwd); + + chop ($pwd = `pwd`); + $pwd; + } +} + +my($starting_dir) = cwd (); +my(@nlinks) = (); +my(@build_re) = (); + +print "Creating or updating builds in $starting_dir\n"; + +sub is_changed { + my($real, $fake) = @_; + unless (-e $real) { + die "ERROR: is_changed() real $real not exist.\n"; + } + my($status1) = stat($real); + my($status2) = stat($fake); + my($tm1) = $status1->mtime; + + if ($status1->mtime != $status2->mtime) { + return 1; + } + if ($status1->size != $status2->size) { + return 1; + } + return 0; +} + +sub cab_link { + my($real,$fake,$build_regex) = @_; + my($uif) = ($^O eq 'MSWin32' ? 'link' : 'symlink'); + + my($status) = 0; + if ($^O eq 'MSWin32') { + my($fixed) = $fake; + $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); + $status = chdir($curdir); + if (! $status) { + die "ERROR: cab_link() chdir " . $curdir . " failed.\n"; + } + + my($base_fake) = basename($fake); + + if (-e $base_fake) { + if (is_changed($real, $base_fake)) { + unlink($base_fake); + } else { + return; + } + } + + print "$uif $real $fake\n" if $verbose; + $status = link ($real, $base_fake); + chdir($starting_dir); + } else { + print "$uif $real $fake\n" if $verbose; + $status = symlink ($real, $fake); + } + if (!$status) { + die "$0: $real -> $fake failed\n"; + } +} + +#### +#### Process command line args. +#### +while ($#ARGV >= 0 && $ARGV[0] =~ /^-/) { + if ($ARGV[0] eq '-v') { + $verbose = 1; + } elsif ($ARGV[0] eq '-d') { + if ($ARGV[1] =~ /^\d+$/) { + $directory_mode = eval ($ARGV[1]); shift; + } else { + warn "$0: must provide argument for -d option\n"; + die $usage; + } + } elsif ($ARGV[0] =~ /-[?hH]$/) { + die "$usage"; + } elsif ($ARGV[0] eq '-nompc') { + $mpc = 0; + } else { + warn "$0: unknown option $ARGV[0]\n"; + die $usage; + } + shift; +} + +@builds = (); + +if ($#ARGV == 0) { + $update_all = 0; + $builds[0] = $ARGV[0]; + $builds[0] =~ s%^build[/\\]%%; #### remove leading "build/", if any + $builds[0] = "build/$builds[0]"; +} else { + @builds = glob "build/*"; +} + +sub create_build_regex { + if ($^O eq 'MSWin32') { + for ($idx = 0; $idx <= $#builds; $idx++) { + ## Get the original build name + $build_re[$idx] = $builds[idx]; + + ## Remove any trailing slashes + $build_re[$idx] =~ s/[\\\/]+$//; + + ## Add a single trailing slash + $build_re[$idx] .= '/'; + + ## Escape any special characters + $build_re[$idx] =~ s/([\\\$\[\]\(\)\.])/\\$1/g; + } + } +} + +create_build_regex(); + +# all builds go in ACE_wrappers\build +unless (-d "$starting_dir/build") { + print "Creating $starting_dir/build\n"; + mkdir ("$starting_dir/build", $directory_mode); +} +foreach $build (@builds) { + unless (-d "$starting_dir/$build") { + print "Creating $starting_dir/$build\n"; + mkdir ("$starting_dir/$build", $directory_mode); + } +} + +#### +#### Get all ACE plain file and directory names. +#### +@files = (); + +sub wanted { + my ($dev,$ino,$mode,$nlink,$uid,$gid); + + $matches = ! (/^CVS\z/s && + ($File::Find::prune = 1) + || + /^build\z/s && + ($File::Find::prune = 1) + || + /^\..*obj\z/s && + ($File::Find::prune = 1) + || + /^Templates\.DB\z/s && + ($File::Find::prune = 1) + || + /^Debug\z/s && + ($File::Find::prune = 1) + || + /^Release\z/s && + ($File::Find::prune = 1) + || + /^Static_Debug\z/s && + ($File::Find::prune = 1) + || + /^Static_Release\z/s && + ($File::Find::prune = 1)); + + $matches = $matches && + ( + ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) && + ! -l $_ && + ! /^core\z/s && + ! /^.*\.state\z/s && + ! /^.*\.so\z/s && + ! /^.*\.[oa]\z/s && + ! /^.*\.dll\z/s && + ! /^.*\.lib\z/s && + ! /^.*\.obj\z/s && + ! /^.*~\z/s && + ! /^\.\z/s && + ! /^\.#.*\z/s && + ! /^.*\.log\z/s + ); + + if ($mpc && $matches) { + $matches = ( + ! /^.*\.dsp\z/s && + ! /^.*\.vcproj\z/s && + ! /^.*\.bor\z/s && + ! /^.*\.dsw\z/s && + ! /^.*\.sln\z/s && + ! /^.*\.vcp\z/s && + ! /^.*\.nmake\z/s && + ! /^.*\.am\z/s && + ! /^.*\.vcw\z/s && + ! /^.*\.mak\z/s && + ! /^.*\.bld\z/s && + ! /^.*\.icc\z/s && + ! /^.*\.icp\z/s && + ! /^.*\.ncb\z/s && + ! /^\.cvsignore\z/s && + ! /^Makefile.*\z/s + ); + } + + if ($matches) { + push(@files, $File::Find::name); + } +} + +File::Find::find({wanted => \&wanted}, '.'); + +print "Found $#files files and directories.\n"; + +#### +#### Create directories and symlinks to files. +#### +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]; + if (-d $fullname) { + unless (-d "$starting_dir/$build/$file") { + print "Creating $build/$file\n" if $verbose; + mkdir ("$starting_dir/$build/$file", $directory_mode); + } + } else { + unless ((-e "$build/$file") && ($^O ne 'MSWin32')) { + $up = '../..'; + while ($file =~ m%/%g) { + $up .= '/..'; + } + cab_link("$up/$file", "$build/$file", $build_re[$idx]); + } + } + } +} + +foreach $build (@builds) { + #### + #### Find all the symlinks in the build directory, and remove ones + #### that are no longer actually linked to a file. + #### + + if ($^O eq 'MSWin32') { + my($lfh) = new FileHandle(); + my($links_file) = "$starting_dir/$build/create_ace_build.links"; + if (-e $links_file) { + if (open($lfh, $links_file)) { + while(<$lfh>) { + my($line) = $_; + $line =~ s/\s+$//; + if (-e "$starting_dir/$line") { + ## The links were already added in cab_link when they + ## were checked for changes. + } else { + print "Removing $build/$line \n" if $verbose; + unlink("$starting_dir/$build/$line") || warn "$0: unlink of $build/$line failed\n"; + } + } + close($lfh); + } + unless (unlink($links_file)) { + die "Couldn't delete links file.\n"; + } + } + print "Writing $#nlinks links to link file.\n"; + if (open($lfh, ">$links_file")) { + foreach my $lnk (@nlinks) { + print $lfh "$lnk\n"; + } + close($lfh); + } else { + die "Couldn't open links file.\n"; + } + } + else { + @lfiles = (); + + sub lcheck { + ## There's no way to know if we have hard linked back to a now + ## non-existent file. So, just do the normal -l on the file + ## which will cause no files to be pushed on Windows. + if (-l $_) { + push(@lfiles, $File::Find::name); + } + } + + File::Find::find({wanted => \&lcheck}, $build); + + foreach (@lfiles) { + local @s = stat $_; + if ($#s == -1) { + print "Removing $_ \n" if $verbose; + unlink $_ || warn "$0: unlink of $_ failed\n"; + } + } + } + + #### + #### Done: print message. + #### + print "\nCompleted creation of $build/.\n"; + + if (! -e "$build/ace/config.h") { + print "Be sure to setup $build/ace/config.h"; + } + + if ($^O ne 'MSWin32' && + ! -e "$build/include/makeinclude/platform_macros.GNU") { + print " and\n$build/include/makeinclude/platform_macros.GNU"; + } + print ".\n"; +} + +#### EOF diff --git a/examples/ASX/CCM_App/ASX_CCM_App.mpc b/examples/ASX/CCM_App/ASX_CCM_App.mpc new file mode 100644 index 00000000000..c516b12d127 --- /dev/null +++ b/examples/ASX/CCM_App/ASX_CCM_App.mpc @@ -0,0 +1,23 @@ +project(*Lib) : acelib { + sharedname = ccm_app + Source_Files { + CCM_App.cpp + } +} + +project(*Server) : aceexe { + exename = server + after += ASX_CCM_App_Lib + Source_Files { + SC_Server.cpp + } +} + +project(*Client) : aceexe { + exename = client + after += ASX_CCM_App_Server + Source_Files { + SC_Client.cpp + } +} + diff --git a/examples/ASX/Message_Queue/ASX_Message_Queue.mpc b/examples/ASX/Message_Queue/ASX_Message_Queue.mpc new file mode 100644 index 00000000000..5cded44002c --- /dev/null +++ b/examples/ASX/Message_Queue/ASX_Message_Queue.mpc @@ -0,0 +1,21 @@ +project(*Bounded_Buffer) : aceexe { + exename = bounded_buffer + Source_Files { + bounded_buffer.cpp + } +} + +project(*Buffer_Stream) : aceexe { + exename = buffer_stream + Source_Files { + buffer_stream.cpp + } +} + +project(*Priority_Buffer) : aceexe { + exename = priority_buffer + Source_Files { + priority_buffer.cpp + } +} + diff --git a/examples/C++NPv1/C++NPv1.mpc b/examples/C++NPv1/C++NPv1.mpc new file mode 100644 index 00000000000..294d0aa629b --- /dev/null +++ b/examples/C++NPv1/C++NPv1.mpc @@ -0,0 +1,60 @@ +project(*Iterative_Logging_Server) : aceexe { + exename = iterative_logging_server + Source_Files { + Iterative_Logging_Server.cpp + Logging_Server.cpp + Logging_Handler.cpp + } +} + +project(*Logging_Client) : aceexe { + exename = logging_client + Source_Files { + Logging_Client.cpp + } +} + +project(*PPC_Logging_Server) : aceexe { + exename = ppc_logging_server + Source_Files { + Process_Per_Connection_Logging_Server.cpp + Logging_Server.cpp + Logging_Handler.cpp + } +} + +project(*Reactive_Logging_Server) : aceexe { + exename = reactive_logging_server + Source_Files { + Reactive_Logging_Server.cpp + Logging_Server.cpp + Logging_Handler.cpp + } +} + +project(*Reactive_Logging_Server_Ex) : aceexe { + exename = reactive_logging_server_ex + Source_Files { + Reactive_Logging_Server_Ex.cpp + Logging_Server.cpp + Logging_Handler.cpp + } +} + +project(*RTTPC_Logging_Server) : aceexe { + exename = RTTPC_logging_server + Source_Files { + RT_Thread_Per_Connection_Logging_Server.cpp + Logging_Server.cpp + Logging_Handler.cpp + } +} + +project(*TPC_Logging_Server) : aceexe { + exename = tpc_logging_server + Source_Files { + Thread_Per_Connection_Logging_Server.cpp + Logging_Server.cpp + Logging_Handler.cpp + } +}
\ No newline at end of file diff --git a/examples/C++NPv2/C++NPv2.mpc b/examples/C++NPv2/C++NPv2.mpc new file mode 100644 index 00000000000..acb17a62376 --- /dev/null +++ b/examples/C++NPv2/C++NPv2.mpc @@ -0,0 +1,138 @@ +project(*AC_CLD) : acelib, ssl { + sharedname = AC_CLD + dynamicflags = AC_CLD_BUILD_DLL + Source_Files { + AC_Client_Logging_Daemon.cpp + Logging_Handler.cpp + } +} + +project(*AIO_CLD) : acelib, ssl { + sharedname = AIO_CLD + dynamicflags = AIO_CLD_BUILD_DLL + Source_Files { + AIO_Client_Logging_Daemon.cpp + } +} + +project(*CLD) : acelib { + sharedname = CLD + dynamicflags = CLD_BUILD_DLL + Source_Files { + Client_Logging_Daemon.cpp + Logging_Acceptor.cpp + Logging_Event_Handler.cpp + Logging_Handler.cpp + } +} + +project(*Configurable_Logging_Server) : aceexe { + exename = configurable_logging_server + Source_Files { + Configurable_Logging_Server.cpp + Service_Reporter.cpp + } +} + +project(*Display_Logfile) : aceexe { + exename = display_logfile + Source_Files { + display_logfile.cpp + } +} + +project(*Reactor_Logging_Server) : aceexe { + exename = reactor_logging_server + Source_Files { + Logging_Acceptor.cpp + Logging_Event_Handler.cpp + Logging_Event_Handler_Ex.cpp + Logging_Handler.cpp + Reactor_Logging_Server.cpp + } +} + +project(*Select_Reactor_Logging_Server) : aceexe { + exename = select_reactor_loggin_server + Source_Files { + Logging_Acceptor.cpp + Logging_Event_Handler.cpp + Logging_Event_Handler_Ex.cpp + Logging_Handler.cpp + Select_Reactor_Logging_Server.cpp + } +} + +project(*SLD) : acelib { + sharedname = SLD + dynamicflags = SLD_BUILD_DLL + Source_Files { + SLD.cpp + Logging_Acceptor.cpp + Logging_Event_Handler.cpp + Logging_Handler.cpp + } +} + +project(*SLDex) : acelib { + sharedname = SLDex + dynamicflags = SLDEX_BUILD_DLL + Source_Files { + Logging_Acceptor.cpp + Logging_Event_Handler.cpp + Logging_Event_Handler_Ex.cpp + Logging_Handler.cpp + Reactor_Logging_Server_Adapter.cpp + Server_Shutdown.cpp + SLDex.cpp + } +} + +project(*SR_Configurable_Logging_Server) : aceexe { + exename = sr_configurable_logging_server + Source_Files { + SR_Configurable_Logging_Server.cpp + } +} + +project(*TP_Reactor_Logging_Server) : aceexe { + exename = tp_reactor_logging_server + Source_Files { + Logging_Acceptor.cpp + Logging_Event_Handler.cpp + Logging_Event_Handler_Ex.cpp + Logging_Handler.cpp + TP_Reactor_Logging_Server.cpp + } +} + +project(*TPCLS) : acelib, ssl { + sharedname = TPCLS + dynamicflags = TPCLS_BUILD_DLL + Source_Files { + TPC_Logging_Server.cpp + Logging_Handler.cpp + } +} + +project(*TPLS) : acelib { + sharedname = TPLS + dynamicflags = TPLS_BUILD_DLL + Source_Files { + Logging_Acceptor.cpp + Logging_Event_Handler.cpp + Logging_Handler.cpp + TP_Logging_Server.cpp + } +} + +project(*WFMO_Reactor_Logging_Server) : aceexe { + exename = wfmo_reactor_logging_server + Source_Files { + Logging_Acceptor.cpp + Logging_Event_Handler.cpp + Logging_Event_Handler_Ex.cpp + Logging_Handler.cpp + WFMO_Reactor_Logging_Server.cpp + } +} diff --git a/examples/ConfigViewer/ConfigViewer.mpc b/examples/ConfigViewer/ConfigViewer.mpc new file mode 100644 index 00000000000..858a373f9a8 --- /dev/null +++ b/examples/ConfigViewer/ConfigViewer.mpc @@ -0,0 +1,3 @@ +project : aceexe { + requires += wxwindows +}
\ No newline at end of file diff --git a/examples/Connection/blocking/Connection_Blocking.mpc b/examples/Connection/blocking/Connection_Blocking.mpc new file mode 100644 index 00000000000..0bdcb8935ae --- /dev/null +++ b/examples/Connection/blocking/Connection_Blocking.mpc @@ -0,0 +1,16 @@ +project(*acceptor) : aceexe { + exename = acceptor + Source_Files { + SPIPE-acceptor.cpp + test_spipe_acceptor.cpp + } +} + +project(*connector) : aceexe { + exename = connector + Source_Files { + SPIPE-connector.cpp + test_spipe_connector.cpp + } +} + diff --git a/examples/Connection/misc/Connection_Misc.mpc b/examples/Connection/misc/Connection_Misc.mpc new file mode 100644 index 00000000000..96a1734cd52 --- /dev/null +++ b/examples/Connection/misc/Connection_Misc.mpc @@ -0,0 +1,13 @@ +project (*Handler) : aceexe { + exename = handler + Source_Files { + Connection_Handler.cpp + } +} + +project (*test_upipe) : aceexe { + exename = test_upipe + Source_Files { + test_upipe.cpp + } +}
\ No newline at end of file diff --git a/examples/Connection/non_blocking/Connection_Non_Blocking.mpc b/examples/Connection/non_blocking/Connection_Non_Blocking.mpc new file mode 100644 index 00000000000..755655e40cf --- /dev/null +++ b/examples/Connection/non_blocking/Connection_Non_Blocking.mpc @@ -0,0 +1,63 @@ +project (*SockClient) : aceexe { + exename = sock_client + Source_Files { + CPP-connector.cpp + test_sock_connector.cpp + } +} + +project (*SockServer) : aceexe { + exename = sock_server + Source_Files { + CPP-acceptor.cpp + test_sock_acceptor.cpp + } +} + +project (*LSockClient) : aceexe { + exename = lsock_client + Source_Files { + CPP-connector.cpp + test_lsock_connector.cpp + } +} + +project (*LSockServer) : aceexe { + exename = lsock_server + Source_Files { + CPP-acceptor.cpp + test_lsock_acceptor.cpp + } +} + +project (*SPipeClient) : aceexe { + exename = spipe_client + Source_Files { + CPP-connector.cpp + test_spipe_connector.cpp + } +} + +project (*SPipeServer) : aceexe { + exename = spipe_server + Source_Files { + CPP-acceptor.cpp + test_spipe_acceptor.cpp + } +} + +project (*TLIClient) : aceexe { + exename = tli_client + Source_Files { + CPP-connector.cpp + test_tli_connector.cpp + } +} + +project (*TLIServer) : aceexe { + exename = tli_server + Source_Files { + CPP-acceptor.cpp + test_tli_acceptor.cpp + } +}
\ No newline at end of file diff --git a/examples/DLL/DLL.mpc b/examples/DLL/DLL.mpc new file mode 100644 index 00000000000..12a352ff929 --- /dev/null +++ b/examples/DLL/DLL.mpc @@ -0,0 +1,18 @@ +project(*Newsweek) : acelib { + Source_Files { + Newsweek.cpp + } +} + +project(*Today) : acelib { + Source_Files { + Today.cpp + } +} + +project(*Main) : aceexe { + after += DLL_Newsweek DLL_Today + Source_Files { + test_dll.cpp + } +}
\ No newline at end of file diff --git a/examples/Export/Export.mpc b/examples/Export/Export.mpc new file mode 100644 index 00000000000..3f495777fcd --- /dev/null +++ b/examples/Export/Export.mpc @@ -0,0 +1,17 @@ +project(*Lib) : acelib { + dynamicflags += TEST_BUILD_DLL + Source_Files { + dll.cpp + } + Header_Files { + dll.h + test_export.h + } +} + +project(*test) : aceexe { + after += Export_Lib + Source_Files { + test.cpp + } +} diff --git a/examples/IOStream/client/IOStream_Client.mpc b/examples/IOStream/client/IOStream_Client.mpc new file mode 100644 index 00000000000..859bea8225a --- /dev/null +++ b/examples/IOStream/client/IOStream_Client.mpc @@ -0,0 +1,2 @@ +project : aceexe { +}
\ No newline at end of file diff --git a/examples/IOStream/server/IOStream_Server.mpc b/examples/IOStream/server/IOStream_Server.mpc new file mode 100644 index 00000000000..859bea8225a --- /dev/null +++ b/examples/IOStream/server/IOStream_Server.mpc @@ -0,0 +1,2 @@ +project : aceexe { +}
\ No newline at end of file diff --git a/examples/IPC_SAP/ATM_SAP/atm_sap.mpc b/examples/IPC_SAP/ATM_SAP/atm_sap.mpc new file mode 100644 index 00000000000..14bd5a68b2b --- /dev/null +++ b/examples/IPC_SAP/ATM_SAP/atm_sap.mpc @@ -0,0 +1,13 @@ +project(*client) : aceexe { + exename = client + Source_Files { + CPP-client.cpp + } +} + +project(*server) : aceexe { + exename = server + Source_Files { + CPP-server.cpp + } +}
\ No newline at end of file diff --git a/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc b/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc new file mode 100644 index 00000000000..bdd3c62b0ac --- /dev/null +++ b/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc @@ -0,0 +1,3 @@ +project : aceexe { +} + diff --git a/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc b/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc new file mode 100644 index 00000000000..bdd3c62b0ac --- /dev/null +++ b/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc @@ -0,0 +1,3 @@ +project : aceexe { +} + diff --git a/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc b/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc new file mode 100644 index 00000000000..c14d285a3a4 --- /dev/null +++ b/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc @@ -0,0 +1,36 @@ +project(*client) : aceexe { + exename = FIFO-client + Source_Files { + FIFO-client.cpp + } +} + +project(*server) : aceexe { + exename = FIFO-server + Source_Files { + FIFO-server.cpp + } +} + +project(*Msg_Client) : aceexe { + exename = FIFO-Msg-client.cpp + Source_Files { + FIFO-Msg-client.cpp + } +} + +project(*Msg_Server) : aceexe { + exename = FIFO-Msg-server + Source_Files { + FIFO-Msg-server.cpp + } +} + +project(*test) : aceexe { + exename = FIFO-test + Source_Files { + FIFO-test.cpp + } +} + + diff --git a/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc b/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc new file mode 100644 index 00000000000..5c9256e2070 --- /dev/null +++ b/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc @@ -0,0 +1,7 @@ +project : aceexe { + exename = client + Source_Files { + client.cpp + } +} + diff --git a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc new file mode 100644 index 00000000000..8ed8780b6a6 --- /dev/null +++ b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc @@ -0,0 +1,56 @@ +project(*C_inclient) : aceexe { + exename = C-inclient + Source_Files { + C_inclient.cpp + } +} + +project(*C_inserver) : aceexe { + exename = C-inserver + Source_Files { + C-inserver.cpp + } +} + +project(*CPP_inclient) : aceexe { + exename = CPP-inclient + Source_Files { + CPP-inclient.cpp + } +} + +project(*CPP_inserver) : aceexe { + exename = CPP-inserver + Source_Files { + CPP-inserver.cpp + } +} + +project(*CPP_memclient) : aceexe { + exename = CPP-memclient + Source_Files { + CPP-memclient.cpp + } +} + +project(*CPP_memserver) : aceexe { + exename = CPP-memserver + Source_Files { + CPP-memserver.cpp + } +} + +project(*FD_unclient) : aceexe { + exename = FD-unclient + Source_Files { + FD-unclient.cpp + } +} + +project(*CPP_unserver) : aceexe { + exename = FD-unserver + Source_Files { + FD-unserver.cpp + } +} + diff --git a/examples/IPC_SAP/SPIPE_SAP/SPIPE_SAP.mpc b/examples/IPC_SAP/SPIPE_SAP/SPIPE_SAP.mpc new file mode 100644 index 00000000000..9b2256b7004 --- /dev/null +++ b/examples/IPC_SAP/SPIPE_SAP/SPIPE_SAP.mpc @@ -0,0 +1,55 @@ +project(*client) : aceexe { + exename = client + Source_Files { + client.cpp + } +} + +project(*consumer_msg) : aceexe { + exename = consumer_msg + Source_Files { + consumer_msg.cpp + } +} + +project(*consumer_read) : aceexe { + exename = consumer_read + Source_Files { + consumer_read.cpp + } +} + +project(*NPClient) : aceexe { + exename = NPClient + Source_Files { + NPClient.cpp + } +} + +project(*NPServer) : aceexe { + exename = NPServer + Source_Files { + NPServer.cpp + } +} + +project(*producer_msg) : aceexe { + exename = producer_msg + Source_Files { + producer_msg.cpp + } +} + +project(*producer_read) : aceexe { + exename = producer_read + Source_Files { + producer_read.cpp + } +} + +project(*server) : aceexe { + exename = server + Source_Files { + server.cpp + } +} diff --git a/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc b/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc new file mode 100644 index 00000000000..efae4a6e180 --- /dev/null +++ b/examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc @@ -0,0 +1,41 @@ +project(*client) : aceexe { + exename = client + Source_Files { + SSL-client.cpp + } +} + +project(*client_simple) : aceexe { + exename = client-simple + Source_Files { + SSL-client-simple.cpp + } +} + +project(*server) : aceexe { + exename = server + Source_Files { + SSL-server.cpp + } +} + +project(*server_fancy) : aceexe { + exename = server-fancy + Source_Files { + SSL-server-fancy.cpp + } +} + +project(*server_poll) : aceexe { + exename = server-poll + Source_Files { + SSL-server-poll.cpp + } +} + +project(*server_simple) : aceexe { + exename = server-simple + Source_Files { + SSL-server-simple.cpp + } +} diff --git a/examples/IPC_SAP/TLI_SAP/TLI_SAP.mpc b/examples/IPC_SAP/TLI_SAP/TLI_SAP.mpc new file mode 100644 index 00000000000..b0cfb687ebe --- /dev/null +++ b/examples/IPC_SAP/TLI_SAP/TLI_SAP.mpc @@ -0,0 +1,55 @@ +project(*ATM_client) : aceexe { + exename = ATM-client + Source_Files { + CPP-ATM-client.cpp + } +} + +project(*ATM_server) : aceexe { + exename = ATM-server + Source_Files { + CPP-ATM-server.cpp + } +} + +project(*CPP_client) : aceexe { + exename = CPP-client + Source_Files { + CPP-client.cpp + } +} + +project(*CPP_server) : aceexe { + exename = CPP-server + Source_Files { + CPP-server.cpp + } +} + +project(*db_client) : aceexe { + exename = db-client + Source_Files { + db-client.cpp + } +} + +project(*db_server) : aceexe { + exename = db-server + Source_Files { + db-server.cpp + } +} + +project(*ftp_client) : aceexe { + exename = ftp-client + Source_Files { + ftp-client.cpp + } +} + +project(*ftp_server) : aceexe { + exename = ftp-server + Source_Files { + ftp-server.cpp + } +} diff --git a/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc b/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc new file mode 100644 index 00000000000..ffaea64a392 --- /dev/null +++ b/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc @@ -0,0 +1,20 @@ +project(*ex1) : aceexe { + exename = ex1 + Source_Files { + ex1.cpp + } +} + +project(*ex2) : aceexe { + exename = ex2 + Source_Files { + ex2.cpp + } +} + +project(*ex3) : aceexe { + exename = ex3 + Source_Files { + ex3.cpp + } +} diff --git a/examples/Log_Msg/Log_Msg.mpc b/examples/Log_Msg/Log_Msg.mpc new file mode 100644 index 00000000000..01e7a37b767 --- /dev/null +++ b/examples/Log_Msg/Log_Msg.mpc @@ -0,0 +1,20 @@ +project(*test_log_msg) : aceexe { + exename = test_log_msg + Source_Files { + test_log_msg.cpp + } +} + +project(*test_ostream) : aceexe { + exename = test_ostream + Source_Files { + test_ostream.cpp + } +} + +project(*test_callback) : aceexe { + exename = test_callback + Source_Files { + test_callback.cpp + } +} diff --git a/examples/Logger/Acceptor-server/Logger_Acceptor_Server.mpc b/examples/Logger/Acceptor-server/Logger_Acceptor_Server.mpc new file mode 100644 index 00000000000..859bea8225a --- /dev/null +++ b/examples/Logger/Acceptor-server/Logger_Acceptor_Server.mpc @@ -0,0 +1,2 @@ +project : aceexe { +}
\ No newline at end of file diff --git a/examples/Logger/client/Logger_client.mpc b/examples/Logger/client/Logger_client.mpc new file mode 100644 index 00000000000..859bea8225a --- /dev/null +++ b/examples/Logger/client/Logger_client.mpc @@ -0,0 +1,2 @@ +project : aceexe { +}
\ No newline at end of file diff --git a/examples/Logger/simple-server/Logger_Simple_Server.mpc b/examples/Logger/simple-server/Logger_Simple_Server.mpc new file mode 100644 index 00000000000..859bea8225a --- /dev/null +++ b/examples/Logger/simple-server/Logger_Simple_Server.mpc @@ -0,0 +1,2 @@ +project : aceexe { +}
\ No newline at end of file diff --git a/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc b/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc new file mode 100644 index 00000000000..859bea8225a --- /dev/null +++ b/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc @@ -0,0 +1,2 @@ +project : aceexe { +}
\ No newline at end of file diff --git a/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc b/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc new file mode 100644 index 00000000000..859bea8225a --- /dev/null +++ b/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc @@ -0,0 +1,2 @@ +project : aceexe { +}
\ No newline at end of file diff --git a/examples/Misc/Misc.mpc b/examples/Misc/Misc.mpc new file mode 100644 index 00000000000..1655b80b2a0 --- /dev/null +++ b/examples/Misc/Misc.mpc @@ -0,0 +1,62 @@ +project(*test_dump) : aceexe { + exename = test_dump + Source_Files { + test_dump.cpp + } +} + +project(*test_get_opt) : aceexe { + exename = test_get_opt + Source_Files { + test_get_opt.cpp + } +} + +project(*test_profile_timer) : aceexe { + exename = test_profile_timer + Source_Files { + test_profile_timer.cpp + } +} + +project(*test_read_buffer) : aceexe { + exename = test_read_buffer + Source_Files { + test_read_buffer.cpp + } +} + +project(*test_set) : aceexe { + exename = test_set + Source_Files { + test_set.cpp + } +} + +project(*test_sstring) : aceexe { + exename = test_sstring + Source_Files { + test_sstring.cpp + } +} + +project(*test_trace) : aceexe { + exename = test_trace + Source_Files { + test_trace.cpp + } +} + +project(*test_XtReactor1) : aceexe { + exename = test_XtReactor1 + Source_Files { + test_XtReactor1.cpp + } +} + +project(*test_XtReactor2) : aceexe { + exename = test_XtReactor2 + Source_Files { + test_XtReactor2.cpp + } +} diff --git a/examples/Naming/Naming.mpc b/examples/Naming/Naming.mpc new file mode 100644 index 00000000000..b8848fcf6da --- /dev/null +++ b/examples/Naming/Naming.mpc @@ -0,0 +1,27 @@ +project(*multiple_contexts) : aceexe { + exename = multiple_contexts + Source_Files { + test_multiple_contexts.cpp + } +} + +project(*non_existent) : aceexe { + exename = non_existent + Source_Files { + test_non_existent.cpp + } +} + +project(*writers) : aceexe { + exename = writers + Source_Files { + test_writers.cpp + } +} + +project(*open) : aceexe { + exename = open + Source_Files { + test_open.cpp + } +} diff --git a/examples/OS/Process/OS_Process.mpc b/examples/OS/Process/OS_Process.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/OS/Process/OS_Process.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc b/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/QOS/Change_Receiver_FlowSpec/QOS_Change_Receiver_FlowSpec.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc b/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/QOS/Change_Sender_TSpec/QOS_Change_Sender_FlowSpec.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/QOS/Diffserv/QOS_Diffserv.mpc b/examples/QOS/Diffserv/QOS_Diffserv.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/QOS/Diffserv/QOS_Diffserv.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/QOS/Simple/QOS_Simple.mpc b/examples/QOS/Simple/QOS_Simple.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/QOS/Simple/QOS_Simple.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/RMCast/Send_File/RMCast_Send_File.mpc b/examples/RMCast/Send_File/RMCast_Send_File.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/RMCast/Send_File/RMCast_Send_File.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Reactor/Dgram/Reactor_Dgram.mpc b/examples/Reactor/Dgram/Reactor_Dgram.mpc new file mode 100644 index 00000000000..24b02947f9c --- /dev/null +++ b/examples/Reactor/Dgram/Reactor_Dgram.mpc @@ -0,0 +1,14 @@ +project(*CO) : aceexe { + exename = codgram + Source_Files { + CODgram.cpp + } +} + +project : aceexe { + exename = dgram + Source_Files { + Dgram.cpp + } +} + diff --git a/examples/Reactor/FIFO/Reactor_FIFO.mpc b/examples/Reactor/FIFO/Reactor_FIFO.mpc new file mode 100644 index 00000000000..ec5d2d3eead --- /dev/null +++ b/examples/Reactor/FIFO/Reactor_FIFO.mpc @@ -0,0 +1,13 @@ +project(*client) : aceexe { + exename = client + Source_Files { + client.cpp + } +} + +project(*server) : aceexe { + exename = server + Source_Files { + server.cpp + } +} diff --git a/examples/Reactor/Misc/Reactor_Misc.mpc b/examples/Reactor/Misc/Reactor_Misc.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Reactor/Misc/Reactor_Misc.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Reactor/Multicast/Reactor_Multicast.mpc b/examples/Reactor/Multicast/Reactor_Multicast.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Reactor/Multicast/Reactor_Multicast.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Reactor/Ntalker/Reactor_Ntalker.mpc b/examples/Reactor/Ntalker/Reactor_Ntalker.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Reactor/Ntalker/Reactor_Ntalker.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Reactor/Proactor/Proactor.mpc b/examples/Reactor/Proactor/Proactor.mpc new file mode 100644 index 00000000000..81ff06331a3 --- /dev/null +++ b/examples/Reactor/Proactor/Proactor.mpc @@ -0,0 +1,49 @@ +project(*cancel) : aceexe { + exename = test_cancel + Source_Files { + test_cancel.cpp + } +} + +project(*end_event_loops) : aceexe { + exename = test_end_event_loop + Source_Files { + test_end_event_loop.cpp + } +} + +project(*multiple_loops) : aceexe { + exename = test_multiple_loops + Source_Files { + test_multiple_loops.cpp + } +} + +project(*post_completions) : aceexe { + exename = test_post_completions + Source_Files { + post_completions.cpp + } +} + +project(*proactor) : aceexe { + exename = test_proactor + Source_Files { + test_proactor.cpp + } +} + +project(*timeout) : aceexe { + exename = test_timeout + Source_Files { + test_timeout.cpp + } +} + +project(*udp_proactor) : aceexe { + exename = test_udp_proactor + Source_Files { + test_udp_proactor.cpp + } +} + diff --git a/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc b/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc index a01c9126210..fd3f031c332 100644 --- a/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc +++ b/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc @@ -1,94 +1,110 @@ -project(Abandoned): aceexe { +project(*Abandoned): aceexe { + exename = abandoned Source_Files { Abandoned.cpp } } -project(APC): aceexe { +project(*APC): aceexe { + exename = apc Source_Files { APC.cpp } } -project(Console_Input): aceexe { +project(*Console_Input): aceexe { + exename = console_input Source_Files { Console_Input.cpp } } -project(Directory_Changes): aceexe { +project(*Directory_Changes): aceexe { + exename = directory_changes Source_Files { Directory_Changes.cpp } } -project(Exceptions): aceexe { +project(*Exceptions): aceexe { + exename = exceptions Source_Files { Exceptions.cpp } } -project(Handle_Close): aceexe { +project(*Handle_Close): aceexe { + exename = handle_close Source_Files { Handle_Close.cpp } } -project(Multithreading): aceexe { +project(*Multithreading): aceexe { + exename = multithreading Source_Files { Multithreading.cpp } } -project(Network_Events): aceexe { +project(*Network_Events): aceexe { + exename = network_events Source_Files { Network_Events.cpp } } -project(Prerun_State_Changes): aceexe { +project(*Prerun_State_Changes): aceexe { + exename = prerun_state_changes Source_Files { Prerun_State_Changes.cpp } } -project(Registration): aceexe { +project(*Registration): aceexe { + exename = registration Source_Files { Registration.cpp } } -project(Registry_Changes): aceexe { +project(*Registry_Changes): aceexe { + exename = registry_changes Source_Files { Registry_Changes.cpp } } -project(Removals): aceexe { +project(*Removals): aceexe { + exename = removals Source_Files { Removals.cpp } } -project(Suspended_Removals): aceexe { +project(*Suspended_Removals): aceexe { + exename = suspended_removals Source_Files { Suspended_Removals.cpp } } -project(Talker): aceexe { +project(*Talker): aceexe { + exename = talker Source_Files { Talker.cpp } } -project(Timeouts): aceexe { +project(*Timeouts): aceexe { + exename = timeouts Source_Files { Timeouts.cpp } } -project(Window_Messages): aceexe { +project(*Window_Messages): aceexe { + exename = window_messages Source_Files { Window_Messages.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 new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Service_Configurator/IPC-tests/client/Service_Configurator_IPC_Client.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} 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 new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Service_Configurator/IPC-tests/server/Service_Configurator_IPC_Server.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc b/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Shared_Malloc/Shared_Malloc.mpc b/examples/Shared_Malloc/Shared_Malloc.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Shared_Malloc/Shared_Malloc.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Shared_Memory/Shared_Memory.mpc b/examples/Shared_Memory/Shared_Memory.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Shared_Memory/Shared_Memory.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Smart_Pointers/Smart_Pointers.mpc b/examples/Smart_Pointers/Smart_Pointers.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Smart_Pointers/Smart_Pointers.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} 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 new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc b/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Threads/Threads.mpc b/examples/Threads/Threads.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Threads/Threads.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Timer_Queue/Timer_Queue.mpc b/examples/Timer_Queue/Timer_Queue.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Timer_Queue/Timer_Queue.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/Web_Crawler/Web_Crawler.mpc b/examples/Web_Crawler/Web_Crawler.mpc new file mode 100644 index 00000000000..40b5bee1653 --- /dev/null +++ b/examples/Web_Crawler/Web_Crawler.mpc @@ -0,0 +1,2 @@ +project : aceexe { +} diff --git a/examples/example_base.mpb b/examples/example_base.mpb new file mode 100644 index 00000000000..9dd95cad720 --- /dev/null +++ b/examples/example_base.mpb @@ -0,0 +1,5 @@ +// Anything specific to examples could be added here. +// examples.mwc uses the implicit keyword to cause this +// project to be used as the base for all examples, +project : aceexe { +}
\ No newline at end of file diff --git a/examples/examples.mwc b/examples/examples.mwc new file mode 100644 index 00000000000..7e713c519fc --- /dev/null +++ b/examples/examples.mwc @@ -0,0 +1,11 @@ +workspace { + // This doesn't work quite yet, because not all the projects + // can be created implicitly. To fix this, we can either create + // a separate directory for each separate project, or we can + // add mpc files for C++NPv1/2 and other problem directories. + // The nice thing about splitting up into separate directories is + // that it completely eliminates mpc maintenance. + + implicit = 1 + cmdline += -include $PWD -base example_base +} diff --git a/nightly.mwc b/nightly.mwc deleted file mode 100644 index 25da21e169b..00000000000 --- a/nightly.mwc +++ /dev/null @@ -1,7 +0,0 @@ -workspace { - ace/ace.mpc - ace/RMCast - apps/gperf/src - tests - TAO -} diff --git a/performance-tests/perf.mwc b/performance-tests/perf.mwc new file mode 100644 index 00000000000..d90104a2381 --- /dev/null +++ b/performance-tests/perf.mwc @@ -0,0 +1,2 @@ +workspace { +} diff --git a/tests/RMCast/tests.mpc b/tests/RMCast/tests.mpc index 6cf673fe9a4..2a858052f43 100644 --- a/tests/RMCast/tests.mpc +++ b/tests/RMCast/tests.mpc @@ -1,64 +1,40 @@ -project(RMCast Fragment Test) : aceexe { - depends += RMCast Test_Output +project(RMCast Fragment Test) : aceexe, rmcast { exename = RMCast_Fragment_Test - libs += ACE_RMCast Test_Output - libpaths += .. - Source_Files { RMCast_Fragment_Test.cpp } } -project(RMCast Membership Test) : aceexe { - depends += RMCast Test_Output +project(RMCast Membership Test) : aceexe, rmcast { exename = RMCast_Membership_Test - libs += ACE_RMCast Test_Output - libpaths += .. - Source_Files { RMCast_Membership_Test.cpp } } -project(RMCast Reassembly Test) : aceexe { - depends += RMCast Test_Output +project(RMCast Reassembly Test) : aceexe, rmcast { exename = RMCast_Reassembly_Test - libs += ACE_RMCast Test_Output - libpaths += .. - Source_Files { RMCast_Reassembly_Test.cpp } } -project(RMCast Reordering Test) : aceexe { - depends += RMCast Test_Output +project(RMCast Reordering Test) : aceexe, rmcast { exename = RMCast_Reordering_Test - libs += ACE_RMCast Test_Output - libpaths += .. - Source_Files { RMCast_Reordering_Test.cpp } } -project(RMCast Retransmission Test) : aceexe { - depends += RMCast Test_Output +project(RMCast Retransmission Test) : aceexe, rmcast { exename = RMCast_Retransmission_Test - libs += ACE_RMCast Test_Output - libpaths += .. - Source_Files { RMCast_Retransmission_Test.cpp } } -project(RMCast UDP Best Effort Test) : aceexe { - depends += RMCast Test_Output +project(RMCast UDP Best Effort Test) : aceexe, rmcast { exename = RMCast_UDP_Best_Effort_Test - libs += ACE_RMCast Test_Output - libpaths += .. - Source_Files { RMCast_UDP_Best_Effort_Test.cpp } diff --git a/tests/SSL/tests.mpc b/tests/SSL/tests.mpc index b53c46cef3e..4c5e2aac4b9 100644 --- a/tests/SSL/tests.mpc +++ b/tests/SSL/tests.mpc @@ -1,11 +1,5 @@ -project(Thread Pool Reactor SSL Test) : aceexe { - ssl = 1 - requires += ssl - depends += SSL Test_Output - exename = Thread_Pool_Reactor_SSL_Test - libs += ACE_SSL Test_Output - libpaths += .. - +project(Thread Pool Reactor SSL Test) : aceexe, 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 new file mode 100644 index 00000000000..6d08318f689 --- /dev/null +++ b/tests/acetest.mpb @@ -0,0 +1,10 @@ +project : aceexe { + Header_Files { + } + Resource_Files { + } + Documentation_Files { + } + Inline_Files { + } +}
\ No newline at end of file diff --git a/tests/tests.mpc b/tests/tests.mpc index 1c7cbf4ed9b..de843f228fc 100644 --- a/tests/tests.mpc +++ b/tests/tests.mpc @@ -1,19 +1,6 @@ -project(Test_Output) : acelib { - sharedname = Test_Output - dllflags = TEST_OUTPUT_BUILD_DLL - - Source_Files { - Test_Output.cpp - } - Header_Files { - test_config.h - Test_Output_Export.h - } -} - project(Framework Component DLL) : acelib { - sharedname = Framework_Component_DLL - dllflags = FRAMEWORK_COMPONENT_DLL_BUILD_DLL + sharedname = Framework_Component_DLL + dynamicflags = FRAMEWORK_COMPONENT_DLL_BUILD_DLL Source_Files { Framework_Component_DLL.cpp @@ -22,11 +9,13 @@ project(Framework Component DLL) : acelib { Framework_Component_DLL.h Framework_Component_DLL_Export.h } + Resource_Files { + } } project(DLL Test Lib) : acelib { - sharedname = DLL_Test - dllflags = ACE_BUILD_SVC_DLL + sharedname = DLL_Test + dynamicflags = ACE_BUILD_SVC_DLL Source_Files { DLL_Test_Impl.cpp @@ -34,11 +23,13 @@ project(DLL Test Lib) : acelib { Header_Files { test_config.h } + Resource_Files { + } } project(Service Config DLL) : acelib { - sharedname = Service_Config_DLL - dllflags = SERVICE_CONFIG_DLL_BUILD_DLL + sharedname = Service_Config_DLL + dynamicflags = SERVICE_CONFIG_DLL_BUILD_DLL Source_Files { Service_Config_DLL.cpp @@ -47,1515 +38,874 @@ project(Service Config DLL) : acelib { Service_Config_DLL.h Service_Config_DLL_Export.h } -} - -project(ACE Test) : aceexe { - exename = ACE_Test - libs += Test_Output - depends += Test_Output - Source_Files { - ACE_Test.cpp - Main.cpp - } - Header_Files { + Resource_Files { } } -project(ACE Init Test) : aceexe { - exename = ACE_Init_Test - libs += Test_Output - depends += Test_Output +project(ACE INIT Test) : acetest { Source_Files { ACE_Init_Test.cpp - Main.cpp - } - Header_Files { } } -project(Aio Platform Test) : aceexe { +project(Aio Platform Test) : acetest { exename = Aio_Platform_Test - libs += Test_Output - depends += Test_Output Source_Files { Aio_Platform_Test.cpp - Main.cpp - } - Header_Files { } } -project(Arg Shifter Test) : aceexe { +project(Arg Shifter Test) : acetest { exename = Arg_Shifter_Test - libs += Test_Output - depends += Test_Output Source_Files { Arg_Shifter_Test.cpp - Main.cpp - } - Header_Files { } } -project(ARGV Test) : aceexe { +project(ARGV Test) : acetest { exename = ARGV_Test - libs += Test_Output - depends += Test_Output Source_Files { ARGV_Test.cpp - Main.cpp - } - Header_Files { } } -project(Atomic Op Test) : aceexe { +project(Atomic Op Test) : acetest { exename = Atomic_Op_Test - libs += Test_Output - depends += Test_Output Source_Files { Atomic_Op_Test.cpp - Main.cpp - } - Header_Files { } } -project(Auto IncDec Test) : aceexe { +project(Auto IncDec Test) : acetest { exename = Auto_IncDec_Test - libs += Test_Output - depends += Test_Output Source_Files { Auto_IncDec_Test.cpp - Main.cpp - } - Header_Files { } } -project(Barrier Test) : aceexe { +project(Barrier Test) : acetest { exename = Barrier_Test - libs += Test_Output - depends += Test_Output Source_Files { Barrier_Test.cpp - Main.cpp - } - Header_Files { } } -project(Basic Types Test) : aceexe { +project(Basic Types Test) : acetest { exename = Basic_Types_Test - libs += Test_Output - depends += Test_Output Source_Files { Basic_Types_Test.cpp - Main.cpp - } - Header_Files { } } -project(Bound Ptr Test) : aceexe { +project(Bound Ptr Test) : acetest { exename = Bound_Ptr_Test - libs += Test_Output - depends += Test_Output Source_Files { Bound_Ptr_Test.cpp - Main.cpp - } - Header_Files { } } -project(Buffer Stream Test) : aceexe { +project(Buffer Stream Test) : acetest { exename = Buffer_Stream_Test - libs += Test_Output - depends += Test_Output Source_Files { Buffer_Stream_Test.cpp - Main.cpp - } - Header_Files { } } -project(Cache Map Manager Test) : aceexe { +project(Cache Map Manager Test) : acetest { exename = Cache_Map_Manager_Test - libs += Test_Output - depends += Test_Output Source_Files { Cache_Map_Manager_Test.cpp - Main.cpp - } - Header_Files { } } -project(Cached Accept Conn Test) : aceexe { +project(Cached Accept Conn Test) : acetest { exename = Cached_Accept_Conn_Test - libs += Test_Output - depends += Test_Output Source_Files { Cached_Accept_Conn_Test.cpp - Main.cpp - } - Header_Files { } } -project(Cached Allocator Test) : aceexe { +project(Cached Allocator Test) : acetest { exename = Cached_Allocator_Test - libs += Test_Output - depends += Test_Output Source_Files { Cached_Allocator_Test.cpp - Main.cpp - } - Header_Files { } } -project(Cached Conn Test) : aceexe { +project(Cached Conn Test) : acetest { exename = Cached_Conn_Test - libs += Test_Output - depends += Test_Output Source_Files { Cached_Conn_Test.cpp - Main.cpp - } - Header_Files { } } -project(Capabilities Test) : aceexe { +project(Capabilities Test) : acetest { exename = Capabilities_Test - libs += Test_Output - depends += Test_Output Source_Files { Capabilities_Test.cpp - Main.cpp - } - Header_Files { } } -project(CDR File Test) : aceexe { +project(CDR File Test) : acetest { exename = CDR_File_Test - libs += Test_Output - depends += Test_Output Source_Files { CDR_File_Test.cpp CE_fostream.cpp - Main.cpp - } - Header_Files { } } -project(CDR Test) : aceexe { +project(CDR Test) : acetest { exename = CDR_Test - libs += Test_Output - depends += Test_Output Source_Files { CDR_Test.cpp - Main.cpp - } - Header_Files { } } -project(Collection Test) : aceexe { +project(Collection Test) : acetest { exename = Collection_Test - libs += Test_Output - depends += Test_Output Source_Files { Collection_Test.cpp - Main.cpp - } - Header_Files { } } -project(Config Test) : aceexe { +project(Config Test) : acetest { exename = Config_Test - libs += Test_Output - depends += Test_Output Source_Files { Config_Test.cpp - Main.cpp } - Header_Files { + Documentation_Files { + Config_Test.ini + Config_Test_Import_1.ini } } -project(Conn Test) : aceexe { +project(Conn Test) : acetest { exename = Conn_Test - libs += Test_Output - depends += Test_Output Source_Files { Conn_Test.cpp - Main.cpp - } - Header_Files { } } -project(Date Time Test) : aceexe { +project(Date Time Test) : acetest { exename = Date_Time_Test - libs += Test_Output - depends += Test_Output Source_Files { Date_Time_Test.cpp - Main.cpp - } - Header_Files { } } -project(Dev Poll Reactor Test) : aceexe { +project(Dev Poll Reactor Test) : acetest { exename = Dev_Poll_Reactor_Test - libs += Test_Output - depends += Test_Output Source_Files { Dev_Poll_Reactor_Test.cpp - Main.cpp - } - Header_Files { } } -project(Dirent Test) : aceexe { +project(Dirent Test) : acetest { exename = Dirent_Test - libs += Test_Output - depends += Test_Output Source_Files { Dirent_Test.cpp - Main.cpp - } - Header_Files { } } -project(DLList Test) : aceexe { +project(DLList Test) : acetest { exename = DLList_Test - libs += Test_Output - depends += Test_Output Source_Files { DLList_Test.cpp - Main.cpp - } - Header_Files { } } -project(DLL Test) : aceexe { +project(DLL Test) : acetest { exename = DLL_Test - libs += Test_Output - depends += Test_Output Source_Files { DLL_Test.cpp - Main.cpp - } - Header_Files { } } -project(Enum Interfaces Test) : aceexe { +project(Enum Interfaces Test) : acetest { exename = Enum_Interfaces_Test - libs += Test_Output - depends += Test_Output Source_Files { Enum_Interfaces_Test.cpp - Main.cpp - } - Header_Files { } } -project(Env Value Test) : aceexe { +project(Env Value Test) : acetest { exename = Env_Value_Test - libs += Test_Output - depends += Test_Output Source_Files { Env_Value_Test.cpp - Main.cpp - } - Header_Files { } } -project(Future Test) : aceexe { +project(Future Test) : acetest { exename = Future_Test - libs += Test_Output - depends += Test_Output Source_Files { Future_Test.cpp - Main.cpp - } - Header_Files { } } -project(Future Set Test) : aceexe { +project(Future Set Test) : acetest { exename = Future_Set_Test - libs += Test_Output - depends += Test_Output Source_Files { Future_Set_Test.cpp - Main.cpp - } - Header_Files { } } -project(Get Opt Test) : aceexe { +project(Get Opt Test) : acetest { exename = Get_Opt_Test - libs += Test_Output - depends += Test_Output Source_Files { Get_Opt_Test.cpp - Main.cpp - } - Header_Files { } } -project(Handle Set Test) : aceexe { +project(Handle Set Test) : acetest { exename = Handle_Set_Test - libs += Test_Output - depends += Test_Output Source_Files { Handle_Set_Test.cpp - Main.cpp - } - Header_Files { } } -project(High Res Timer Test) : aceexe { +project(High Res Timer Test) : acetest { exename = High_Res_Timer_Test - libs += Test_Output - depends += Test_Output Source_Files { High_Res_Timer_Test.cpp - Main.cpp - } - Header_Files { } } -project(Hash Map Manager Test) : aceexe { +project(Hash Map Manager Test) : acetest { exename = Hash_Map_Manager_Test - libs += Test_Output - depends += Test_Output Source_Files { Hash_Map_Manager_Test.cpp - Main.cpp - } - Header_Files { } } -project(Hash Map Bucket Iterator Test) : aceexe { +project(Hash Map Bucket Iterator Test) : acetest { exename = Hash_Map_Bucket_Iterator_Test - libs += Test_Output - depends += Test_Output Source_Files { Hash_Map_Bucket_Iterator_Test.cpp - Main.cpp - } - Header_Files { } } -project(INET Addr Test) : aceexe { +project(INET Addr Test) : acetest { exename = INET_Addr_Test - libs += Test_Output - depends += Test_Output Source_Files { INET_Addr_Test.cpp - Main.cpp - } - Header_Files { } } -project(IOStream Test) : aceexe { +project(IOStream Test) : acetest { exename = IOStream_Test - libs += Test_Output - depends += Test_Output Source_Files { IOStream_Test.cpp - Main.cpp - } - Header_Files { } } -project(Lazy Map Manager Test) : aceexe { +project(Lazy Map Manager Test) : acetest { exename = Lazy_Map_Manager_Test - libs += Test_Output - depends += Test_Output Source_Files { Lazy_Map_Manager_Test.cpp - Main.cpp - } - Header_Files { } } -project(Log Msg Test) : aceexe { +project(Log Msg Test) : acetest { exename = Log_Msg_Test - libs += Test_Output - depends += Test_Output Source_Files { Log_Msg_Test.cpp - Main.cpp - } - Header_Files { } } -project(Logging Strategy Test) : aceexe { +project(Logging Strategy Test) : acetest { exename = Logging_Strategy_Test - libs += Test_Output - depends += Test_Output Source_Files { Logging_Strategy_Test.cpp - Main.cpp - } - Header_Files { } } -project(Malloc Test) : aceexe { +project(Malloc Test) : acetest { exename = Malloc_Test - libs += Test_Output - depends += Test_Output Source_Files { Malloc_Test.cpp - Main.cpp - } - Header_Files { } } -project(Map Test) : aceexe { +project(Map Test) : acetest { exename = Map_Test - libs += Test_Output - depends += Test_Output Source_Files { Map_Test.cpp - Main.cpp - } - Header_Files { } } -project(Map Manager Test) : aceexe { +project(Map Manager Test) : acetest { exename = Map_Manager_Test - libs += Test_Output - depends += Test_Output Source_Files { Map_Manager_Test.cpp - Main.cpp - } - Header_Files { } } -project(Max Default Port Test) : aceexe { +project(Max Default Port Test) : acetest { exename = Max_Default_Port_Test - libs += Test_Output - depends += Test_Output Source_Files { Max_Default_Port_Test.cpp - Main.cpp - } - Header_Files { } } -project(MEM Stream Test) : aceexe { +project(MEM Stream Test) : acetest { exename = MEM_Stream_Test - libs += Test_Output - depends += Test_Output Source_Files { MEM_Stream_Test.cpp - Main.cpp - } - Header_Files { } } -project(Mem Map Test) : aceexe { +project(Mem Map Test) : acetest { exename = Mem_Map_Test - libs += Test_Output - depends += Test_Output Source_Files { Mem_Map_Test.cpp - Main.cpp - } - Header_Files { } } -project(MM Shared Memory Test) : aceexe { +project(MM Shared Memory Test) : acetest { exename = MM_Shared_Memory_Test - libs += Test_Output - depends += Test_Output Source_Files { MM_Shared_Memory_Test.cpp - Main.cpp - } - Header_Files { } } -project(MT Reactor Timer Test) : aceexe { +project(MT Reactor Timer Test) : acetest { exename = MT_Reactor_Timer_Test - libs += Test_Output - depends += Test_Output Source_Files { MT_Reactor_Timer_Test.cpp - Main.cpp - } - Header_Files { } } -project(MT Reactor Upcall Test) : aceexe { +project(MT Reactor Upcall Test) : acetest { exename = MT_Reactor_Upcall_Test - libs += Test_Output - depends += Test_Output Source_Files { MT_Reactor_Upcall_Test.cpp - Main.cpp - } - Header_Files { } } -project(MT SOCK Test) : aceexe { +project(MT SOCK Test) : acetest { exename = MT_SOCK_Test - libs += Test_Output - depends += Test_Output Source_Files { MT_SOCK_Test.cpp - Main.cpp - } - Header_Files { } } -project(Message Block Test) : aceexe { +project(Message Block Test) : acetest { exename = Message_Block_Test - libs += Test_Output - depends += Test_Output Source_Files { Message_Block_Test.cpp - Main.cpp - } - Header_Files { } } -project(Message Queue Test) : aceexe { +project(Message Queue Test) : acetest { exename = Message_Queue_Test - libs += Test_Output - depends += Test_Output Source_Files { Message_Queue_Test.cpp - Main.cpp - } - Header_Files { } } -project(Message Queue Test Ex) : aceexe { +project(Message Queue Test Ex) : acetest { exename = Message_Queue_Test_Ex - libs += Test_Output - depends += Test_Output Source_Files { Message_Queue_Test_Ex.cpp - Main.cpp - } - Header_Files { } } -project(Message Queue Notifications Test) : aceexe { +project(Message Queue Notifications Test) : acetest { exename = Message_Queue_Notifications_Test - libs += Test_Output - depends += Test_Output Source_Files { Message_Queue_Notifications_Test.cpp - Main.cpp - } - Header_Files { } } -project(Multicast Test) : aceexe { +project(Multicast Test) : acetest { exename = Multicast_Test - libs += Test_Output - depends += Test_Output Source_Files { Multicast_Test.cpp - Main.cpp - } - Header_Files { } } -project(Multihomed INET Addr Test) : aceexe { - exename = Multihomed_INET_Addr_Test - libs += Test_Output - depends += Test_Output - Source_Files { - Multihomed_INET_Addr_Test.cpp - Main.cpp - } - Header_Files { - } -} - -project(New Fail Test) : aceexe { +project(New Fail Test) : acetest { exename = New_Fail_Test - libs += Test_Output - depends += Test_Output Source_Files { New_Fail_Test.cpp - Main.cpp - } - Header_Files { } } -project(Notify Performance Test) : aceexe { +project(Notify Performance Test) : acetest { exename = Notify_Performance_Test - libs += Test_Output - depends += Test_Output Source_Files { Notify_Performance_Test.cpp - Main.cpp - } - Header_Files { } } -project(Object Manager Test) : aceexe { +project(Object Manager Test) : acetest { exename = Object_Manager_Test - libs += Test_Output - depends += Test_Output Source_Files { Object_Manager_Test.cpp - Main.cpp - } - Header_Files { } } -project(Obstack Test) : aceexe { +project(Obstack Test) : acetest { exename = Obstack_Test - libs += Test_Output - depends += Test_Output Source_Files { Obstack_Test.cpp - Main.cpp - } - Header_Files { } } -project(OrdMultiSet Test) : aceexe { +project(OrdMultiSet Test) : acetest { exename = OrdMultiSet_Test - libs += Test_Output - depends += Test_Output Source_Files { OrdMultiSet_Test.cpp - Main.cpp - } - Header_Files { } } -project(OS Test) : aceexe { +project(OS Test) : acetest { exename = OS_Test - libs += Test_Output - depends += Test_Output Source_Files { OS_Test.cpp - Main.cpp - } - Header_Files { } } -project(Proactor Scatter Gather Test) : aceexe { +project(Proactor Scatter Gather Test) : acetest { exename = Proactor_Scatter_Gather_Test - libs += Test_Output - depends += Test_Output Source_Files { Proactor_Scatter_Gather_Test.cpp - Main.cpp - } - Header_Files { } } -project(Proactor Test) : aceexe { +project(Proactor Test) : acetest { exename = Proactor_Test - libs += Test_Output - depends += Test_Output Source_Files { Proactor_Test.cpp - Main.cpp - } - Header_Files { } } -project(Proactor Timer Test) : aceexe { +project(Proactor Timer Test) : acetest { exename = Proactor_Timer_Test - libs += Test_Output - depends += Test_Output Source_Files { Proactor_Timer_Test.cpp - Main.cpp - } - Header_Files { } } -project(Process Mutex Test) : aceexe { +project(Process Mutex Test) : acetest { exename = Process_Mutex_Test - libs += Test_Output - depends += Test_Output Source_Files { Process_Mutex_Test.cpp - Main.cpp - } - Header_Files { } } -project(Process Strategy Test) : aceexe { +project(Process Strategy Test) : acetest { exename = Process_Strategy_Test - libs += Test_Output - depends += Test_Output Source_Files { Process_Strategy_Test.cpp - Main.cpp - } - Header_Files { } } -project(Priority Buffer Test) : aceexe { +project(Priority Buffer Test) : acetest { exename = Priority_Buffer_Test - libs += Test_Output - depends += Test_Output Source_Files { Priority_Buffer_Test.cpp - Main.cpp - } - Header_Files { } } -project(Dynamic Priority Test) : aceexe { +project(Dynamic Priority Test) : acetest { exename = Dynamic_Priority_Test - libs += Test_Output - depends += Test_Output Source_Files { Dynamic_Priority_Test.cpp - Main.cpp - } - Header_Files { } } -project(Priority Task Test) : aceexe { +project(Priority Task Test) : acetest { exename = Priority_Task_Test - libs += Test_Output - depends += Test_Output Source_Files { Priority_Task_Test.cpp - Main.cpp - } - Header_Files { } } -project(Priority Reactor Test) : aceexe { +project(Priority Reactor Test) : acetest { exename = Priority_Reactor_Test - libs += Test_Output - depends += Test_Output Source_Files { Priority_Reactor_Test.cpp - Main.cpp - } - Header_Files { } } -project(Process Manager Test) : aceexe { +project(Process Manager Test) : acetest { exename = Process_Manager_Test - libs += Test_Output - depends += Test_Output Source_Files { Process_Manager_Test.cpp - Main.cpp - } - Header_Files { } } -project(Pipe Test) : aceexe { +project(Pipe Test) : acetest { exename = Pipe_Test - libs += Test_Output - depends += Test_Output Source_Files { Pipe_Test.cpp - Main.cpp - } - Header_Files { } } -project(RB Tree Test) : aceexe { +project(RB Tree Test) : acetest { exename = RB_Tree_Test - libs += Test_Output - depends += Test_Output Source_Files { RB_Tree_Test.cpp - Main.cpp - } - Header_Files { } } -project(Reactors Test) : aceexe { +project(Reactors Test) : acetest { exename = Reactors_Test - libs += Test_Output - depends += Test_Output Source_Files { Reactors_Test.cpp - Main.cpp - } - Header_Files { } } -project(Reactor Exceptions Test) : aceexe { +project(Reactor Exceptions Test) : acetest { exename = Reactor_Exceptions_Test - libs += Test_Output - depends += Test_Output Source_Files { Reactor_Exceptions_Test.cpp - Main.cpp - } - Header_Files { } } -project(Reactor Notify Test) : aceexe { +project(Reactor Notify Test) : acetest { exename = Reactor_Notify_Test - libs += Test_Output - depends += Test_Output Source_Files { Reactor_Notify_Test.cpp - Main.cpp - } - Header_Files { } } -project(Reactor Dispatch Order Test) : aceexe { +project(Reactor Dispatch Order Test) : acetest { exename = Reactor_Dispatch_Order_Test - libs += Test_Output - depends += Test_Output Source_Files { Reactor_Dispatch_Order_Test.cpp - Main.cpp - } - Header_Files { } } -project(Reactor Performance Test) : aceexe { +project(Reactor Performance Test) : acetest { exename = Reactor_Performance_Test - libs += Test_Output - depends += Test_Output Source_Files { Reactor_Performance_Test.cpp - Main.cpp - } - Header_Files { } } -project(Reactor Timer Test) : aceexe { +project(Reactor Timer Test) : acetest { exename = Reactor_Timer_Test - libs += Test_Output - depends += Test_Output Source_Files { Reactor_Timer_Test.cpp - Main.cpp - } - Header_Files { } } -project(Reader Writer Test) : aceexe { +project(Reader Writer Test) : acetest { exename = Reader_Writer_Test - libs += Test_Output - depends += Test_Output Source_Files { Reader_Writer_Test.cpp - Main.cpp - } - Header_Files { } } -project(Recursive Condition Test) : aceexe { +project(Recursive Condition Test) : acetest { exename = Recursive_Condition_Test - libs += Test_Output - depends += Test_Output Source_Files { Recursive_Condition_Test.cpp - Main.cpp - } - Header_Files { } } -project(Recursive Condition Bug Test) : aceexe { - exename = Recursive_Condition_Bug_Test - libs += Test_Output - depends += Test_Output - Source_Files { - Recursive_Condition_Bug_Test.cpp - Main.cpp - } - Header_Files { - } -} - -project(Recursive Mutex Test) : aceexe { +project(Recursive Mutex Test) : acetest { exename = Recursive_Mutex_Test - libs += Test_Output - depends += Test_Output Source_Files { Recursive_Mutex_Test.cpp - Main.cpp - } - Header_Files { } } -project(Refcounted Auto Ptr Test) : aceexe { +project(Refcounted Auto Ptr Test) : acetest { exename = Refcounted_Auto_Ptr_Test - libs += Test_Output - depends += Test_Output Source_Files { Refcounted_Auto_Ptr_Test.cpp - Main.cpp - } - Header_Files { } } -project(Reverse Lock Test) : aceexe { +project(Reverse Lock Test) : acetest { exename = Reverse_Lock_Test - libs += Test_Output - depends += Test_Output Source_Files { Reverse_Lock_Test.cpp - Main.cpp - } - Header_Files { } } -project(Semaphore Test) : aceexe { +project(Semaphore Test) : acetest { exename = Semaphore_Test - libs += Test_Output - depends += Test_Output Source_Files { Semaphore_Test.cpp - Main.cpp - } - Header_Files { } } -project(Signal Test) : aceexe { +project(Signal Test) : acetest { exename = Signal_Test - libs += Test_Output - depends += Test_Output Source_Files { Signal_Test.cpp - Main.cpp - } - Header_Files { } } -project(Sigset Ops Test) : aceexe { +project(Sigset Ops Test) : acetest { exename = Sigset_Ops_Test - libs += Test_Output - depends += Test_Output Source_Files { Sigset_Ops_Test.cpp - Main.cpp - } - Header_Files { } } -project(Simple Message Block Test) : aceexe { +project(Simple Message Block Test) : acetest { exename = Simple_Message_Block_Test - libs += Test_Output - depends += Test_Output Source_Files { Simple_Message_Block_Test.cpp - Main.cpp - } - Header_Files { } } -project(SOCK Test) : aceexe { +project(SOCK Test) : acetest { exename = SOCK_Test - libs += Test_Output - depends += Test_Output Source_Files { SOCK_Test.cpp - Main.cpp - } - Header_Files { } } -project(SOCK Connector Test) : aceexe { +project(SOCK Connector Test) : acetest { exename = SOCK_Connector_Test - libs += Test_Output - depends += Test_Output Source_Files { SOCK_Connector_Test.cpp - Main.cpp - } - Header_Files { } } -project(SOCK Send Recv Test) : aceexe { +project(SOCK Send Recv Test) : acetest { exename = SOCK_Send_Recv_Test - libs += Test_Output - depends += Test_Output Source_Files { SOCK_Send_Recv_Test.cpp - Main.cpp - } - Header_Files { } } -project(SPIPE Test) : aceexe { +project(SPIPE Test) : acetest { exename = SPIPE_Test - libs += Test_Output - depends += Test_Output Source_Files { SPIPE_Test.cpp - Main.cpp - } - Header_Files { } } -project(SString Test) : aceexe { +project(SString Test) : acetest { exename = SString_Test - libs += Test_Output - depends += Test_Output Source_Files { SString_Test.cpp - Main.cpp - } - Header_Files { } } -project(SV Shared Memory Test) : aceexe { +project(SV Shared Memory Test) : acetest { exename = SV_Shared_Memory_Test - libs += Test_Output - depends += Test_Output Source_Files { SV_Shared_Memory_Test.cpp - Main.cpp - } - Header_Files { } } -project(Svc Handler Test) : aceexe { +project(Svc Handler Test) : acetest { exename = Svc_Handler_Test - libs += Test_Output - depends += Test_Output Source_Files { Svc_Handler_Test.cpp - Main.cpp - } - Header_Files { } } -project(Task Test) : aceexe { +project(Task Test) : acetest { exename = Task_Test - libs += Test_Output - depends += Test_Output Source_Files { Task_Test.cpp - Main.cpp - } - Header_Files { } } -project(Thread Manager Test) : aceexe { +project(Thread Manager Test) : acetest { exename = Thread_Manager_Test - libs += Test_Output - depends += Test_Output Source_Files { Thread_Manager_Test.cpp - Main.cpp - } - Header_Files { } } -project(Thread Mutex Test) : aceexe { +project(Thread Mutex Test) : acetest { exename = Thread_Mutex_Test - libs += Test_Output - depends += Test_Output Source_Files { Thread_Mutex_Test.cpp - Main.cpp - } - Header_Files { } } -project(Thread Pool Test) : aceexe { +project(Thread Pool Test) : acetest { exename = Thread_Pool_Test - libs += Test_Output - depends += Test_Output Source_Files { Thread_Pool_Test.cpp - Main.cpp - } - Header_Files { } } -project(Timeprobe Test) : aceexe { +project(Timeprobe Test) : acetest { exename = Timeprobe_Test - libs += Test_Output - depends += Test_Output Source_Files { Timeprobe_Test.cpp - Main.cpp - } - Header_Files { } } -project(Time Service Test) : aceexe { +project(Time Service Test) : acetest { exename = Time_Service_Test - libs += Test_Output - depends += Test_Output Source_Files { Time_Service_Test.cpp - Main.cpp - } - Header_Files { } } -project(Time Value Test) : aceexe { +project(Time Value Test) : acetest { exename = Time_Value_Test - libs += Test_Output - depends += Test_Output Source_Files { Time_Value_Test.cpp - Main.cpp - } - Header_Files { } } -project(Timer Queue Test) : aceexe { +project(Timer Queue Test) : acetest { exename = Timer_Queue_Test - libs += Test_Output - depends += Test_Output Source_Files { Timer_Queue_Test.cpp - Main.cpp - } - Header_Files { } } -project(Token Strategy Test) : aceexe { +project(Token Strategy Test) : acetest { exename = Token_Strategy_Test - libs += Test_Output - depends += Test_Output Source_Files { Token_Strategy_Test.cpp - Main.cpp - } - Header_Files { } } -project(TP Reactor Test) : aceexe { +project(TP Reactor Test) : acetest { exename = TP_Reactor_Test - libs += Test_Output - depends += Test_Output Source_Files { TP_Reactor_Test.cpp - Main.cpp - } - Header_Files { } } -project(TSS Test) : aceexe { +project(TSS Test) : acetest { exename = TSS_Test - libs += Test_Output - depends += Test_Output Source_Files { TSS_Test.cpp - Main.cpp - } - Header_Files { } } -project(Vector Test) : aceexe { +project(Vector Test) : acetest { exename = Vector_Test - libs += Test_Output - depends += Test_Output Source_Files { Vector_Test.cpp - Main.cpp - } - Header_Files { } } -project(UPIPE SAP Test) : aceexe { +project(UPIPE SAP Test) : acetest { exename = UPIPE_SAP_Test - libs += Test_Output - depends += Test_Output Source_Files { UPIPE_SAP_Test.cpp - Main.cpp - } - Header_Files { } } -project(Upgradable RW Test) : aceexe { +project(Upgradable RW Test) : acetest { exename = Upgradable_RW_Test - libs += Test_Output - depends += Test_Output Source_Files { Upgradable_RW_Test.cpp - Main.cpp - } - Header_Files { } } -project(Naming Test) : aceexe { +project(Naming Test) : acetest { exename = Naming_Test compname = --ace comps += Other - libs += Test_Output - depends += Test_Output Source_Files { Naming_Test.cpp - Main.cpp - } - Header_Files { } } -project(Thread Pool Reactor Test) : aceexe { +project(Thread Pool Reactor Test) : acetest { exename = Thread_Pool_Reactor_Test compname = --ace comps += Other - libs += Test_Output - depends += Test_Output Source_Files { Thread_Pool_Reactor_Test.cpp - Main.cpp - } - Header_Files { } } -project(Thread Pool Reactor Resume Test) : aceexe { +project(Thread Pool Reactor Resume Test) : acetest { exename = Thread_Pool_Reactor_Resume_Test compname = --ace comps += Other - libs += Test_Output - depends += Test_Output Source_Files { Thread_Pool_Reactor_Resume_Test.cpp - Main.cpp - } - Header_Files { } } -project(XtReactor Test) : aceexe { +project(XtReactor Test) : acetest { exename = XtReactor_Test compname = --ace comps += Other - libs += Test_Output - depends += Test_Output Source_Files { XtReactor_Test.cpp - Main.cpp - } - Header_Files { } } -project(FlReactor Test) : aceexe { +project(FlReactor Test) : acetest { exename = FlReactor_Test compname = --ace comps += Other - libs += Test_Output - depends += Test_Output Source_Files { FlReactor_Test.cpp - Main.cpp - } - Header_Files { } } -project(TkReactor Test) : aceexe { +project(TkReactor Test) : acetest { exename = TkReactor_Test compname = --ace comps += Other - libs += Test_Output - depends += Test_Output Source_Files { TkReactor_Test.cpp - Main.cpp - } - Header_Files { } } -project(Codecs Test) : aceexe { +project(Codecs Test) : acetest { exename = Codecs_Test compname = --ace comps += Codecs - libs += Test_Output - depends += Test_Output Source_Files { Codecs_Test.cpp - Main.cpp - } - Header_Files { } } -project(Tokens Test) : aceexe { +project(Tokens Test) : acetest { exename = Tokens_Test compname = --ace comps += Token - libs += Test_Output - depends += Test_Output Source_Files { Tokens_Test.cpp - Main.cpp - } - Header_Files { } } -project(FIFO Test) : aceexe { - exename = FIFO_Test - libs += Test_Output - depends += Test_Output - Source_Files { - FIFO_Test.cpp - Main.cpp - } - Header_Files { - } -} -project(CDR Array Test) : aceexe { +project(CDR Array Test) : acetest { exename = CDR_Array_Test - libs += Test_Output - depends += Test_Output Source_Files { CDR_Array_Test.cpp - Main.cpp - } - Header_Files { } } -project(Service Config Test) : aceexe { +project(Service Config Test) : acetest { exename = Service_Config_Test - libs += Test_Output - depends += Test_Output Source_Files { Service_Config_Test.cpp - Main.cpp - } - Header_Files { } } -project(Framework Component Test) : aceexe { +project(Framework Component Test) : acetest { exename = Framework_Component_Test - libs += Test_Output - depends += Test_Output Source_Files { Framework_Component_Test.cpp - Main.cpp - } - Header_Files { } } -project(Unbounded Set Ex Test) : aceexe { - exename = Unbounded_Set_Test_Ex - libs += Test_Output - depends += Test_Output +project(FIFO Test) : aceexe { Source_Files { - Unbounded_Set_Test_Ex.cpp - Main.cpp + FIFO_Test.cpp } Header_Files { } diff --git a/tests/tests.mwc b/tests/tests.mwc index b83fa3ae669..55165b71541 100644 --- a/tests/tests.mwc +++ b/tests/tests.mwc @@ -1,4 +1,6 @@ workspace { - tests.mpc - RMCast/tests.mpc + exclude { + pharlap + log + } } |