ChangeLogTag:Fri Aug 29 15:18:36 UTC 2003 Don Hinton <dhinton@dresystems.com>

7 files changed, 30 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f63812f1f01..01d1e514f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Fri Aug 29 15:18:36 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * apps/JAWS/clients/Blobby/blobby.mpc:
+        * apps/soreduce/soreduce.mpc:
+          Added exename to both of these to force an exe to be created
+          instead of a library.
+
+        * tests/RMCast/acetest.mpb
+          Modified the path for Main.cpp so that it picks up the one in
+          the current directory.  Some build were having problems with
+          this and didn't create the .obj directory which cause
+          compilation to fail.
+
 Fri Aug 29 13:41:40 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/templates/gnu.mpd:
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 16d74b7d7e5..83f4a5a0bc2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 29 15:18:36 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.[h,cpp]:
+          Changed loc1 and loc2 to loc_1 and loc_2 since the former are
+          definitions on Solaris.
+
 Fri Aug 29 14:16:18 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/ast/ast_generator.cpp:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index a34a7760299..4b81a558c68 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -148,7 +148,7 @@ LB_server::start_orb_and_poa (void)
 }
 
 int
-LB_server::create_object_group (const char *loc1, const char *loc2)
+LB_server::create_object_group (const char *loc_1, const char *loc_2)
 {
   ACE_TRY_NEW_ENV
     {
@@ -204,8 +204,8 @@ LB_server::create_object_group (const char *loc1, const char *loc2)
       PortableGroup::Location & location2 = factory_infos[1].the_location;
       location2.length (1);
 
-      location1[0].id = CORBA::string_dup (loc1);
-      location2[0].id = CORBA::string_dup (loc2);
+      location1[0].id = CORBA::string_dup (loc_1);
+      location2[0].id = CORBA::string_dup (loc_2);
 
       property_two.nam[0].id =
         CORBA::string_dup ("org.omg.PortableGroup.Factories");
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
index 184afcacfb4..eec9e8e1133 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h
@@ -41,7 +41,7 @@ public:
   int start_orb_and_poa (void);
 
   /// Create the Object Group using the Load Manager Reference.
-  int create_object_group (const char *loc1, const char *loc2);
+  int create_object_group (const char *loc_1, const char *loc_2);
 
   /// Run the ORB.
   int run (void);
diff --git a/apps/JAWS/clients/Blobby/blobby.mpc b/apps/JAWS/clients/Blobby/blobby.mpc
index 97b2f200d2f..9d8861fffe0 100644
--- a/apps/JAWS/clients/Blobby/blobby.mpc
+++ b/apps/JAWS/clients/Blobby/blobby.mpc
@@ -1,5 +1,7 @@
 project(blobby) : aceexe {
+  exename = blobby
   Source_Files {
+    blobby.cpp
     Blob.cpp
     Blob_Handler.cpp
     Options.cpp
diff --git a/apps/soreduce/soreduce.mpc b/apps/soreduce/soreduce.mpc
index 6ae50113da4..0537c9e4102 100644
--- a/apps/soreduce/soreduce.mpc
+++ b/apps/soreduce/soreduce.mpc
@@ -1,11 +1,14 @@
+// $Id$
+
 project(soreduce) : aceexe {
+  exename = soreduce
   Source_Files {
     Signature.cpp
     Sig_List.cpp
     Obj_Module.cpp
     Library.cpp
     SO_Group.cpp
-    soreduce
+    soreduce.cpp
   }
 }
 
diff --git a/tests/RMCast/acetest.mpb b/tests/RMCast/acetest.mpb
index d6faac7e307..c331d9cea5e 100644
--- a/tests/RMCast/acetest.mpb
+++ b/tests/RMCast/acetest.mpb
@@ -5,7 +5,7 @@ project : aceexe {
   libs  += Test_Output
 
   Source_Files {
-    $(ACE_ROOT)/tests/Main.cpp
+    Main.cpp
   }
   Header_Files {
   }