ChangeLogTag: Fri Sep 5 08:20:15 2003 Chad Elliott <elliott_c@ociweb.com>

28 files changed, 117 insertions, 58 deletions

diff --git a/ChangeLog b/ChangeLog
index 23d19fb5e90..76abfdc56ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+Fri Sep  5 08:20:15 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/avstreams.mpb:
+        * bin/MakeProjectCreator/config/concurrency.mpb:
+        * bin/MakeProjectCreator/config/event.mpb:
+        * bin/MakeProjectCreator/config/ftorb.mpb:
+        * bin/MakeProjectCreator/config/ifrservice.mpb:
+        * bin/MakeProjectCreator/config/lifecycle.mpb:
+        * bin/MakeProjectCreator/config/loadbalancing.mpb:
+        * bin/MakeProjectCreator/config/naming.mpb:
+        * bin/MakeProjectCreator/config/notification.mpb:
+        * bin/MakeProjectCreator/config/portablegroup.mpb:
+        * bin/MakeProjectCreator/config/property.mpb:
+        * bin/MakeProjectCreator/config/qt-min.mpb:
+        * bin/MakeProjectCreator/config/rmcast.mpb:
+        * bin/MakeProjectCreator/config/rtcorbaevent.mpb:
+        * bin/MakeProjectCreator/config/rtevent.mpb:
+        * bin/MakeProjectCreator/config/rtoldevent.mpb:
+        * bin/MakeProjectCreator/config/rtsched.mpb:
+        * bin/MakeProjectCreator/config/rtschedevent.mpb:
+        * bin/MakeProjectCreator/config/security.mpb:
+        * bin/MakeProjectCreator/config/time.mpb:
+        * bin/MakeProjectCreator/config/trading.mpb:
+
+          Updated these base projects with the correct comps and requires
+          values.
+
+        * bin/MakeProjectCreator/modules/TemplateParser.pm:
+
+          Make all keywords case insensitive (as it should have been).
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+        * bin/MakeProjectCreator/templates/make.mpd:
+
+          Fixed a bug with custom build types and the use of $^.
+
+        * bin/MakeProjectCreator/config/client.mpb:
+        * bin/MakeProjectCreator/config/messaging_only.mpb:
+        * bin/MakeProjectCreator/config/server.mpb:
+
+          Removed these files.  They have outlived their usefulness.
+
 Fri Sep  5 06:56:37 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/templates/gnu.mpd:
diff --git a/bin/MakeProjectCreator/config/avstreams.mpb b/bin/MakeProjectCreator/config/avstreams.mpb
index 18c80907209..3affd54ebc1 100644
--- a/bin/MakeProjectCreator/config/avstreams.mpb
+++ b/bin/MakeProjectCreator/config/avstreams.mpb
@@ -1,6 +1,7 @@
 project: property, naming, qos {
-  after   += AV
-  libs    += TAO_AV
-  comps   += AV
+  after    += AV
+  libs     += TAO_AV
+  comps    += AV
+  requires += AV
 }
 
diff --git a/bin/MakeProjectCreator/config/client.mpb b/bin/MakeProjectCreator/config/client.mpb
deleted file mode 100644
index fa33fcf2fb8..00000000000
--- a/bin/MakeProjectCreator/config/client.mpb
+++ /dev/null
@@ -1,2 +0,0 @@
-project : taoclient {
-}
\ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/concurrency.mpb b/bin/MakeProjectCreator/config/concurrency.mpb
index 9a57c9f34f2..caa722a9fd2 100644
--- a/bin/MakeProjectCreator/config/concurrency.mpb
+++ b/bin/MakeProjectCreator/config/concurrency.mpb
@@ -1,5 +1,6 @@
 project : portableserver {
-  after   += CosConcurrency
-  libs    += TAO_CosConcurrency
-  comps   += Concurrency
+  after    += CosConcurrency
+  libs     += TAO_CosConcurrency
+  comps    += Concurrency
+  requires += Concurrency
 }
diff --git a/bin/MakeProjectCreator/config/event.mpb b/bin/MakeProjectCreator/config/event.mpb
index 48aaaf66e52..074b019e62c 100644
--- a/bin/MakeProjectCreator/config/event.mpb
+++ b/bin/MakeProjectCreator/config/event.mpb
@@ -1,5 +1,6 @@
 project : naming, messaging {
-  after   += CosEvent
-  libs    += TAO_CosEvent
-  comps   += CosEvent
+  after    += CosEvent
+  libs     += TAO_CosEvent
+  comps    += CosEvent
+  requires += CosEvent
 }
