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 /TAO | |
| parent | 730c9c0d360dace01feb0c5509cb0af121ce2e17 (diff) | |
| download | ATCD-fccbe0e94f74f898f7d5cc709f617f51dce33bee.tar.gz | |
Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com>
Diffstat (limited to 'TAO')
347 files changed, 1624 insertions, 1653 deletions
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 +} |