diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-09-06 07:58:58 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-09-06 07:58:58 +0000 |
| commit | 304f94bc78e0a8b28deee711f261f96a958516ba (patch) | |
| tree | 806dc99d08bc30f67e2cb330ff482484a82fe846 | |
| parent | 4d78e9e594b663917abde97c2488e2786ad14987 (diff) | |
| download | ATCD-304f94bc78e0a8b28deee711f261f96a958516ba.tar.gz | |
ChangeLogTag:Mon Sep 6 00:54:48 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a66fe1be09e..bbcdd20f9c9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Mon Sep 6 00:54:48 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/LoadBalancer/LoadBalancer.mpc: + + For some reason this MPC file was configured to generate + "CosLoadManager" and "CosLoadMonitor" libraries rather + "LoadManager" and "LoadMonitor" executables, respectively; a + complete departure from the pre-MPC "hand-written" Makefiles and + project files. Fixed this problem. This should also fix the + Load Balancer test failures in our daily automated regression + tests. + Mon Sep 6 00:42:49 2004 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/Utils/Server_Main.cpp: diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc index 1528d5321b4..cf15da6e37b 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc @@ -1,7 +1,10 @@ // -*- MPC -*- +// // $Id$ -project(CosLoadManager): namingexe, portableserver, core, iormanip, loadbalancing { + +project(LoadManager): namingexe, portableserver, core, iormanip, loadbalancing { + exename = LoadManager requires += ami interceptors Source_Files { LoadManager.cpp @@ -9,8 +12,9 @@ project(CosLoadManager): namingexe, portableserver, core, iormanip, loadbalancin } } -project(CosLoadMonitor): namingexe, portableserver, core, loadbalancing { +project(LoadMonitor): namingexe, portableserver, core, loadbalancing { requires += ami interceptors + exename = LoadMonitor Source_Files { LoadMonitor.cpp Push_Handler.cpp |