ChangeLogTag: Wed Sep 10 10:07:43 2003 Chad Elliott <elliott_c@ociweb.com>

20 files changed, 100 insertions, 75 deletions

diff --git a/ChangeLog b/ChangeLog
index aa184dec69e..0ff38d9ea66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+Wed Sep 10 10:07:43 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/property.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:
+
+          Change requires to tagchecks.  Using requires here was not
+          correct.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Use tagchecks even if comps is used.
+
 Wed Sep 10 08:04:25 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
diff --git a/bin/MakeProjectCreator/config/avstreams.mpb b/bin/MakeProjectCreator/config/avstreams.mpb
index 3affd54ebc1..e69cc514776 100644
--- a/bin/MakeProjectCreator/config/avstreams.mpb
+++ b/bin/MakeProjectCreator/config/avstreams.mpb
@@ -1,7 +1,7 @@
 project: property, naming, qos {
-  after    += AV
-  libs     += TAO_AV
-  comps    += AV
-  requires += AV
+  after     += AV
+  libs      += TAO_AV
+  comps     += AV
+  tagchecks += AV
 }
 
diff --git a/bin/MakeProjectCreator/config/concurrency.mpb b/bin/MakeProjectCreator/config/concurrency.mpb
index caa722a9fd2..efcea79aee0 100644
--- a/bin/MakeProjectCreator/config/concurrency.mpb
+++ b/bin/MakeProjectCreator/config/concurrency.mpb
@@ -1,6 +1,6 @@
 project : portableserver {
-  after    += CosConcurrency
-  libs     += TAO_CosConcurrency
-  comps    += Concurrency
-  requires += Concurrency
+  after     += CosConcurrency
+  libs      += TAO_CosConcurrency
+  comps     += Concurrency
+  tagchecks += Concurrency
 }
diff --git a/bin/MakeProjectCreator/config/event.mpb b/bin/MakeProjectCreator/config/event.mpb
index 074b019e62c..b9e73ebae7a 100644
--- a/bin/MakeProjectCreator/config/event.mpb
+++ b/bin/MakeProjectCreator/config/event.mpb
@@ -1,6 +1,6 @@
 project : naming, messaging {
-  after    += CosEvent
-  libs     += TAO_CosEvent
-  comps    += CosEvent
-  requires += CosEvent
+  after     += CosEvent
+  libs      += TAO_CosEvent
+  comps     += CosEvent
+  tagchecks += CosEvent
 }
diff --git a/bin/MakeProjectCreator/config/ftorb.mpb b/bin/MakeProjectCreator/config/ftorb.mpb
index cf7bd451524..b975b9e3264 100644
--- a/bin/MakeProjectCreator/config/ftorb.mpb
+++ b/bin/MakeProjectCreator/config/ftorb.mpb
@@ -1,6 +1,6 @@
 project : iormanip, portableserver {
-  after    += FTORB 
-  libs     += TAO_FTORB 
-  comps    += FTORB
-  requires += FTORB
+  after     += FTORB 
+  libs      += TAO_FTORB 
+  comps     += FTORB
+  tagchecks += FTORB
 }
diff --git a/bin/MakeProjectCreator/config/ifrservice.mpb b/bin/MakeProjectCreator/config/ifrservice.mpb
index 93ec5ea8a43..d165270bbc3 100644
--- a/bin/MakeProjectCreator/config/ifrservice.mpb
+++ b/bin/MakeProjectCreator/config/ifrservice.mpb
@@ -1,6 +1,6 @@
 project : iortable, svc_utils, typecodefactory {
-  after    += IFRService
-  libs     += TAO_IFRService
-  comps    += IFRService
-  requires += IFRService
+  after     += IFRService
+  libs      += TAO_IFRService
+  comps     += IFRService
+  tagchecks += IFRService
 }
diff --git a/bin/MakeProjectCreator/config/lifecycle.mpb b/bin/MakeProjectCreator/config/lifecycle.mpb
index 38796f7506d..327221d6952 100644
--- a/bin/MakeProjectCreator/config/lifecycle.mpb
+++ b/bin/MakeProjectCreator/config/lifecycle.mpb
@@ -1,6 +1,6 @@
 project : naming {
-  libs     += TAO_CosLifeCycle
-  after    += CosLifeCycle
-  comps    += LifeCycle
-  requires += LifeCycle
+  libs      += TAO_CosLifeCycle
+  after     += CosLifeCycle
+  comps     += LifeCycle
+  tagchecks += LifeCycle
 }