diff --git a/bin/MakeProjectCreator/config/ftorb.mpb b/bin/MakeProjectCreator/config/ftorb.mpb
index ee7fe2d1c65..cf7bd451524 100644
--- a/bin/MakeProjectCreator/config/ftorb.mpb
+++ b/bin/MakeProjectCreator/config/ftorb.mpb
@@ -1,5 +1,6 @@
 project : iormanip, portableserver {
-  after   += FTORB 
-  libs    += TAO_FTORB 
-  comps   += FTORB
+  after    += FTORB 
+  libs     += TAO_FTORB 
+  comps    += FTORB
+  requires += FTORB
 }
diff --git a/bin/MakeProjectCreator/config/ifrservice.mpb b/bin/MakeProjectCreator/config/ifrservice.mpb
index b7a95bde237..93ec5ea8a43 100644
--- a/bin/MakeProjectCreator/config/ifrservice.mpb
+++ b/bin/MakeProjectCreator/config/ifrservice.mpb
@@ -1,4 +1,6 @@
 project : iortable, svc_utils, typecodefactory {
-  after   += IFRService
-  libs    += TAO_IFRService
+  after    += IFRService
+  libs     += TAO_IFRService
+  comps    += IFRService
+  requires += IFRService
 }
diff --git a/bin/MakeProjectCreator/config/lifecycle.mpb b/bin/MakeProjectCreator/config/lifecycle.mpb
index cfe2108f32e..38796f7506d 100644
--- a/bin/MakeProjectCreator/config/lifecycle.mpb
+++ b/bin/MakeProjectCreator/config/lifecycle.mpb
@@ -1,4 +1,6 @@
 project : naming {
   libs     += TAO_CosLifeCycle
   after    += CosLifeCycle
+  comps    += LifeCycle
+  requires += LifeCycle
 }
diff --git a/bin/MakeProjectCreator/config/loadbalancing.mpb b/bin/MakeProjectCreator/config/loadbalancing.mpb
index 035ff3493c1..7170cbdce71 100644
--- a/bin/MakeProjectCreator/config/loadbalancing.mpb
+++ b/bin/MakeProjectCreator/config/loadbalancing.mpb
@@ -2,4 +2,5 @@ project : messaging, naming, portablegroup {
   libs     += TAO_CosLoadBalancing
   after    += CosLoadBalancing
   comps    += CosLoadBalancing
+  requires += CosLoadBalancing
 }
diff --git a/bin/MakeProjectCreator/config/messaging_only.mpb b/bin/MakeProjectCreator/config/messaging_only.mpb
deleted file mode 100644
index 037b71972cd..00000000000
--- a/bin/MakeProjectCreator/config/messaging_only.mpb
+++ /dev/null
@@ -1,4 +0,0 @@
-project {
-  after += Messaging
-  libs  += TAO_Messaging
-}
diff --git a/bin/MakeProjectCreator/config/naming.mpb b/bin/MakeProjectCreator/config/naming.mpb
index c46e30dc84a..84b98781a5c 100644
--- a/bin/MakeProjectCreator/config/naming.mpb
+++ b/bin/MakeProjectCreator/config/naming.mpb
@@ -1,5 +1,6 @@
 project : iortable, svc_utils {
-  after   += CosNaming
-  libs    += TAO_CosNaming
-  comps   += Naming
+  after    += CosNaming
+  libs     += TAO_CosNaming
+  comps    += Naming
+  requires += Naming
 }
diff --git a/bin/MakeProjectCreator/config/notification.mpb b/bin/MakeProjectCreator/config/notification.mpb
index 9cc453facbc..0bb4dd7dad1 100644
--- a/bin/MakeProjectCreator/config/notification.mpb
+++ b/bin/MakeProjectCreator/config/notification.mpb
@@ -1,5 +1,6 @@
 project : event, etcl, dynamicany {
-  after   += CosNotification
-  libs    += TAO_CosNotification
-  comps   += Notify
+  after    += CosNotification
+  libs     += TAO_CosNotification
+  comps    += Notify
+  requires += Notify
 }
diff --git a/bin/MakeProjectCreator/config/portablegroup.mpb b/bin/MakeProjectCreator/config/portablegroup.mpb
index 0331899d194..a690f117c95 100644
--- a/bin/MakeProjectCreator/config/portablegroup.mpb
+++ b/bin/MakeProjectCreator/config/portablegroup.mpb
@@ -1,4 +1,5 @@
 project : naming {
   libs     += TAO_PortableGroup
   after    += PortableGroup
+  requires += PortableGroup
 }
