diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-07 11:49:20 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-07 11:49:20 +0000 |
| commit | 31565e0878d18dea00894ab1b0d043f1a857d3ac (patch) | |
| tree | 356d6008072d40c92edf99bd870dbac9bff0c330 /CIAO | |
| parent | 2afe08747a9e5c6ddf958c3149a22858b2442fcc (diff) | |
| download | ATCD-31565e0878d18dea00894ab1b0d043f1a857d3ac.tar.gz | |
Thu Dec 7 11:48:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | CIAO/MPC/config/ciao_server_dnc.mpb | 2 | ||||
| -rw-r--r-- | CIAO/ciao/CCM_Core.mpc | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 48fcdfcaec2..0d6e6d659f8 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Dec 7 11:48:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/CCM_Core.mpc: + * MPC/config/ciao_server_dnc.mpb: + Don't build DnC server with minimum corba and CORBA/e, this was + disabled in the past implicitly because we used security as + MPC base project but because that has been removed we now + have to explicitly disable this project + Thu Dec 7 11:34:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp: diff --git a/CIAO/MPC/config/ciao_server_dnc.mpb b/CIAO/MPC/config/ciao_server_dnc.mpb index 380c9d22c90..c35042c2c4a 100644 --- a/CIAO/MPC/config/ciao_server_dnc.mpb +++ b/CIAO/MPC/config/ciao_server_dnc.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc { +project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += CIAO_DnC_Server libs += CIAO_DnC_Server } diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc index 3fc76c17249..ecd8740a3f1 100644 --- a/CIAO/ciao/CCM_Core.mpc +++ b/CIAO/ciao/CCM_Core.mpc @@ -259,14 +259,13 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien } -project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt { +project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { includes += $(CIAO_ROOT) sharedname = CIAO_DnC_Server idlflags += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export dynamicflags = CIAO_SERVER_BUILD_DLL IDL_Files { - } Source_Files { |