From 306671291443d1ea19838977efd7acac98e0a643 Mon Sep 17 00:00:00 2001 From: dengg Date: Mon, 13 Sep 2004 18:19:36 +0000 Subject: Mon Sep 13 13:18:33 2004 Gan Deng --- TAO/CIAO/ChangeLog | 2 +- TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h | 10 +++++----- TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc | 10 +++++----- TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc | 12 ++++++------ TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc | 10 +++++----- TAO/CIAO/DAnCE/examples/BasicSP/BasicSP.mpc | 6 +++--- TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc | 14 +++++++------- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 3ac88200aee..82a202a2cf9 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -13,7 +13,7 @@ Mon Sep 13 13:18:33 2004 Gan Deng Changed the output stub, servant, and executor library names for all the components in BasicSP example. The reason is - becasue all the examples are tightly coupled with the + becasue all the DnC descriptors are tightly coupled with the output library names. Mon Sep 13 13:07:33 2004 Gan Deng diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h index ad5eded635d..3a67955bd2f 100644 --- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h +++ b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h @@ -25,11 +25,11 @@ namespace Deployment { - class SubcomponentInstantiationDescription; - class DeploymentPlan; - class ComponentAssemblyDescription; - class SubcomponentInstantiationDescription; - class AssemblyConnectionDescription; + struct SubcomponentInstantiationDescription; + struct DeploymentPlan; + struct ComponentAssemblyDescription; + struct SubcomponentInstantiationDescription; + struct AssemblyConnectionDescription; } namespace CIAO diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc index 2fe2e9a2b82..cf18d6ceb51 100644 --- a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc +++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED.mpc @@ -4,7 +4,7 @@ project(BMClosedED_DnC_stub): ciao_client_dnc { after += BasicSP_DnC_stub - sharedname = BMClosedED_DnC_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 dynamicflags = BMCLOSEDED_STUB_BUILD_DLL @@ -19,8 +19,8 @@ project(BMClosedED_DnC_stub): ciao_client_dnc { project(BMClosedED_DnC_svnt) : ciao_servant_dnc { after += BasicSP_DnC_svnt BMClosedED_DnC_stub - sharedname = BMClosedED_DnC_svnt - libs += BMClosedED_DnC_stub BasicSP_DnC_stub BasicSP_DnC_svnt + 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 dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL @@ -43,8 +43,8 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc { project(BMClosedED_DnC_exec) : ciao_component_dnc { after += BMClosedED_DnC_svnt - sharedname = BMClosedED_DnC_exec - libs += BMClosedED_DnC_stub BMClosedED_DnC_svnt BasicSP_DnC_stub BasicSP_DnC_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 dynamicflags = BMCLOSEDED_EXEC_BUILD_DLL diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc index 6a9fc74d57e..3c8a7390238 100644 --- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc +++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice.mpc @@ -2,11 +2,11 @@ project(BMDevice_DnC_stub): ciao_client_dnc { after += BasicSP_DnC_stub - sharedname = BMDevice_DnC_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_DnC_stub + libs += BasicSP_stub dynamicflags = BMDEVICE_STUB_BUILD_DLL IDL_Files { @@ -20,8 +20,8 @@ project(BMDevice_DnC_stub): ciao_client_dnc { project(BMDevice_DnC_svnt) : ciao_servant_dnc { after += BMDevice_DnC_stub BasicSP_DnC_stub - sharedname = BMDevice_DnC_svnt - libs += BMDevice_DnC_stub BasicSP_DnC_stub BasicSP_DnC_svnt + 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 dynamicflags = BMDEVICE_SVNT_BUILD_DLL @@ -44,8 +44,8 @@ project(BMDevice_DnC_svnt) : ciao_servant_dnc { project(BMDevice_DnC_exec) : ciao_component_dnc { after += BMDevice_DnC_svnt - sharedname = BMDevice_DnC_exec - libs += BMDevice_DnC_stub BMDevice_DnC_svnt BasicSP_DnC_stub BasicSP_DnC_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 dynamicflags = BMDEVICE_EXEC_BUILD_DLL diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc index 99c59242cf0..47833492fec 100644 --- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc +++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.mpc @@ -3,7 +3,7 @@ project(BMDisplay_DnC_stub): ciao_client_dnc { after += BasicSP_DnC_stub - sharedname = BMDisplay_DnC_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 dynamicflags = BMDISPLAY_STUB_BUILD_DLL @@ -18,8 +18,8 @@ project(BMDisplay_DnC_stub): ciao_client_dnc { project(BMDisplay_DnC_svnt) : ciao_servant_dnc { after += BasicSP_DnC_svnt BMDisplay_DnC_stub - sharedname = BMDisplay_DnC_svnt - libs += BMDisplay_DnC_stub BasicSP_DnC_stub BasicSP_DnC_svnt + 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 dynamicflags = BMDISPLAY_SVNT_BUILD_DLL @@ -42,8 +42,8 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc { project(BMDisplay_DnC_exec) : ciao_component_dnc { after += BMDisplay_DnC_svnt - sharedname = BMDisplay_DnC_exec - libs += BMDisplay_DnC_stub BMDisplay_DnC_svnt BasicSP_DnC_stub BasicSP_DnC_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 dynamicflags = BMDISPLAY_EXEC_BUILD_DLL diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BasicSP.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/BasicSP.mpc index 947c6741157..736078ed4af 100644 --- a/TAO/CIAO/DAnCE/examples/BasicSP/BasicSP.mpc +++ b/TAO/CIAO/DAnCE/examples/BasicSP/BasicSP.mpc @@ -3,7 +3,7 @@ project(BasicSP_DnC_stub): ciao_client_dnc { - sharedname = BasicSP_DnC_stub + 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 dynamicflags = BASICSP_STUB_BUILD_DLL @@ -18,8 +18,8 @@ project(BasicSP_DnC_stub): ciao_client_dnc { project(BasicSP_DnC_svnt) : ciao_server_dnc { after += BasicSP_DnC_stub - sharedname = BasicSP_DnC_svnt - libs += BasicSP_DnC_stub + sharedname = BasicSP_svnt + libs += 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 dynamicflags = BASICSP_SVNT_BUILD_DLL diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc index 52d9f3085bf..d77bb2a4140 100644 --- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc +++ b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC.mpc @@ -3,7 +3,7 @@ project(EC_DnC_stub): ciao_client_dnc { after += BasicSP_DnC_stub - sharedname = EC_DnC_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 dynamicflags = EC_STUB_BUILD_DLL @@ -18,8 +18,8 @@ project(EC_DnC_stub): ciao_client_dnc { project(EC_DnC_svnt) : ciao_servant_dnc { after += BasicSP_DnC_svnt EC_DnC_stub - sharedname = EC_DnC_svnt - libs += EC_DnC_stub BasicSP_DnC_stub BasicSP_DnC_svnt + sharedname = EC_svnt + libs += EC_stub BasicSP_stub BasicSP_svnt libpaths += .. idlflags += -Wb,export_macro=EC_SVNT_Export -Wb,export_include=EC_svnt_export.h dynamicflags = EC_SVNT_BUILD_DLL @@ -42,8 +42,8 @@ project(EC_DnC_svnt) : ciao_servant_dnc { project(EC_DnC_exec) : ciao_component_dnc { after += EC_DnC_svnt - sharedname = EC_DnC_exec - libs += EC_DnC_stub BasicSP_DnC_stub EC_DnC_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 dynamicflags = EC_EXEC_BUILD_DLL @@ -63,7 +63,7 @@ project(EC_DnC_exec) : ciao_component_dnc { project (EC_DnC_client) : ciao_client_dnc, valuetype { exename = client after += EC_DnC_stub - libs += EC_DnC_stub BasicSP_DnC_stub + libs += EC_stub BasicSP_stub libpaths += .. IDL_Files { @@ -78,7 +78,7 @@ project (EC_DnC_client) : ciao_client_dnc, valuetype { project (EC_DnC_controller) : ciao_client_dnc, valuetype { exename = controller after += EC_DnC_stub - libs += EC_DnC_stub BasicSP_DnC_stub + libs += EC_stub BasicSP_stub libpaths += .. IDL_Files { -- cgit v1.2.1