From e2e639121adf82de5183688b0d26fd0a6097dd3b Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Tue, 31 Aug 2021 21:01:43 -0500 Subject: Removed conv_lib.mpb Replaced uses of it with install_lib (cherry picked from commit 1bfbc674980869ef05c6fed94c01f291ff5fd7d4) --- ACE/bin/MakeProjectCreator/config/conv_lib.mpb | 6 ------ TAO/TAO_IDL/tao_idl_be.mpc | 18 +++++++++--------- TAO/TAO_IDL/tao_idl_fe.mpc | 2 +- .../FT_ReplicationManager/FT_ReplicationManager.mpc | 2 +- TAO/orbsvcs/IFR_Service/IFR_Service.mpc | 2 +- TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc | 10 +++++----- 6 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 ACE/bin/MakeProjectCreator/config/conv_lib.mpb diff --git a/ACE/bin/MakeProjectCreator/config/conv_lib.mpb b/ACE/bin/MakeProjectCreator/config/conv_lib.mpb deleted file mode 100644 index 3d4221c5baf..00000000000 --- a/ACE/bin/MakeProjectCreator/config/conv_lib.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project { - specific { - install_this_target = 1 - } -} diff --git a/TAO/TAO_IDL/tao_idl_be.mpc b/TAO/TAO_IDL/tao_idl_be.mpc index a121b594e73..5328677f6d0 100644 --- a/TAO/TAO_IDL/tao_idl_be.mpc +++ b/TAO/TAO_IDL/tao_idl_be.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- -project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE dynamicflags += TAO_IDL_BE_BUILD_DLL includes += $(TAO_ROOT) @@ -53,7 +53,7 @@ project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe } } -project(TAO_IDL_BE_VIS_A) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_A) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_A dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE @@ -82,7 +82,7 @@ project(TAO_IDL_BE_VIS_A) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_C) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_C) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_C dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_A @@ -112,7 +112,7 @@ project(TAO_IDL_BE_VIS_C) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_E) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_E) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_E dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_C @@ -142,7 +142,7 @@ project(TAO_IDL_BE_VIS_E) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_I) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_I) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_I dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_E @@ -172,7 +172,7 @@ project(TAO_IDL_BE_VIS_I) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_O) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_O) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_O dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_I @@ -200,7 +200,7 @@ project(TAO_IDL_BE_VIS_O) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_S) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_S) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_S dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_O @@ -231,7 +231,7 @@ project(TAO_IDL_BE_VIS_S) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_U) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_U) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_U dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_S @@ -260,7 +260,7 @@ project(TAO_IDL_BE_VIS_U) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_V) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_V) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_V dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_U diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc index 6875856ee17..64074b3d952 100644 --- a/TAO/TAO_IDL/tao_idl_fe.mpc +++ b/TAO/TAO_IDL/tao_idl_fe.mpc @@ -53,7 +53,7 @@ project(TAO_IDL_GEN) { } } -project(TAO_IDL_FE) : acelib, conv_lib, tao_output { +project(TAO_IDL_FE) : acelib, install_lib, tao_output { sharedname = TAO_IDL_FE dynamicflags += TAO_IDL_FE_BUILD_DLL includes += $(TAO_ROOT) diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc index 8e72e8939ff..3960128314c 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc @@ -1,4 +1,4 @@ -project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, install, svc_utils { +project(*Lib): orbsvcslib, orbsvcs_output, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, install, svc_utils { sharedname = TAO_ReplicationManagerLib dynamicflags += TAO_REPLICATIONMANAGERLIB_BUILD_DLL diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index 3446c2c6ff2..0dcc70aa38e 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -13,7 +13,7 @@ project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client, } } -project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe, svc_utils { +project(TAO_IFR_BE) : taolib, tao_output, install_lib, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe, svc_utils { sharedname = TAO_IFR_BE dynamicflags += TAO_IFR_BE_BUILD_DLL diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index bf8b9c5de39..bb83939e52d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,4 +1,4 @@ -project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, tao_versioning_idl_defaults { +project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, install_lib, valuetype, portableserver, messaging, tao_versioning_idl_defaults { sharedname = TAO_Async_ImR_Client_IDL dynamicflags += ASYNC_IMR_CLIENT_BUILD_DLL @@ -32,7 +32,7 @@ project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, } -project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, dynamicinterface, portableserver, messaging, tao_versioning_idl_defaults { +project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, install_lib, valuetype, dynamicinterface, portableserver, messaging, tao_versioning_idl_defaults { sharedname = TAO_ImR_Activator_IDL dynamicflags += ACTIVATOR_IDL_BUILD_DLL after += Async_ImR_Client_IDL @@ -54,7 +54,7 @@ project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, dy } } -project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro,tao_versioning_idl_defaults { +project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, install_lib, valuetype, portableserver, messaging, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro,tao_versioning_idl_defaults { sharedname = TAO_ImR_Locator_IDL after += ImR_Activator_IDL libs += TAO_ImR_Activator_IDL TAO_Async_ImR_Client_IDL @@ -78,7 +78,7 @@ project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, port } } -project(ImR_Activator) : orbsvcslib, orbsvcs_output, conv_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, messaging, dynamicinterface, pi, codecfactory, svc_utils { +project(ImR_Activator) : orbsvcslib, orbsvcs_output, install_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, messaging, dynamicinterface, pi, codecfactory, svc_utils { sharedname = TAO_ImR_Activator dynamicflags += ACTIVATOR_BUILD_DLL after += ImR_Locator_IDL @@ -97,7 +97,7 @@ project(ImR_Activator) : orbsvcslib, orbsvcs_output, conv_lib, acexml, avoids_mi } } -project(ImR_Locator) : orbsvcslib, orbsvcs_output, conv_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, async_iortable, portableserver, messaging, svc_utils, acexml, iormanip, dynamicinterface { +project(ImR_Locator) : orbsvcslib, orbsvcs_output, install_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, async_iortable, portableserver, messaging, svc_utils, acexml, iormanip, dynamicinterface { sharedname = TAO_ImR_Locator dynamicflags += LOCATOR_BUILD_DLL after += ImR_Locator_IDL -- cgit v1.2.1