diff --git a/bin/MakeProjectCreator/config/property.mpb b/bin/MakeProjectCreator/config/property.mpb
index 171b42fdf76..232af237925 100644
--- a/bin/MakeProjectCreator/config/property.mpb
+++ b/bin/MakeProjectCreator/config/property.mpb
@@ -1,5 +1,6 @@
 project : portableserver {
-  after   += CosProperty
-  libs    += TAO_CosProperty
-  comps   += CosProperty
+  after    += CosProperty
+  libs     += TAO_CosProperty
+  comps    += Property
+  requires += Property
 }
diff --git a/bin/MakeProjectCreator/config/qt-min.mpb b/bin/MakeProjectCreator/config/qt-min.mpb
index b119c8f02d5..ab088c354e2 100644
--- a/bin/MakeProjectCreator/config/qt-min.mpb
+++ b/bin/MakeProjectCreator/config/qt-min.mpb
@@ -13,4 +13,4 @@ project {
   specific(gnuace, make) {
     lit_libs += qt-mt
   }
-}
\ No newline at end of file
+}
diff --git a/bin/MakeProjectCreator/config/rmcast.mpb b/bin/MakeProjectCreator/config/rmcast.mpb
index 5255c32ef4c..33dff48471c 100644
--- a/bin/MakeProjectCreator/config/rmcast.mpb
+++ b/bin/MakeProjectCreator/config/rmcast.mpb
@@ -1,4 +1,5 @@
 project : acelib {
-  after   += RMCast
-  libs    += ACE_RMCast
+  requires += rmcast
+  after    += RMCast
+  libs     += ACE_RMCast
 }
diff --git a/bin/MakeProjectCreator/config/rtcorbaevent.mpb b/bin/MakeProjectCreator/config/rtcorbaevent.mpb
index 292ff257a9c..6d9266639c4 100644
--- a/bin/MakeProjectCreator/config/rtcorbaevent.mpb
+++ b/bin/MakeProjectCreator/config/rtcorbaevent.mpb
@@ -1,4 +1,6 @@
 project : rtportableserver, rtevent {
-  after   += RTCORBAEvent
-  libs    += TAO_RTCORBAEvent
+  after    += RTCORBAEvent
+  libs     += TAO_RTCORBAEvent
+  comps    += RTCORBAEvent
+  requires += RTCORBAEvent
 }
diff --git a/bin/MakeProjectCreator/config/rtevent.mpb b/bin/MakeProjectCreator/config/rtevent.mpb
index 89f0e5422b3..e01215f3f8d 100644
--- a/bin/MakeProjectCreator/config/rtevent.mpb
+++ b/bin/MakeProjectCreator/config/rtevent.mpb
@@ -1,5 +1,6 @@
 project : messaging, svc_utils {
-  after   += RTEvent
-  libs    += TAO_RTEvent
-  comps   += RTEvent
+  after    += RTEvent
+  libs     += TAO_RTEvent
+  comps    += RTEvent
+  requires += RTEvent
 }
diff --git a/bin/MakeProjectCreator/config/rtoldevent.mpb b/bin/MakeProjectCreator/config/rtoldevent.mpb
index 9c9e38176a8..95e0a92307c 100644
--- a/bin/MakeProjectCreator/config/rtoldevent.mpb
+++ b/bin/MakeProjectCreator/config/rtoldevent.mpb
@@ -1,5 +1,6 @@
 project : rtevent, rtsched {
-  after   += RTOLDEvent
-  libs    += TAO_RTOLDEvent
-  comps   += RTOLDEvent
+  after    += RTOLDEvent
+  libs     += TAO_RTOLDEvent
+  comps    += RTOLDEvent
+  requires += RTOLDEvent
 }
diff --git a/bin/MakeProjectCreator/config/rtsched.mpb b/bin/MakeProjectCreator/config/rtsched.mpb
index 21482dcbbc3..54d06b0511c 100644
--- a/bin/MakeProjectCreator/config/rtsched.mpb
+++ b/bin/MakeProjectCreator/config/rtsched.mpb
@@ -1,5 +1,6 @@
 project : naming {
-  after   += RTSched
-  libs    += TAO_RTSched
-  comps   += Sched
+  after    += RTSched
+  libs     += TAO_RTSched
+  comps    += Sched
+  requires += Sched
 }