diff --git a/bin/MakeProjectCreator/config/loadbalancing.mpb b/bin/MakeProjectCreator/config/loadbalancing.mpb
index 7170cbdce71..1ae01ceb922 100644
--- a/bin/MakeProjectCreator/config/loadbalancing.mpb
+++ b/bin/MakeProjectCreator/config/loadbalancing.mpb
@@ -1,6 +1,6 @@
 project : messaging, naming, portablegroup {
-  libs     += TAO_CosLoadBalancing
-  after    += CosLoadBalancing
-  comps    += CosLoadBalancing
-  requires += CosLoadBalancing
+  libs      += TAO_CosLoadBalancing
+  after     += CosLoadBalancing
+  comps     += CosLoadBalancing
+  tagchecks += CosLoadBalancing
 }
diff --git a/bin/MakeProjectCreator/config/naming.mpb b/bin/MakeProjectCreator/config/naming.mpb
index 84b98781a5c..b76352fa64c 100644
--- a/bin/MakeProjectCreator/config/naming.mpb
+++ b/bin/MakeProjectCreator/config/naming.mpb
@@ -1,6 +1,6 @@
 project : iortable, svc_utils {
-  after    += CosNaming
-  libs     += TAO_CosNaming
-  comps    += Naming
-  requires += Naming
+  after     += CosNaming
+  libs      += TAO_CosNaming
+  comps     += Naming
+  tagchecks += Naming
 }
diff --git a/bin/MakeProjectCreator/config/notification.mpb b/bin/MakeProjectCreator/config/notification.mpb
index 0bb4dd7dad1..c7a5bbb32a6 100644
--- a/bin/MakeProjectCreator/config/notification.mpb
+++ b/bin/MakeProjectCreator/config/notification.mpb
@@ -1,6 +1,6 @@
 project : event, etcl, dynamicany {
-  after    += CosNotification
-  libs     += TAO_CosNotification
-  comps    += Notify
-  requires += Notify
+  after     += CosNotification
+  libs      += TAO_CosNotification
+  comps     += Notify
+  tagchecks += Notify
 }
diff --git a/bin/MakeProjectCreator/config/property.mpb b/bin/MakeProjectCreator/config/property.mpb
index 232af237925..b50680ccb35 100644
--- a/bin/MakeProjectCreator/config/property.mpb
+++ b/bin/MakeProjectCreator/config/property.mpb
@@ -1,6 +1,6 @@
 project : portableserver {
-  after    += CosProperty
-  libs     += TAO_CosProperty
-  comps    += Property
-  requires += Property
+  after     += CosProperty
+  libs      += TAO_CosProperty
+  comps     += Property
+  tagchecks += Property
 }
diff --git a/bin/MakeProjectCreator/config/rtcorbaevent.mpb b/bin/MakeProjectCreator/config/rtcorbaevent.mpb
index 6d9266639c4..b314275251d 100644
--- a/bin/MakeProjectCreator/config/rtcorbaevent.mpb
+++ b/bin/MakeProjectCreator/config/rtcorbaevent.mpb
@@ -1,6 +1,6 @@
 project : rtportableserver, rtevent {
-  after    += RTCORBAEvent
-  libs     += TAO_RTCORBAEvent
-  comps    += RTCORBAEvent
-  requires += RTCORBAEvent
+  after     += RTCORBAEvent
+  libs      += TAO_RTCORBAEvent
+  comps     += RTCORBAEvent
+  tagchecks += RTCORBAEvent
 }
diff --git a/bin/MakeProjectCreator/config/rtevent.mpb b/bin/MakeProjectCreator/config/rtevent.mpb
index e01215f3f8d..d861b3ab152 100644
--- a/bin/MakeProjectCreator/config/rtevent.mpb
+++ b/bin/MakeProjectCreator/config/rtevent.mpb
@@ -1,6 +1,6 @@
 project : messaging, svc_utils {
-  after    += RTEvent
-  libs     += TAO_RTEvent
-  comps    += RTEvent
-  requires += RTEvent
+  after     += RTEvent
+  libs      += TAO_RTEvent
+  comps     += RTEvent
+  tagchecks += RTEvent
 }
