summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2011-10-26 10:19:04 +0000
committerMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2011-10-26 10:19:04 +0000
commitc901fbe94df00e549bd169f4ff9fe0e52da09f54 (patch)
tree5df95fab9d0c1f0d7e72a8c407769a162b94d072
parentff20ad2919310788fe3994f42a28d6ecf98219c7 (diff)
downloadATCD-c901fbe94df00e549bd169f4ff9fe0e52da09f54.tar.gz
Remove ciao_port_activator_stub and cia_servant_activator_stub
-rw-r--r--CIAO/ChangeLog.BRANCH9
-rw-r--r--CIAO/ciao/Containers/Containers.mpc3
2 files changed, 8 insertions, 4 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index cab1313c800..f0bdadfa6ac 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,8 @@
+Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl>
+
+ * ciao/Containers/Containers.mpc:
+ Remove ciao_port_activator_stub and cia_servant_activator_stub
+
Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl>
@@ -8,7 +13,7 @@ Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl>
* MPC/config/ciao_session_container_stub.mpb:
* ciao/Containers/Containers.mpc:
* ciao/Containers/Extension/Extension_Container.mpc:
- * ciao/Containers/Session/Session_Container.mpc:
+ * ciao/Containers/Session/Session_Container.mpc:
Remove ciao_port_activator_stub and cia_servant_activator_stub
* ciao/Containers/CIAO_Servant_Activator.idl:
@@ -16,7 +21,7 @@ Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl>
* ciao/Containers/Servant_Activator.h:
* ciao/Containers/Servant_Activator.cpp:
* ciao/Servants/Port_Activator_T.cpp:
- * ciao/Servants/CIAO_Port_Activator.idl:
+ * ciao/Servants/CIAO_Port_Activator.idl:
Deactivate content. Later on if build successfull delete files
* ciao/Containers/Container_Base.idl:
diff --git a/CIAO/ciao/Containers/Containers.mpc b/CIAO/ciao/Containers/Containers.mpc
index 6c360184f16..727f1aeb249 100644
--- a/CIAO/ciao/Containers/Containers.mpc
+++ b/CIAO/ciao/Containers/Containers.mpc
@@ -14,8 +14,7 @@ project(CIAO_Container_Base_idl) : install, taoidldefaults {
install_dir = ciao/Containers
}
}
-
-project(CIAO_Container_Base_stub) : install, ciao_lib, ccm_svnt, ciao_servant_activator_stub, ciao_port_activator_stub {
+project(CIAO_Container_Base_stub) : install, ciao_lib, ccm_svnt {
after += CIAO_Container_Base_idl
dynamicflags += CIAO_CONTAINER_BASE_BUILD_DLL