diff --git a/bin/MakeProjectCreator/config/rtschedevent.mpb b/bin/MakeProjectCreator/config/rtschedevent.mpb
index 1a49dd63eb6..b38f3307ca8 100644
--- a/bin/MakeProjectCreator/config/rtschedevent.mpb
+++ b/bin/MakeProjectCreator/config/rtschedevent.mpb
@@ -1,4 +1,6 @@
 project : rtsched, rtevent {
-  after   += RTSchedEvent
-  libs    += TAO_RTSchedEvent
+  after    += RTSchedEvent
+  libs     += TAO_RTSchedEvent
+  comps    += RTSchedEvent
+  requires += RTSchedEvent
 }
diff --git a/bin/MakeProjectCreator/config/security.mpb b/bin/MakeProjectCreator/config/security.mpb
index 03b8d1498a5..17484564c65 100644
--- a/bin/MakeProjectCreator/config/security.mpb
+++ b/bin/MakeProjectCreator/config/security.mpb
@@ -1,4 +1,6 @@
 project : portableserver {
-  after   += Security
-  libs    += TAO_Security
+  after    += Security
+  libs     += TAO_Security
+  comps    += Security
+  requires += Security
 }
diff --git a/bin/MakeProjectCreator/config/server.mpb b/bin/MakeProjectCreator/config/server.mpb
deleted file mode 100644
index 5a5e667565c..00000000000
--- a/bin/MakeProjectCreator/config/server.mpb
+++ /dev/null
@@ -1,2 +0,0 @@
-project : taoserver {
-}
diff --git a/bin/MakeProjectCreator/config/time.mpb b/bin/MakeProjectCreator/config/time.mpb
index 20fe675c0ea..13a35c53289 100644
--- a/bin/MakeProjectCreator/config/time.mpb
+++ b/bin/MakeProjectCreator/config/time.mpb
@@ -1,5 +1,6 @@
 project : naming {
-  after   += CosTime
-  libs    += TAO_CosTime
-  comps   += Time
+  after    += CosTime
+  libs     += TAO_CosTime
+  comps    += Time
+  requires += Time
 }
diff --git a/bin/MakeProjectCreator/config/trading.mpb b/bin/MakeProjectCreator/config/trading.mpb
index 48f789e0257..0ce63268567 100644
--- a/bin/MakeProjectCreator/config/trading.mpb
+++ b/bin/MakeProjectCreator/config/trading.mpb
@@ -1,5 +1,6 @@
 project : dynamicany, portableserver {
-  after   += CosTrading 
-  libs    += TAO_CosTrading
-  comps   += Trader
+  after    += CosTrading 
+  libs     += TAO_CosTrading
+  comps    += Trader
+  requires += Trader
 }
diff --git a/bin/MakeProjectCreator/modules/TemplateParser.pm b/bin/MakeProjectCreator/modules/TemplateParser.pm
index 7f901cd5604..f4cf2ac3d5b 100644
--- a/bin/MakeProjectCreator/modules/TemplateParser.pm
+++ b/bin/MakeProjectCreator/modules/TemplateParser.pm
@@ -755,7 +755,7 @@ sub split_name_value {
     }
   }
 
-  return $name, $val;
+  return lc($name), $val;
 }
 
 
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 6fb7e3ec2c9..a4b5c817a27 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -401,7 +401,7 @@ PATH            := $(PATH):<%custom_type->libpath%>
 GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%>
 <%foreach(custom_type->input_file->output_files)%>
 <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>: <%custom_type->input_file%>
-	<%custom_type->command%> <%if(pch_header)%><%if(custom_type->pch_option)%><%custom_type->pch_option%><%pch_header%> <%endif%><%endif%><%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $^ <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
+	<%custom_type->command%> <%if(pch_header)%><%if(custom_type->pch_option)%><%custom_type->pch_option%><%pch_header%> <%endif%><%endif%><%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
 
 <%endfor%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd
index 411d55b8f76..f55d1477844 100644
--- a/bin/MakeProjectCreator/templates/make.mpd
+++ b/bin/MakeProjectCreator/templates/make.mpd
@@ -92,7 +92,7 @@ PATH            := $(PATH):<%custom_type->libpath%>
 GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%>
 <%foreach(custom_type->input_file->output_files)%>
 <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>: <%custom_type->input_file%>
-	<%custom_type->command%> <%if(pch_header)%><%if(custom_type->pch_option)%><%custom_type->pch_option%><%pch_header%> <%endif%><%endif%><%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $^ <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
+	<%custom_type->command%> <%if(pch_header)%><%if(custom_type->pch_option)%><%custom_type->pch_option%><%pch_header%> <%endif%><%endif%><%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%> <%if(custom_type->output_option)%><%custom_type->output_option%> $@<%endif%>
 
 <%endfor%>
 <%endif%>