diff --git a/bin/MakeProjectCreator/config/rtoldevent.mpb b/bin/MakeProjectCreator/config/rtoldevent.mpb
index 95e0a92307c..acd04499e94 100644
--- a/bin/MakeProjectCreator/config/rtoldevent.mpb
+++ b/bin/MakeProjectCreator/config/rtoldevent.mpb
@@ -1,6 +1,6 @@
 project : rtevent, rtsched {
-  after    += RTOLDEvent
-  libs     += TAO_RTOLDEvent
-  comps    += RTOLDEvent
-  requires += RTOLDEvent
+  after     += RTOLDEvent
+  libs      += TAO_RTOLDEvent
+  comps     += RTOLDEvent
+  tagchecks += RTOLDEvent
 }
diff --git a/bin/MakeProjectCreator/config/rtsched.mpb b/bin/MakeProjectCreator/config/rtsched.mpb
index 54d06b0511c..1dcbc50b45e 100644
--- a/bin/MakeProjectCreator/config/rtsched.mpb
+++ b/bin/MakeProjectCreator/config/rtsched.mpb
@@ -1,6 +1,6 @@
 project : naming {
-  after    += RTSched
-  libs     += TAO_RTSched
-  comps    += Sched
-  requires += Sched
+  after     += RTSched
+  libs      += TAO_RTSched
+  comps     += Sched
+  tagchecks += Sched
 }
diff --git a/bin/MakeProjectCreator/config/rtschedevent.mpb b/bin/MakeProjectCreator/config/rtschedevent.mpb
index b38f3307ca8..00e9cc357e6 100644
--- a/bin/MakeProjectCreator/config/rtschedevent.mpb
+++ b/bin/MakeProjectCreator/config/rtschedevent.mpb
@@ -1,6 +1,6 @@
 project : rtsched, rtevent {
-  after    += RTSchedEvent
-  libs     += TAO_RTSchedEvent
-  comps    += RTSchedEvent
-  requires += RTSchedEvent
+  after     += RTSchedEvent
+  libs      += TAO_RTSchedEvent
+  comps     += RTSchedEvent
+  tagchecks += RTSchedEvent
 }
diff --git a/bin/MakeProjectCreator/config/security.mpb b/bin/MakeProjectCreator/config/security.mpb
index 17484564c65..dafaed21d0a 100644
--- a/bin/MakeProjectCreator/config/security.mpb
+++ b/bin/MakeProjectCreator/config/security.mpb
@@ -1,6 +1,6 @@
 project : portableserver {
-  after    += Security
-  libs     += TAO_Security
-  comps    += Security
-  requires += Security
+  after     += Security
+  libs      += TAO_Security
+  comps     += Security
+  tagchecks += Security
 }
diff --git a/bin/MakeProjectCreator/config/time.mpb b/bin/MakeProjectCreator/config/time.mpb
index 13a35c53289..5c9b4a891e5 100644
--- a/bin/MakeProjectCreator/config/time.mpb
+++ b/bin/MakeProjectCreator/config/time.mpb
@@ -1,6 +1,6 @@
 project : naming {
-  after    += CosTime
-  libs     += TAO_CosTime
-  comps    += Time
-  requires += Time
+  after     += CosTime
+  libs      += TAO_CosTime
+  comps     += Time
+  tagchecks += Time
 }
diff --git a/bin/MakeProjectCreator/config/trading.mpb b/bin/MakeProjectCreator/config/trading.mpb
index 0ce63268567..218970d3d51 100644
--- a/bin/MakeProjectCreator/config/trading.mpb
+++ b/bin/MakeProjectCreator/config/trading.mpb
@@ -1,6 +1,6 @@
 project : dynamicany, portableserver {
-  after    += CosTrading 
-  libs     += TAO_CosTrading
-  comps    += Trader
-  requires += Trader
+  after     += CosTrading 
+  libs      += TAO_CosTrading
+  comps     += Trader
+  tagchecks += Trader
 }
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index a4b5c817a27..3f86aba99c5 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -86,7 +86,6 @@ ACELIB =
 include $(TAO_ROOT)/rules.tao.GNU
 <%endif%>
 <%if(!exename)%>
-<%if(comps)%>
 
 <%if(compname)%>
 CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components <%compname%>)
@@ -133,7 +132,6 @@ else
   all: require_warning
 endif
 <%endfor%>
-<%else%>
 
 <%if(tagname)%>
 ifeq (,$(<%tagname%>))
@@ -200,7 +198,6 @@ endif
 endif
 <%endif%>
 <%endif%>
-<%endif%>
 
 <%if(exename)%>
 <%if(compname)%>