diff options
Diffstat (limited to 'bin')
59 files changed, 492 insertions, 680 deletions
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb index ff74f4e334e..b26d925ef49 100644 --- a/bin/MakeProjectCreator/config/acedefaults.mpb +++ b/bin/MakeProjectCreator/config/acedefaults.mpb @@ -9,10 +9,6 @@ project: ace_qt, zzip { // Support the alternative Borland Make project type specific(bmake) { unicode_flags += -DACE_USES_WCHAR - macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(LIBMODIFIER)\\") - } - - specific(automake) { - includes += $(ACE_BUILDDIR) + macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(LIB_MODIFIER)\\") } } diff --git a/bin/MakeProjectCreator/config/amh.mpb b/bin/MakeProjectCreator/config/amh.mpb index 56648343ec1..905b651b3dc 100644 --- a/bin/MakeProjectCreator/config/amh.mpb +++ b/bin/MakeProjectCreator/config/amh.mpb @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ -project: taoidldefaults, messaging { +project: taoidldefaults { + requires += ami // There is no separate idlflags += -GH } diff --git a/bin/MakeProjectCreator/config/ami.mpb b/bin/MakeProjectCreator/config/ami.mpb index 9735a3b293d..00d02724a03 100644 --- a/bin/MakeProjectCreator/config/ami.mpb +++ b/bin/MakeProjectCreator/config/ami.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taoidldefaults, messaging { +project : messaging { requires += ami idlflags += -GC -} +}
\ No newline at end of file diff --git a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb index 180daf23682..69d7b3ca163 100644 --- a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb +++ b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project : taolib_with_idl { +project : portableserver,taoidldefaults { after += Deployment_stub - libs += CIAO_Deployment_stub - includes += $(CIAO_ROOT)/DAnCE - idlflags += -I$(CIAO_ROOT)/DAnCE -Sc + libs += Deployment_stub + includes += $(CIAO_ROOT)/DAnCE/ciao $(CIAO_ROOT)/DAnCE + idlflags += -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -Sc } diff --git a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb index 48293d29fa4..07c94af6152 100644 --- a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb +++ b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project : portableserver, ciao_deployment_stub, ciao_client_dnc { +project : portableserver, taoidldefaults { after += Deployment_svnt - libs += CIAO_Deployment_svnt - includes += $(CIAO_ROOT)/DAnCE/ciao - idlflags += -I$(CIAO_ROOT)/DAnCE -Sc + libs += Deployment_svnt + includes += $(CIAO_ROOT)/DAnCE/ciao $(CIAO_ROOT)/DAnCE + idlflags += -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -Sc } diff --git a/bin/MakeProjectCreator/config/ciao_servant.mpb b/bin/MakeProjectCreator/config/ciao_servant.mpb index 54c71d843f6..adb1b89819b 100644 --- a/bin/MakeProjectCreator/config/ciao_servant.mpb +++ b/bin/MakeProjectCreator/config/ciao_servant.mpb @@ -9,7 +9,7 @@ project : ciao_component { automatic = 0 dependent = 1 command = $(CIAO_ROOT)/bin/cidlc - commandflags = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs -- + commandflags = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -- inputext = .cidl source_outputext = _svnt.cpp generic_outputext = E.idl diff --git a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb index c4d66b64e3c..a42f2f90d3a 100644 --- a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb +++ b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb @@ -9,7 +9,7 @@ project : ciao_component_dnc { automatic = 0 dependent = 1 command = $(CIAO_ROOT)/bin/cidlc - commandflags = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs -- + commandflags = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -- inputext = .cidl source_outputext = _svnt.cpp generic_outputext = E.idl diff --git a/bin/MakeProjectCreator/config/ciao_server.mpb b/bin/MakeProjectCreator/config/ciao_server.mpb index 9e48aa8fbf2..2b620d68906 100644 --- a/bin/MakeProjectCreator/config/ciao_server.mpb +++ b/bin/MakeProjectCreator/config/ciao_server.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ciao_component, utils { +project : ciao_component { after += CIAO_Server libs += CIAO_Server } diff --git a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb index 7edba9f68fc..2daf0dbf2d9 100644 --- a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb +++ b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ciao_component_dnc, utils { +project : ciao_component_dnc { after += CIAO_DnC_Server - libs += CIAO_DnC_Server CIAO_Deployment_stub CIAO_Deployment_svnt + libs += CIAO_DnC_Server } diff --git a/bin/MakeProjectCreator/config/core.mpb b/bin/MakeProjectCreator/config/core.mpb index d718009002d..7939d3fe923 100644 --- a/bin/MakeProjectCreator/config/core.mpb +++ b/bin/MakeProjectCreator/config/core.mpb @@ -2,7 +2,7 @@ // $Id$ project { - specific { + verbatim(borland, macros) { INSTALL_THIS_TARGET = 1 } } diff --git a/bin/MakeProjectCreator/config/dseventlogadmin.mpb b/bin/MakeProjectCreator/config/dseventlogadmin.mpb index 031be774f43..343e83d8841 100644 --- a/bin/MakeProjectCreator/config/dseventlogadmin.mpb +++ b/bin/MakeProjectCreator/config/dseventlogadmin.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, dslogadmin, event { +project : dslogadmin, event { after += DsEventLogAdmin libs += TAO_DsEventLogAdmin } diff --git a/bin/MakeProjectCreator/config/dslogadmin.mpb b/bin/MakeProjectCreator/config/dslogadmin.mpb index 94516c7133f..9311ba4235c 100644 --- a/bin/MakeProjectCreator/config/dslogadmin.mpb +++ b/bin/MakeProjectCreator/config/dslogadmin.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib { +project : svc_utils, etcl, dynamicany { after += DsLogAdmin libs += TAO_DsLogAdmin } diff --git a/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb b/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb index fcd49678617..3fa171ab476 100644 --- a/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb +++ b/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, dslogadmin, dseventlogadmin, event, notification { +project : dseventlogadmin, notification, naming { after += DsNotifyLogAdmin libs += TAO_DsNotifyLogAdmin } diff --git a/bin/MakeProjectCreator/config/ec_use_typed_events.mpb b/bin/MakeProjectCreator/config/ec_use_typed_events.mpb index 5d0d9adef6f..a306db273d3 100644 --- a/bin/MakeProjectCreator/config/ec_use_typed_events.mpb +++ b/bin/MakeProjectCreator/config/ec_use_typed_events.mpb @@ -1,6 +1,8 @@ // -*- MPC -*- // $Id$ -feature(ec_typed_events) { +feature(ec_typed_events) { macros += TAO_HAS_TYPED_EVENT_CHANNEL + libs += TAO_IFR_Client TAO_DynamicInterface + after += IFR_Client DynamicInterface } diff --git a/bin/MakeProjectCreator/config/event.mpb b/bin/MakeProjectCreator/config/event.mpb index 10968e61645..8604669c7fe 100644 --- a/bin/MakeProjectCreator/config/event.mpb +++ b/bin/MakeProjectCreator/config/event.mpb @@ -1,7 +1,9 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, ec_use_typed_events, minimum_corba { +project : messaging, ec_use_typed_events, naming { after += CosEvent libs += TAO_CosEvent + tagchecks += CosEvent + avoids += minimum_corba } diff --git a/bin/MakeProjectCreator/config/ftorbutils.mpb b/bin/MakeProjectCreator/config/ftorbutils.mpb index 2698ffa36cf..427a8d1b45b 100644 --- a/bin/MakeProjectCreator/config/ftorbutils.mpb +++ b/bin/MakeProjectCreator/config/ftorbutils.mpb @@ -1,8 +1,10 @@ // -*- MPC -*- // $Id$ -project : iormanip, portableserver, orbsvcslib, minimum_corba { +project : iormanip, portableserver { after += FTORB_Utils libs += TAO_FTORB_Utils tagchecks += FTORB_Utils + avoids += minimum_corba } + diff --git a/bin/MakeProjectCreator/config/ftrtevent.mpb b/bin/MakeProjectCreator/config/ftrtevent.mpb index 50a843d8d27..e10e4903c68 100644 --- a/bin/MakeProjectCreator/config/ftrtevent.mpb +++ b/bin/MakeProjectCreator/config/ftrtevent.mpb @@ -1,8 +1,9 @@ // -*- MPC -*- // $Id$ -project : ftorbutils, rtevent, naming, messaging, minimum_corba { +project : ftorbutils, rtevent, naming { after += FtRtEvent libs += TAO_FtRtEvent tagchecks += FtRtEvent + avoids += minimum_corba } diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features index d77e608c9ca..d7860e05620 100644 --- a/bin/MakeProjectCreator/config/global.features +++ b/bin/MakeProjectCreator/config/global.features @@ -1,6 +1,6 @@ // The global features file contains the default feature settings. // By default, if a feature isn't listed here then it is enabled. -// If it is listed, then the value assigned to the feature is interpreted +// If it is listed, then the value assigned to the feature is enterpreted // as a boolean value. You really shouldn't have to edit this file except // to change the defaults. If you want to override these values you can do // one of two things. @@ -31,4 +31,3 @@ sctp = 0 xt_reactor = 0 dummy_label = 0 cidl = 0 -wince = 0 diff --git a/bin/MakeProjectCreator/config/iorinterceptor.mpb b/bin/MakeProjectCreator/config/iorinterceptor.mpb index 43310026ccd..208e574c7ad 100644 --- a/bin/MakeProjectCreator/config/iorinterceptor.mpb +++ b/bin/MakeProjectCreator/config/iorinterceptor.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib, portableserver, objreftemplate, valuetype { +project : taolib, objreftemplate, valuetype { after += IORInterceptor libs += TAO_IORInterceptor } diff --git a/bin/MakeProjectCreator/config/lifecycle.mpb b/bin/MakeProjectCreator/config/lifecycle.mpb index db47576564a..ecfb0e7bee6 100644 --- a/bin/MakeProjectCreator/config/lifecycle.mpb +++ b/bin/MakeProjectCreator/config/lifecycle.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : naming, portableserver { +project : naming { libs += TAO_CosLifeCycle after += CosLifeCycle tagchecks += LifeCycle diff --git a/bin/MakeProjectCreator/config/loadbalancing.mpb b/bin/MakeProjectCreator/config/loadbalancing.mpb index 7ad4f78dd3a..f850b2fea74 100644 --- a/bin/MakeProjectCreator/config/loadbalancing.mpb +++ b/bin/MakeProjectCreator/config/loadbalancing.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : messaging, naming, portablegroup, iorinterceptor { +project : messaging, naming, portablegroup { libs += TAO_CosLoadBalancing after += CosLoadBalancing tagchecks += CosLoadBalancing diff --git a/bin/MakeProjectCreator/config/naming.mpb b/bin/MakeProjectCreator/config/naming.mpb index 807f3a0c35f..7258f1aaecb 100644 --- a/bin/MakeProjectCreator/config/naming.mpb +++ b/bin/MakeProjectCreator/config/naming.mpb @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib { +project : iortable, messaging, svc_utils { after += CosNaming libs += TAO_CosNaming + tagchecks += Naming } diff --git a/bin/MakeProjectCreator/config/notification.mpb b/bin/MakeProjectCreator/config/notification.mpb index 402df15a2e4..4a2eaf459a0 100644 --- a/bin/MakeProjectCreator/config/notification.mpb +++ b/bin/MakeProjectCreator/config/notification.mpb @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, event { +project : etcl, dynamicany, portableserver, svc_utils { after += CosNotification libs += TAO_CosNotification + tagchecks += Notify } diff --git a/bin/MakeProjectCreator/config/notifytest.mpb b/bin/MakeProjectCreator/config/notifytest.mpb index 932037d9ebb..30c1dc45c83 100644 --- a/bin/MakeProjectCreator/config/notifytest.mpb +++ b/bin/MakeProjectCreator/config/notifytest.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: orbsvcsexe, notification, notification_skel, naming, svc_utils { +project: orbsvcsexe, notification, naming { after += NotifyTests_Lib libs += TAO_NotifyTests includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib diff --git a/bin/MakeProjectCreator/config/objreftemplate.mpb b/bin/MakeProjectCreator/config/objreftemplate.mpb index e887919b2c7..78215f78863 100644 --- a/bin/MakeProjectCreator/config/objreftemplate.mpb +++ b/bin/MakeProjectCreator/config/objreftemplate.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : portableserver, valuetype { +project : valuetype { after += ObjRefTemplate libs += TAO_ObjRefTemplate } diff --git a/bin/MakeProjectCreator/config/orbsvcslib.mpb b/bin/MakeProjectCreator/config/orbsvcslib.mpb index 0b63b7f61f1..5a7b2faf814 100644 --- a/bin/MakeProjectCreator/config/orbsvcslib.mpb +++ b/bin/MakeProjectCreator/config/orbsvcslib.mpb @@ -3,6 +3,4 @@ project : taolib_with_idl, orbsvcs_output { tagname = TAO_ORBSVCS - includes += $(TAO_ROOT)/orbsvcs - idlflags += -I$(TAO_ROOT)/orbsvcs } diff --git a/bin/MakeProjectCreator/config/portablegroup.mpb b/bin/MakeProjectCreator/config/portablegroup.mpb index 351cbcb67c1..4df490afdad 100644 --- a/bin/MakeProjectCreator/config/portablegroup.mpb +++ b/bin/MakeProjectCreator/config/portablegroup.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : naming, messaging, minimum_corba, iormanip { +project : naming, minimum_corba, iormanip { libs += TAO_PortableGroup after += PortableGroup tagchecks += PortableGroup diff --git a/bin/MakeProjectCreator/config/portableserver.mpb b/bin/MakeProjectCreator/config/portableserver.mpb index 484d7aa83c2..44cfd1d4814 100644 --- a/bin/MakeProjectCreator/config/portableserver.mpb +++ b/bin/MakeProjectCreator/config/portableserver.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib { +project : taolib, objreftemplate, valuetype, iorinterceptor { after += PortableServer libs += TAO_PortableServer } diff --git a/bin/MakeProjectCreator/config/rtcorbacommon.mpb b/bin/MakeProjectCreator/config/rtcorbacommon.mpb index 91125e0fdc8..4612e25c71e 100644 --- a/bin/MakeProjectCreator/config/rtcorbacommon.mpb +++ b/bin/MakeProjectCreator/config/rtcorbacommon.mpb @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project : portableserver, minimum_corba { +project : portableserver { + avoids += minimum_corba after += RTCORBA_Common libs += RTCORBA_Common includes += ../Common diff --git a/bin/MakeProjectCreator/config/rtcosscheduling.mpb b/bin/MakeProjectCreator/config/rtcosscheduling.mpb index 5f8caccf577..bb8aee78d2d 100644 --- a/bin/MakeProjectCreator/config/rtcosscheduling.mpb +++ b/bin/MakeProjectCreator/config/rtcosscheduling.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : rtportableserver, orbsvcslib { +project : rtportableserver { after += RTCosScheduling libs += TAO_RTCosScheduling tagchecks += RTCosScheduling diff --git a/bin/MakeProjectCreator/config/rteventlogadmin.mpb b/bin/MakeProjectCreator/config/rteventlogadmin.mpb index 9f9459ea40d..3e052d455d0 100644 --- a/bin/MakeProjectCreator/config/rteventlogadmin.mpb +++ b/bin/MakeProjectCreator/config/rteventlogadmin.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : dslogadmin_serv, rtoldevent { +project : dslogadmin, rtoldevent { after += RTEventLogAdmin libs += TAO_RTEventLogAdmin } diff --git a/bin/MakeProjectCreator/config/rtnotify.mpb b/bin/MakeProjectCreator/config/rtnotify.mpb index 847b9deaad5..7bd52f4cca7 100644 --- a/bin/MakeProjectCreator/config/rtnotify.mpb +++ b/bin/MakeProjectCreator/config/rtnotify.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : notification_serv, rtcorba { +project : notification, rtcorba { after += RT_Notification libs += TAO_RT_Notification } diff --git a/bin/MakeProjectCreator/config/rtsched.mpb b/bin/MakeProjectCreator/config/rtsched.mpb index bb435139cf7..148d376614d 100644 --- a/bin/MakeProjectCreator/config/rtsched.mpb +++ b/bin/MakeProjectCreator/config/rtsched.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : naming, svc_utils { +project : naming { after += RTSched libs += TAO_RTSched tagchecks += Sched diff --git a/bin/MakeProjectCreator/config/security.mpb b/bin/MakeProjectCreator/config/security.mpb index 41af3660e61..12228e7a0f6 100644 --- a/bin/MakeProjectCreator/config/security.mpb +++ b/bin/MakeProjectCreator/config/security.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib { +project : portableserver { after += Security libs += TAO_Security tagchecks += Security diff --git a/bin/MakeProjectCreator/config/smart_proxies.mpb b/bin/MakeProjectCreator/config/smart_proxies.mpb index 0e69cdfeed8..f99d3d5c6aa 100644 --- a/bin/MakeProjectCreator/config/smart_proxies.mpb +++ b/bin/MakeProjectCreator/config/smart_proxies.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib { +project : taolib_with_idl { after += SmartProxies libs += TAO_SmartProxies idlflags += -Gsp diff --git a/bin/MakeProjectCreator/config/ssliop.mpb b/bin/MakeProjectCreator/config/ssliop.mpb index e73be56e997..91a0e278230 100644 --- a/bin/MakeProjectCreator/config/ssliop.mpb +++ b/bin/MakeProjectCreator/config/ssliop.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: interceptors, security, portableserver, ssl { +project: security, portableserver, ssl { after += SSLIOP libs += TAO_SSLIOP tagchecks += SSLIOP diff --git a/bin/MakeProjectCreator/config/svc_utils.mpb b/bin/MakeProjectCreator/config/svc_utils.mpb index a38a4a962cc..fea86bd16e6 100644 --- a/bin/MakeProjectCreator/config/svc_utils.mpb +++ b/bin/MakeProjectCreator/config/svc_utils.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : portableserver, orbsvcslib { +project : portableserver, taolib_with_idl { after += Svc_Utils libs += TAO_Svc_Utils } diff --git a/bin/MakeProjectCreator/config/taodefaults.mpb b/bin/MakeProjectCreator/config/taodefaults.mpb index 781b2d43d5b..cc3b876c7e6 100644 --- a/bin/MakeProjectCreator/config/taodefaults.mpb +++ b/bin/MakeProjectCreator/config/taodefaults.mpb @@ -5,8 +5,4 @@ project { staticflags += TAO_AS_STATIC_LIBS includes += $(TAO_ROOT) libpaths += $(ACE_ROOT)/lib - - specific(automake) { - includes += $(TAO_BUILDDIR) - } } diff --git a/bin/MakeProjectCreator/config/taolib.mpb b/bin/MakeProjectCreator/config/taolib.mpb index ae9910d4e14..7a0a92a034f 100644 --- a/bin/MakeProjectCreator/config/taolib.mpb +++ b/bin/MakeProjectCreator/config/taolib.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : acelib, taoversion, tao_output, taodefaults, pidl { +project : acelib, taoversion, tao_output, taodefaults { after += TAO libs += TAO } diff --git a/bin/MakeProjectCreator/config/time.mpb b/bin/MakeProjectCreator/config/time.mpb index a7787744a5e..a1270ad37a0 100644 --- a/bin/MakeProjectCreator/config/time.mpb +++ b/bin/MakeProjectCreator/config/time.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, portableserver { +project : naming { after += CosTime libs += TAO_CosTime tagchecks += Time diff --git a/bin/MakeProjectCreator/config/trading.mpb b/bin/MakeProjectCreator/config/trading.mpb index d5cb48b46e4..e12229b3167 100644 --- a/bin/MakeProjectCreator/config/trading.mpb +++ b/bin/MakeProjectCreator/config/trading.mpb @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib { +project : dynamicany, portableserver { after += CosTrading libs += TAO_CosTrading + tagchecks += Trader } diff --git a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm index df10ae17ab1..6d14f0661e0 100644 --- a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm @@ -39,7 +39,7 @@ sub fill_value { if (defined $names{$name}) { my(%dirnames) = (); foreach my $file ($self->get_component_list($names{$name}, 1)) { - my($dirname) = $self->mpc_dirname($file); + my($dirname) = dirname($file); if ($dirname eq '') { $dirname = '.'; } @@ -52,41 +52,6 @@ sub fill_value { ## Sort the directories to ensure that '.' comes first $value = join(';', sort keys %dirnames); } - elsif ($name eq 'relwd') { - my($expenv) = $self->get_expand_env(); - my($rel) = ($expenv ? \%ENV : $self->get_relative()); - $value = $self->getcwd(); - - foreach my $key (keys %$rel) { - ## Do not use PWD or CD if we are expanding environment variables. - ## They could conflict with the "real" values we're looking for. - if ($expenv && ($key eq 'PWD' || $key eq 'CD')) { - next; - } - - ## Get the relative replacement value and convert back-slashes - my($val) = $$rel{$key}; - $val =~ s/\\/\//g; - - ## We only need to check for reverse replacement if the length - ## of the string is less than or equal to the length of our - ## replacement value or the string has a slash at the position - ## of the length of the replacement value - my($vlen) = length($val); - if (length($value) <= $vlen || substr($value, $vlen, 1) eq '/') { - ## Cut the string down by the length of the replacement value - my($lval) = substr($value, 0, $vlen); - - ## Here we make an assumption that we - ## have a case-insensitive file system. - if (lc($lval) eq lc($val)) { - substr($value, 0, length($val) + 1) = ''; - last; - } - } - } - $value = $self->slash_to_backslash($value); - } return $value; } diff --git a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm index 851239663ea..2a593b21681 100644 --- a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm @@ -25,7 +25,12 @@ use vars qw(@ISA); sub workspace_file_name { my($self) = shift; - return $self->get_modified_workspace_name('Makefile', '.bor'); + if ($self->make_coexistence()) { + return $self->get_modified_workspace_name('Makefile', '.bor'); + } + else { + return $self->get_modified_workspace_name('Makefile', ''); + } } @@ -63,7 +68,7 @@ sub write_project_targets { my($crlf) = $self->crlf(); foreach my $project (@$list) { - my($dir) = $self->mpc_dirname($project); + my($dir) = dirname($project); my($chdir) = 0; my($back) = ''; diff --git a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm index 456c6512139..e44dc9ef6f8 100644 --- a/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm @@ -75,7 +75,7 @@ sub fill_value { my($comps) = $$names{$name}; foreach my $key (keys %$comps) { foreach my $item (@{$$comps{$key}}) { - my($dname) = $self->relative($self->mpc_dirname($item)); + my($dname) = $self->relative(dirname($item)); if ($dname ne '.' && $dname !~ /^\.\.\//) { $vpath{$dname} = 1; } diff --git a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm index a2c19cf6d14..d7f0c7b4b1a 100644 --- a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm @@ -154,7 +154,7 @@ sub write_comps { print $fh $crlf, "\t\$(KEEP_GOING)\@"; if (defined $dirprj{$project}) { - print $fh "cd ", $self->mpc_dirname($project), + print $fh "cd ", dirname($project), " && \$(MAKE) -f ", basename($project), $crlf; } else { @@ -162,13 +162,10 @@ sub write_comps { } } print $fh $crlf, - 'REMAINING_TARGETS := ', - '$(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)', - $crlf; + "REMAINING_TARGETS := \$(subst all, , \$(TARGETS_NESTED:.nested=))$crlf", } else { - print $fh 'REMAINING_TARGETS := $(TARGETS_NESTED:.nested=) ', - '$(CUSTOM_TARGETS)', $crlf; + print $fh "REMAINING_TARGETS := \$(TARGETS_NESTED:.nested=)$crlf", } ## Print out the remaing targets. @@ -177,7 +174,7 @@ sub write_comps { foreach my $project (@lprj) { print $fh "\t\$(KEEP_GOING)\@"; if (defined $dirprj{$project}) { - print $fh "cd ", $self->mpc_dirname($project), + print $fh "cd ", dirname($project), " && \$(MAKE) -f ", basename($project), " \$(\@)", $crlf; } else { diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd index 4e1c101e100..10563c42392 100644 --- a/bin/MakeProjectCreator/templates/bor.mpd +++ b/bin/MakeProjectCreator/templates/bor.mpd @@ -143,10 +143,6 @@ realclean: customclean_<%custom_type%>_<%forcount(custom_type->input_files)%> # # Override defaults in outputdir.bor # -<%if(INSTALL_THIS_TARGET)%> -INSTALL_THIS_TARGET = 1 - -<%endif%> <%marker(macros)%> STATIC_DIR=. DEBUG_DIR=. @@ -177,10 +173,10 @@ BINDIR = <%libout%> !include <$(ACE_ROOT)\include\makeinclude\build_library.bor> <%endif%> -<%if(header_files || template_files || inline_files || idl_files || pidl_files)%> +<%if(header_files || template_files || inline_files || idl_files)%> includes_install: $(INCLUDES) -<%foreach(header_files template_files inline_files idl_files pidl_files)%> +<%foreach(header_files template_files inline_files idl_files)%> -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%dirname(header_file)%> mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%dirname(header_file)%> -© /Y <%header_file%> $(INSTALL_DIR)\include\$(INCDIR_NAME)\<%header_file%> 1> NUL <%endfor%> diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index d127c32620b..e024ed2824d 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -133,7 +133,7 @@ else ifeq ($(findstring k, $(MAKEFLAGS)),k) LIBCHECK = 1 else - LIBCHECK ?= $(filter-out $(foreach lib,<%libs%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%libs%>) + LIBCHECK ?= $(filter-out $(foreach lib,<%libs%>,$(findstring $(lib),$(foreach libpath,<%libpaths%> $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),<%libs%>) ifeq ($(LIBCHECK),) LIBCHECK = 1 endif @@ -257,7 +257,7 @@ ifeq ($(<%require%>),1) ifneq ($(<%avoid%>),1) <%endfor%> ifeq ($(LIBCHECK), 1) -BIN = $(BIN_UNCHECKED)$(EXEEXT) +BIN = $(BIN_UNCHECKED) else all: lib_warning endif @@ -290,8 +290,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU <%if(install && exename)%> ifneq ($(OUTPUT_DIRECTORY),.) - INSTALL = $(VBIN:%=$(INSBIN)/%) - CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%) + INSTALL = $(VBIN:%=$(INSBIN)/%$(EXEEXT)) + CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(EXEEXT)) endif <%endif%> diff --git a/bin/PerlACE/Run_Test.pm b/bin/PerlACE/Run_Test.pm index e40d0c15721..50a41484e3d 100644 --- a/bin/PerlACE/Run_Test.pm +++ b/bin/PerlACE/Run_Test.pm @@ -101,31 +101,6 @@ sub check_n_cleanup_files } } -sub generate_test_file -{ - my $file = shift; - my $size = shift; - - while ( -e $file ) { - $file = $file."X"; - } - - my $data = "abcdefghijklmnopqrstuvwxyz"; - $data = $data.uc($data)."0123456789"; - - open( INPUT, "> $file" ) || die( "can't create input file: $file" ); - for($i=62; $i < $size ; $i += 62 ) { - print INPUT $data; - } - $i -= 62; - if ($i < $size) { - print INPUT substr($data, 0, $size-$i); - } - close(INPUT); - - return $file; -} - $sleeptime = 5; 1; diff --git a/bin/auto_run_tests.pl b/bin/auto_run_tests.pl index af7edf90721..a65843ab892 100755 --- a/bin/auto_run_tests.pl +++ b/bin/auto_run_tests.pl @@ -32,15 +32,7 @@ if (!getopts ('ados:t') || $opt_h) { print " -t TAO tests (other than ORB tests) only\n"; print " -Config cfg Run the tests for the <cfg> configuration\n"; print "\n"; - $ace_config_list = new PerlACE::ConfigList; - $ace_config_list->load ($ACE_ROOT."/bin/ace_tests.lst"); - print "ACE Test Configs: " . $ace_config_list->list_configs () . "\n"; - $orb_config_list = new PerlACE::ConfigList; - $orb_config_list->load ($ACE_ROOT."/bin/tao_orb_tests.lst"); - print "ORB Test Configs: " . $orb_config_list->list_configs () . "\n"; - $tao_config_list = new PerlACE::ConfigList; - $tao_config_list->load ($ACE_ROOT."/bin/tao_other_tests.lst"); - print "TAO Test Configs: " . $tao_config_list->list_configs () . "\n"; + print "Configs: " . $config_list->list_configs () . "\n"; exit (1); } @@ -66,82 +58,73 @@ push (@file_list, "/bin/tao_other_tests.lst"); foreach my$test_lst (@file_list) { - my $config_list = new PerlACE::ConfigList; - $config_list->load ($ACE_ROOT.$test_lst); +my $config_list = new PerlACE::ConfigList; +$config_list->load ($ACE_ROOT.$test_lst); - # Insures that we search for stuff in the current directory. - $PATH .= $Config::Config{path_sep} . '.'; +# Insures that we search for stuff in the current directory. +$PATH .= $Config::Config{path_sep} . '.'; - foreach $test ($config_list->valid_entries ()) { - my $directory = "."; - my $program = "."; +foreach $test ($config_list->valid_entries ()) { + my $directory = "."; + my $program = "."; - if ($test =~ /(.*)\/([^\/]*)$/) { - $directory = $1; - $program = $2; - } - else { - $program = $test; - } - - # this is to ensure that we dont print out the time for tests/run_test.pl - # that test prints out the times for each of the ace tests individually - my $is_ace_test = ($directory eq "tests"); + if ($test =~ /(.*)\/([^\/]*)$/) { + $directory = $1; + $program = $2; + } + else { + $program = $test; + } - if (! $is_ace_test) { - print "auto_run_tests: $test\n"; - } + print "auto_run_tests: $test\n"; - chdir ($ACE_ROOT."/$directory") - || die "Error: Cannot chdir to $ACE_ROOT/$directory"; + chdir ($ACE_ROOT."/$directory") + || die "Error: Cannot chdir to $ACE_ROOT/$directory"; - if ($program =~ /(.*?) (.*)/) { - if (! -e $1) { - print STDERR "Error: $directory.$1 does not exist\n"; - next; - } + if ($program =~ /(.*?) (.*)/) + { + if (! -e $1) + { + print STDERR "Error: $directory.$1 does not exist\n"; + next; } - else { - if (! -e $program) { - print STDERR "Error: $directory.$program does not exist\n"; - next; - } + } + else + { + if (! -e $program) + { + print STDERR "Error: $directory.$program does not exist\n"; + next; } + } + + ### Genrate the -ExeSubDir and -Config options + my $inherited_options = " -ExeSubDir $PerlACE::Process::ExeSubDir "; - ### Genrate the -ExeSubDir and -Config options - my $inherited_options = " -ExeSubDir $PerlACE::Process::ExeSubDir "; - - foreach my $config ($config_list->my_config_list ()) { - $inherited_options .= " -Config $config "; - } - - $cmd = ''; - if ($opt_s) { - $cmd = "$opt_s \"perl $program $inherited_options\""; - } - else { - $cmd = $program.$inherited_options; - } - - - my $result = 0; - - if (defined $opt_d) { - print "Running: $cmd\n"; - } - else { - $start_time = time(); - $result = system ($cmd); - $time = time() - $start_time; - - # see note about tests/run_test.pl printing reports for ace tests individually - if (! $is_ace_test) { - if ($result > 0) { - print "Error: $test returned with status $result\n"; - } - - print "\nauto_run_tests_finished: $test Time:$time"."s Result:$result\n"; - } - } + foreach my $config ($config_list->my_config_list ()) { + $inherited_options .= " -Config $config "; } + + $cmd = ''; + if ($opt_s) { + $cmd = "$opt_s \"perl $program $inherited_options\""; + } + else { + $cmd = $program.$inherited_options; + } + + + my $result = 0; + + if (defined $opt_d) { + print "Running: $cmd\n"; + } + else { + $result = system ($cmd); + } + + if ($result > 0) { + print "Error: $test returned with status $result\n"; + } +} } diff --git a/bin/footprint_stats.sh b/bin/footprint_stats.sh index 74b4d003d8f..d8f1184b9b8 100755 --- a/bin/footprint_stats.sh +++ b/bin/footprint_stats.sh @@ -17,24 +17,24 @@ BINS="TAO/tests/ORB_init/ORB_init TAO/tests/ORB_destroy/ORB_destroy" LIBS="ace/libACE.a \ TAO/tao/libTAO.a \ - TAO/tao/libTAO_PortableServer.a \ - TAO/tao/libTAO_Strategies.a \ - TAO/tao/libTAO_SmartProxies.a \ - TAO/tao/libTAO_DynamicAny.a \ - TAO/tao/libTAO_DynamicInterface.a \ - TAO/tao/libTAO_IFR_Client.a \ - TAO/tao/libTAO_BiDirGIOP.a \ - TAO/tao/libTAO_Domain.a \ - TAO/tao/libTAO_IORManip.a \ - TAO/tao/libTAO_IORTable.a \ - TAO/tao/libTAO_TypeCodeFactory.a \ - TAO/tao/libTAO_RTCORBA.a \ - TAO/tao/libTAO_IORInterceptor.a \ - TAO/tao/libTAO_Messaging.a \ - TAO/tao/libTAO_ObjRefTemplate.a \ - TAO/tao/libTAO_Valuetype.a \ - TAO/tao/libTAO_RTScheduler.a \ - TAO/tao/libTAO_RTPortableServer.a" + TAO/tao/PortableServer/libTAO_PortableServer.a \ + TAO/tao/Strategies/libTAO_Strategies.a \ + TAO/tao/SmartProxies/libTAO_SmartProxies.a \ + TAO/tao/DynamicAny/libTAO_DynamicAny.a \ + TAO/tao/DynamicInterface/libTAO_DynamicInterface.a \ + TAO/tao/IFR_Client/libTAO_IFR_Client.a \ + TAO/tao/BiDir_GIOP/libTAO_BiDirGIOP.a \ + TAO/tao/Domain/libTAO_Domain.a \ + TAO/tao/IORManipulation/libTAO_IORManip.a \ + TAO/tao/IORTable/libTAO_IORTable.a \ + TAO/tao/TypeCodeFactory/libTAO_TypeCodeFactory.a \ + TAO/tao/RTCORBA/libTAO_RTCORBA.a \ + TAO/tao/IORInterceptor/libTAO_IORInterceptor.a \ + TAO/tao/Messaging/libTAO_Messaging.a \ + TAO/tao/ObjRefTemplate/libTAO_ObjRefTemplate.a \ + TAO/tao/Valuetype/libTAO_Valuetype.a \ + TAO/tao/RTScheduling/libTAO_RTScheduler.a \ + TAO/tao/RTPortableServer/libTAO_RTPortableServer.a" cd $ACE_ROOT diff --git a/bin/fuzz.pl b/bin/fuzz.pl index 31969e73652..920a952482c 100755 --- a/bin/fuzz.pl +++ b/bin/fuzz.pl @@ -1290,7 +1290,11 @@ print "--------------------Configuration: Fuzz - Level ",$opt_l, "--------------------\n"; check_for_noncvs_files () if ($opt_l >= 1); -check_for_streams_include () if ($opt_l >= 6); +# Commenting out the following checks for short while before BFO. We +# don't want to have noise that we cannot fix for the time being. +check_for_synch_include () if ($opt_l >= 1); +check_for_OS_h_include () if ($opt_l >= 1); +check_for_streams_include () if ($opt_l >= 1); check_for_dependency_file () if ($opt_l >= 1); check_for_makefile_variable () if ($opt_l >= 1); check_for_inline_in_cpp () if ($opt_l >= 2); @@ -1298,8 +1302,6 @@ check_for_id_string () if ($opt_l >= 1); check_for_newline () if ($opt_l >= 1); check_for_inline () if ($opt_l >= 2); check_for_math_include () if ($opt_l >= 3); -check_for_synch_include () if ($opt_l >= 6); -check_for_OS_h_include () if ($opt_l >= 6); check_for_line_length () if ($opt_l >= 8); check_for_preprocessor_comments () if ($opt_l >= 7); check_for_tchar () if ($opt_l >= 4); diff --git a/bin/make_release b/bin/make_release index 8ac8d9b01c3..4432d9d2bf9 100755 --- a/bin/make_release +++ b/bin/make_release @@ -777,14 +777,14 @@ sub generate_makefiles () { # # Need todo a common chmod on the file lists! my $here = Cwd::getcwd(); - + my $exclude_option = '-exclude TAO/TAOACE.mwc,TAO/CIAO/CIAOTAO.mwc'; - my $tmp_mpc_option = - '-recurse -hierarchy -relative ACE_ROOT='; + my $tmp_mpc_option = + '-recurse -hierarchy -relative ACE_ROOT='; my $mpc_option = $tmp_mpc_option.$here.'/ACE_wrappers'; - - my $tmp_static_option = + + my $tmp_static_option = '-static -name_modifier *_Static -apply_project -exclude TAO/CIAO,TAO/TAOACE.mwc '; my $static_option = $tmp_static_option.$mpc_option; @@ -810,7 +810,6 @@ sub generate_makefiles () { "// \$Id\$\n" . "// This is an automatically generated file.\n\n" . "ssl=0\n" . - "qos=1\n" . "cidl=0\n" . "rwho=0\n" . "sctp=0\n"; diff --git a/bin/mpc.pl b/bin/mpc.pl index 56dd7152891..3ce48b22888 100755 --- a/bin/mpc.pl +++ b/bin/mpc.pl @@ -14,7 +14,6 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' use strict; use Cwd; -use Config; use File::Basename; if ( $^O eq 'VMS' ) { @@ -22,7 +21,7 @@ if ( $^O eq 'VMS' ) { import VMS::Filespec qw(unixpath); } -my($basePath) = getExecutePath($0) . '/MakeProjectCreator'; +my($basePath) = getExecutePath($0) . 'MakeProjectCreator'; unshift(@INC, $basePath . '/modules'); my($mpcroot) = $ENV{MPC_ROOT}; @@ -61,23 +60,31 @@ my(@creators) = ('GNUACEProjectCreator', # Subroutine Section # ************************************************************ -sub getBasePath { - return $mpcpath; -} - - sub which { - my($prog) = shift; - my($exec) = $prog; - - if (defined $ENV{'PATH'}) { - my($part) = ''; - my($envSep) = $Config{'path_sep'}; - foreach $part (split(/$envSep/, $ENV{'PATH'})) { - $part .= "/$prog"; - if ( -x $part ) { - $exec = $part; - last; + my($prog) = shift; + my($exec) = $prog; + my($part) = ''; + if ( $^O eq 'VMS' ) { + my($envSep) = ';'; + if (defined $ENV{'PATH'}) { + foreach $part (split(/$envSep/, $ENV{'PATH'})) { + $part .= "$prog"; + if ( -x $part ) { + $exec = $part; + last; + } + } + } + } + else { + my($envSep) = ($^O eq 'MSWin32' ? ';' : ':'); + if (defined $ENV{'PATH'}) { + foreach $part (split(/$envSep/, $ENV{'PATH'})) { + $part .= "/$prog"; + if ( -x $part ) { + $exec = $part; + last; + } } } } @@ -90,33 +97,51 @@ sub getExecutePath { my($prog) = shift; my($loc) = ''; - if ($prog ne basename($prog)) { - my($dir) = ($^O eq 'VMS' ? unixpath(dirname($prog)) : dirname($prog)); - if ($prog =~ /^[\/\\]/ || - $prog =~ /^[A-Za-z]:[\/\\]?/) { - $loc = $dir; + if ( $^O eq 'VMS' ) { + if ($prog ne basename($prog)) { + my($dir) = unixpath( dirname($prog) ); + if ($prog =~ /^[\/\\]/) { + $loc = $dir; + } + else { + $loc = unixpath(getcwd()) . $dir; + } } else { - $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()) . '/' . $dir; + $loc = unixpath( dirname(which($prog)) ); } - } - else { - $loc = dirname(which($prog)); - if ($^O eq 'VMS') { - $loc = unixpath($loc); + + if ($loc eq '.') { + $loc = unixpath( getcwd() ); } - } + } else { + if ($prog ne basename($prog)) { + if ($prog =~ /^[\/\\]/ || + $prog =~ /^[A-Za-z]:[\/\\]?/) { + $loc = dirname($prog); + } + else { + $loc = getcwd() . '/' . dirname($prog); + } + } + else { + $loc = dirname(which($prog)); + } + + $loc =~ s/\/\.$//; - $loc =~ s/\/\.$//; + if ($loc eq '.') { + $loc = getcwd(); + } - if ($loc eq '.') { - $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()); + if ($loc ne '') { + $loc .= '/'; + } } return $loc; } - # ************************************************************ # Main Section # ************************************************************ diff --git a/bin/msvc_mpc_auto_compile.pl b/bin/msvc_mpc_auto_compile.pl index f2daff0bd8f..d6f70671339 100755 --- a/bin/msvc_mpc_auto_compile.pl +++ b/bin/msvc_mpc_auto_compile.pl @@ -30,7 +30,7 @@ else { "$ACE_ROOT\\TAO\\TAO_IDL", "$ACE_ROOT\\TAO\\tests"); -@ciao_core_dirs = ("$ACE_ROOT\\TAO\\orbsvcs\\orbsvcs", # CIAO dependancy +@ciao_core_dirs = ("$ACE_ROOT\\TAO\\orbsvcs\\orbsvcs", # CIAO dependancy "$ACE_ROOT\\TAO\\CIAO"); $debug = 0; @@ -47,34 +47,16 @@ $vc7 = 0; # Build_Config takes in a string of the type "project--configuration" and # runs msdev to build it. -# sub Build_Config ($) -#{ -# my ($arg) = @_; -# my ($project, $config) = split /--/, $arg; -# -# return Build ($project, $config); -#} - -# Build -sub Build ($$) +sub Build_Config ($) { - my ($project, $config) = @_; - - if ($debug == 1) { - print "$project\n"; - return 0; - } - else { - print "Auto_compiling $project : $config\n"; - - print "Building $project $config\n" if $verbose; + my ($arg) = @_; + my ($project, $config) = split /--/, $arg; - return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv"); - } + return Build ($project, $config); } # Build -sub Build_VC7 ($$) +sub Build ($$) { my ($project, $config) = @_; @@ -87,7 +69,7 @@ sub Build_VC7 ($$) print "Building $project $config\n" if $verbose; - return system ("devenv.com $project $Build_Cmd $config $useenv"); + return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv"); } } @@ -95,34 +77,19 @@ sub Find_Dsw (@) { my (@dir) = @_; @array = (); + my @config_array = (); - sub wanted_dsw { - $array[++$#array] = + sub wanted { + $array[++$#array] = $File::Find::name if ($File::Find::name =~ /\.dsw$/i); } - - find (\&wanted_dsw, @dir); - + + find (\&wanted, @dir); + print "List of dsw's \n" if ($verbose == 1); return @array; } -sub Find_Sln (@) -{ - my (@dir) = @_; - @array = (); - - sub wanted_sln { - $array[++$#array] = - $File::Find::name if ($File::Find::name =~ /\.sln$/i); - } - - find (\&wanted_sln, @dir); - - print "List of sln's \n" if ($verbose == 1); - return @array; -} - # Only builds the core libraries. sub Build_Custom () { @@ -135,7 +102,7 @@ sub Build_Custom () print "\n" if ($verbose); my @custom_list = Find_Dsw (@directories); - + print "List now is @custom_list \n"; foreach $c (@custom_list) { print "List now is $c \n"; @@ -156,10 +123,10 @@ sub Build_All () push @directories, @ace_core_dirs; push @directories, @tao_core_dirs; push @directories, @ciao_core_dirs; - + print STDERR "First pass (libraries)\n" if ($print_status == 1); print "\nmsvc_auto_compile: First Pass CORE (libraries)\n"; - + Build_Custom (); my @new_directory_search = "$ACE_ROOT"; @@ -183,65 +150,6 @@ sub Build_All () } -# Only builds the core libraries. -sub Build_Custom_VC7 () -{ - print STDERR "Building Custom\n"; - print "Building Custom directories specified\n";# if ($verbose == 1); - - print "Build " if ($verbose); - print "Debug " if ($verbose) && ($Build_Debug); - print "Release " if ($verbose) && ($Build_Release); - print "\n" if ($verbose); - - my @custom_list = Find_Sln (@directories); - - print "List now is @custom_list \n"; - foreach $c (@custom_list) { - print "List now is $c \n"; - if ($Build_Debug) { - $Status = Build_VC7 ($c, "debug"); - return if $Status != 0 && !$Ignore_errors; - } - if ($Build_Release) { - $Status = Build_VC7 ($c, "release"); - return if $Status != 0 && !$Ignore_errors; - } - } -} - -# Build all examples and directories -sub Build_All_VC7 () -{ - push @directories, @ace_core_dirs; - push @directories, @tao_core_dirs; - push @directories, @ciao_core_dirs; - - print STDERR "First pass (libraries)\n" if ($print_status == 1); - print "\nmsvc_auto_compile: First Pass CORE (libraries)\n"; - - Build_Custom_VC7 (); - - my @new_directory_search = "$ACE_ROOT"; - - my @configurations = Find_Sln (@new_directory_search); - - print STDERR "Second pass (for other things)\n" if ($print_status == 1); - print "\nmsvc_mpc_auto_compile: Second Pass (rest of the stuff)\n"; - - foreach $c (@configurations) { - print "\nUsing $c for compilation\n"; - if ($Build_Debug) { - $Status = Build_VC7 ($c, "debug"); - return if $Status != 0 && !$Ignore_errors; - } - if ($Build_Release) { - $Status = Build_VC7 ($c, "release"); - return if $Status != 0 && !$Ignore_errors; - } - } -} - ## Parse command line argument while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) { @@ -252,14 +160,6 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) elsif ($ARGV[0] =~ /^-d$/i) { # debug $debug = 1; } - elsif ($ARGV[0] =~ '-vc7') { # Use VC7 project and solution files. - print "Using VC7 files\n" if ( $verbose ); - $vc7 = 1; - } - elsif ($ARGV[0] =~ '-vc8') { # Use VC8 project and solution files. - print "Using VC8 files\n" if ( $verbose ); - $vc7 = 1; # vc8 is like vc7 - } elsif ($ARGV[0] =~ '-v') { # verbose mode $verbose = 1; } @@ -278,22 +178,22 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) elsif ($ARGV[0] =~ '-TAO') {# Build TAO and its tests print "Building TAO\n" if ( $verbose ); $use_custom_dir = 1; - push @directories, @ace_core_dirs; + push @directories, @ace_core_dirs; push @directories, @tao_core_dirs; } elsif ($ARGV[0] =~ '-CIAO') {# Build the CIAO and related - # libraries + # libraries print "Building only CIAO\n" if ( $verbose ); $use_custom_dir = 1; - push @directories, @ace_core_dirs; + push @directories, @ace_core_dirs; push @directories, @tao_core_dirs; push @directories, @ciao_core_dirs; - } + } elsif ($ARGV[0] =~ '-ALL') {# Build the CIAO and related - # libraries + # libraries print "Building ALL \n" if ( $verbose ); $build_all = 1; - } + } elsif ($ARGV[0] =~ '-dir') { # Compile only a specific directory shift; print "Adding directory $ARGV[0]\n" if ( $verbose ); @@ -316,6 +216,10 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) print "Building Release Version\n" if ( $verbose ); $Build_Release = 1; } + elsif ($ARGV[0] =~ '-vc7') { # Use VC7 project and solution files. + print "Using VC7 files\n" if ( $verbose ); + $vc7 = 1; + } elsif ($ARGV[0] =~ '-(\?|h)') { # Help information print "Options\n"; print "-d = Debug (only print out projects)\n"; @@ -323,8 +227,6 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) print "-v = Script verbose Mode\n"; print "-s = Print status messages to STDERR\n"; print "-u = Tell MSVC to use the environment\n"; - print "-vc7 = Use MSVC 7 toolset\n"; - print "-vc8 = Use MSVC 8 toolset\n"; print "\n"; print "-CORE = Build ACE+TAO+CIAO core \n"; print "-ACE = Build ACE and its tests\n"; @@ -350,13 +252,7 @@ if (!$Build_Debug && !$Build_Release) { } print "MPC version of msvc_mpc_auto_compile: Begin\n"; -if ($vc7) { - Build_All_VC7 if ($build_all && !$use_custom_dir); - Build_Custom_VC7 if $use_custom_dir; -} -else { - Build_All if ($build_all && !$use_custom_dir); - Build_Custom if $use_custom_dir; -} +Build_All if ($build_all && !$use_custom_dir); +Build_Custom if $use_custom_dir; print "msvc_mpc_auto_compile: End\n"; print STDERR "End\n" if ($print_status == 1); diff --git a/bin/msvc_static_compile.pl b/bin/msvc_static_compile.pl index 38531cb0563..e9c5d545269 100755 --- a/bin/msvc_static_compile.pl +++ b/bin/msvc_static_compile.pl @@ -42,31 +42,72 @@ $build_core_only = 0; $Build_Cmd = "/BUILD"; $use_custom_dir = 0; $useenv = ''; -$vc7 = 0; -$name_mod = ''; -$mod_name = 0; -$proj_ext = '.dsp'; -# Build -sub Build ($$) +# Find_dsp will search a directory for *.dsp files and return a list +# of strings that include the project name and the configuration +sub Find_dsp (@) { - my ($project, $config) = @_; + my (@dir) = @_; + @array = (); + my @config_array = (); - if ($debug == 1) { - print "$project\n"; - return 0; - } - else { - print "Auto_compiling $project : $config\n"; + # wanted is only used for the File::Find + sub wanted + { + $array[++$#array] = $File::Find::name if ($File::Find::name =~ /\.dsp$/i); + } - print "Building $project $config\n" if $verbose; + # get_config grabs the configurations out of a dsp file. + sub get_config ($) + { + my ($file) = @_; + my @configs = (); - return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv"); - } + print "Looking at $file\n" if ($verbose); + + open (DSP, "< $file") || die $!; + + while (<DSP>) + { + push @configs, $1 if (/# Name \"([^\"]+)\"/); + } + + close (DSP); + return @configs; + } + + unshift @dir, (\&wanted); + + find @dir; + + for ($i = 0; $i <= $#array; ++$i) { + my $filename = "$array[$i]"; + + $filename =~ s@/./@/@g; + $filename =~ s@/@\\@g; + my @dsp_configs = get_config ($array[$i]); + + for ($j = 0; $j <= $#dsp_configs; ++$j) { + push @config_array, "$filename--$dsp_configs[$j]"; + } + } + + return @config_array; +} + + +# Build_Config takes in a string of the type "project--configuration" and +# runs msdev to build it. +sub Build_Config ($) +{ + my ($arg) = @_; + my ($project, $config) = split /--/, $arg; + + return Build ($project, $config); } # Build -sub Build_VC7 ($$) +sub Build ($$) { my ($project, $config) = @_; @@ -79,47 +120,15 @@ sub Build_VC7 ($$) print "Building $project $config\n" if $verbose; - return system ("devenv.com $project $Build_Cmd $config $useenv"); + return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv"); } } -sub Find_Dsw (@) -{ - my (@dir) = @_; - @array = (); - - sub wanted_dsw { - $array[++$#array] = - $File::Find::name if ($File::Find::name =~ /\.dsw$/i); - } - - find (\&wanted_dsw, @dir); - - print "List of dsw's \n" if ($verbose == 1); - return @array; -} - -sub Find_Sln (@) -{ - my (@dir) = @_; - @array = (); - - sub wanted_sln { - $array[++$#array] = - $File::Find::name if ($File::Find::name =~ /\.sln$/i); - } - - find (\&wanted_sln, @dir); - - print "List of sln's \n" if ($verbose == 1); - return @array; -} - # Only builds the core libraries. sub Build_Core () { print STDERR "Building Core of ACE/TAO\n" if ($print_status == 1); - print "\nmsvc_static_compile: Building Core of ACE/TAO\n"; + print "Building Core of ACE/TAO\n" if ($verbose == 1); print "Build \n" if ($verbose); print "Debug " if ($verbose) && ($Build_Debug); @@ -137,87 +146,53 @@ sub Build_Core () $config_list->load ($ACE_ROOT.$test_lst); foreach $test ($config_list->valid_entries ()) { - if ($mod_name) { - @plist = split(/\//, $test); - $fname = pop @plist; - $fname_mod = $name_mod; - $fname_mod =~ s/\*/$fname/; - push @plist,($fname_mod); - push (@core_list, join('/', @plist) . $proj_ext); - } - else { - push (@core_list, $test . $proj_ext); + push (@core_list, $test); } - } - } - - - if ( $vc7 ) { - foreach $c (@core_list) { - if ($Build_Debug) { - $Status = Build_VC7 ($c, "debug"); - return if $Status != 0 && !$Ignore_errors; - } - if ($Build_Release) { - $Status = Build_VC7 ($c, "release"); - return if $Status != 0 && !$Ignore_errors; - } + } + + + foreach $c (@core_list) { + if ($Build_Debug) { + $Status = Build ($c, "ALL - Win32 Debug"); + return if $Status != 0 && !$Ignore_errors; } - } - else { - foreach $c (@core_list) { - if ($Build_Debug) { - $Status = Build ($c, "ALL - Win32 Debug"); - return if $Status != 0 && !$Ignore_errors; - } - if ($Build_Release) { - $Status = Build ($c, "ALL - Win32 Release"); - return if $Status != 0 && !$Ignore_errors; - } + if ($Build_Release) { + $Status = Build ($c, "ALL - Win32 Release"); + return if $Status != 0 && !$Ignore_errors; } - } + } } } sub Build_All () { - my @configurations = Find_Dsw (@directories); + my @configurations = Find_dsp (@directories); - print STDERR "Building selected projects\n" if ($print_status == 1); - print "\nmsvc_static_compile: Building selected projects\n"; + print STDERR "First pass (libraries)\n" if ($print_status == 1); + print "\nmsvc_auto_compile: First Pass (libraries)\n"; - $count = 0; foreach $c (@configurations) { - print STDERR "Configuration ".$count++." of ".$#configurations."\n" if ($print_status == 1); - if ($Build_Debug) { - $Status = Build ($c, "ALL - Win32 Debug"); - return if $Status != 0 && !$Ignore_errors; - } - if ($Build_Release) { - $Status = Build ($c, "ALL - Win32 Release"); - return if $Status != 0 && !$Ignore_errors; + if ($Build_All + || ($Build_LIB && $Build_Debug && $c =~ /Win32 Debug/) + || ($Build_LIB && $Build_Release && $c =~ /Win32 Release/)) + { + my $Status = 0; + $Status = Build_Config ($c) + if (($c =~ /Library/) || ($c =~ / DLL /) || ($c =~ / LIB /)); + return if ($Status != 0 && !$Ignore_errors); } } -} -sub Build_All_VC7 () -{ - my @configurations = Find_Sln (@directories); - print STDERR "Building selected projects\n" if ($print_status == 1); - print "\nmsvc_static_compile: Building selected projects\n"; + print STDERR "Second pass \n" if ($print_status == 1); + print "\nmsvc_auto_compile: Second Pass\n"; $count = 0; foreach $c (@configurations) { print STDERR "Configuration ".$count++." of ".$#configurations."\n" if ($print_status == 1); - if ($Build_Debug) { - $Status = Build_VC7 ($c, "debug"); - return if $Status != 0 && !$Ignore_errors; - } - if ($Build_Release) { - $Status = Build_VC7 ($c, "release"); - return if $Status != 0 && !$Ignore_errors; - } + Build_Config ($c) + if (($Build_LIB && $Build_Debug && $c =~ /Win32 Debug/) + || ($Build_LIB && $Build_Release && $c =~ /Win32 Release/)); } } @@ -232,25 +207,9 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) elsif ($ARGV[0] =~ /^-d$/i) { # debug $debug = 1; } - elsif ($ARGV[0] =~ '-vc7') { # Use VC7 project and solution files. - print "Using VC7 files\n" if ( $verbose ); - $vc7 = 1; - $proj_ext = '.vcproj'; - } - elsif ($ARGV[0] =~ '-vc8') { # Use VC8 project and solution files. - print "Using VC8 files\n" if ( $verbose ); - $vc7 = 1; # VC8 is like VC7 - $proj_ext = '.vcproj'; - } elsif ($ARGV[0] =~ '-v') { # verbose mode $verbose = 1; } - elsif ($ARGV[0] =~ '-name_modifier') { # use MPC name_modifier for project - shift; - print "Setting name_modifier $ARGV[0]\n" if ( $verbose ); - $name_mod = $ARGV[0]; - $mod_name = 1; - } elsif ($ARGV[0] =~ '-s') { # status messages $print_status = 1; } @@ -270,7 +229,7 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) elsif ($ARGV[0] =~ '-TAO') { # Build TAO and its programs print "Building TAO\n" if ( $verbose ); $use_custom_dir = 1; - # Other tests depend on the lib in this dir so we need to force it + # Other tests depend on the lib in this dir so we need to force it # to the front of the build list. This is pretty ugly. push @directories, ("$ACE_ROOT\\TAO\\orbsvcs\\tests\\Notify\\lib"); push @directories, ("$ACE_ROOT\\TAO"); @@ -311,9 +270,6 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) print "-v = Script verbose Mode\n"; print "-s = Print status messages to STDERR\n"; print "-u = Tell MSVC to use the environment\n"; - print "-vc7 = Use MSVC 7 toolset\n"; - print "-vc8 = Use MSVC 8 toolset\n"; - print "-name_modifier <mod> = Use MPC name_modifier to match projects\n"; print "\n"; print "-CORE = Build the Core libraries\n"; print "-ACE = Build ACE and its programs\n"; @@ -348,16 +304,11 @@ if ($#directories < 0) { @directories = ($ACE_ROOT); } -print "msvc_static_compile: Begin\n"; +print "msvc_auto_compile: Begin\n"; print STDERR "Beginning Core Build\n" if ($print_status == 1); Build_Core if (!$use_custom_dir || $build_core_only); print STDERR "Beginning Full Build\n" if ($print_status == 1); -if ( $vc7 ) { - Build_All_VC7 if !$build_core_only; -} -else { - Build_All if !$build_core_only; -} +Build_All if !$build_core_only; -print "msvc_static_compile: End\n"; +print "msvc_auto_compile: End\n"; print STDERR "End\n" if ($print_status == 1); diff --git a/bin/msvc_static_order.lst b/bin/msvc_static_order.lst index 1e0d66ae568..178750c49e4 100644 --- a/bin/msvc_static_order.lst +++ b/bin/msvc_static_order.lst @@ -3,88 +3,80 @@ # This file lists the project files that must be build first in a static # build using msvc_static_compile.pl -ace/ace -Kokyu/Kokyu -ACEXML/parser/parser/ACEXML_Parser -ACEXML/common/ACEXML -apps/gperf/src/gperf -TAO/TAO_IDL/TAO_IDL_BE -TAO/TAO_IDL/TAO_IDL_FE -TAO/TAO_IDL/TAO_IDL_EXE -TAO/tao/TAO -TAO/tao/Valuetype -TAO/tao/IORInterceptor -TAO/tao/ObjRefTemplate -TAO/tao/PortableServer -TAO/tao/DynamicAny -TAO/tao/IORManipulation -TAO/tao/IORTable -TAO/tao/Messaging -TAO/tao/DynamicInterface -TAO/tao/Strategies -TAO/tao/RTCORBA -TAO/tao/RTPortableServer -TAO/tao/Utils -TAO/tao/RTScheduler -TAO/tao/IFR_Client -TAO/tao/TypeCodeFactory -TAO/orbsvcs/orbsvcs/Svc_Utils -TAO/orbsvcs/orbsvcs/CosNaming -TAO/orbsvcs/orbsvcs/CosNaming_Serv -TAO/orbsvcs/orbsvcs/CosNaming_Skel -TAO/orbsvcs/orbsvcs/CosProperty -TAO/orbsvcs/orbsvcs/CosTrading -TAO/orbsvcs/orbsvcs/CosTrading_Serv -TAO/orbsvcs/orbsvcs/CosTrading_Skel -TAO/orbsvcs/orbsvcs/AV -TAO/orbsvcs/orbsvcs/ETCL -TAO/orbsvcs/orbsvcs/RTCosScheduling -TAO/orbsvcs/orbsvcs/RTEvent -TAO/orbsvcs/orbsvcs/RTSched -TAO/orbsvcs/orbsvcs/RTSchedEvent -TAO/orbsvcs/orbsvcs/RTOLDEvent -TAO/orbsvcs/orbsvcs/CosEvent -TAO/orbsvcs/orbsvcs/CosEvent_Serv -TAO/orbsvcs/orbsvcs/CosEvent_Skel -TAO/orbsvcs/orbsvcs/RTKokyuEvent -TAO/orbsvcs/orbsvcs/CosConcurrency -TAO/orbsvcs/orbsvcs/CosLifeCycle -TAO/orbsvcs/orbsvcs/CosTime -TAO/orbsvcs/orbsvcs/CosNotification -TAO/orbsvcs/orbsvcs/CosNotification_Skel -TAO/orbsvcs/orbsvcs/DsLogAdmin -TAO/orbsvcs/orbsvcs/DsEventLogAdmin -TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin -TAO/orbsvcs/orbsvcs/FTORB_Utils -TAO/orbsvcs/orbsvcs/FT_ClientORB -TAO/orbsvcs/orbsvcs/FT_ServerORB -TAO/orbsvcs/orbsvcs/FtRtEvent -TAO/orbsvcs/orbsvcs/PortableGroup -TAO/orbsvcs/orbsvcs/FaultTolerance -TAO/orbsvcs/orbsvcs/CosLoadBalancing -TAO/orbsvcs/orbsvcs/IFRService -TAO/orbsvcs/orbsvcs/RTCORBAEvent -TAO/orbsvcs/orbsvcs/RT_Notification -TAO/orbsvcs/Naming_Service/Naming_Service -TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Lib -TAO/orbsvcs/orbsvcs/FTRT_ClientORB -TAO/orbsvcs/tests/Event/lib/Event_Test_Lib -TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib -TAO/orbsvcs/tests/Trading/Trading_Test_Lib -TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib -TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf -TAO/tests/Smart_Proxies/Collocation/SP_Collocation_TestStubsLib -TAO/tests/Collocation/Collocation_Test_Stub -TAO/examples/POA/Generic_Servant/POA_Generic_Servant_Lib -TAO/examples/Simple/time-date/Simple_Time_Date_Lib -TAO/docs/tutorials/Quoter/idl/Quoter_Idl_Lib -TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common -tests/Test_Output -performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib -examples/Service_Configurator/Misc/Service_Configurator_Misc_Timer -examples/Timer_Queue/Timer_Queue_Library -ASNMP/asnmp/asnmp_lib -netsvcs/lib/netsvcs -netsvcs/clients/Naming/Client/Netsvsc_Client_Test_Lib -netsvcs/clients/Naming/Dump_Restore/Netsvcs_Dump_Restore_Lib -websvcs/lib/websvcs +ace/ace.dsp +Kokyu/Kokyu.dsp +ACEXML/parser/parser/ACEXML_Parser.dsp +ACEXML/common/ACEXML.dsp +apps/gperf/src/gperf.dsp +TAO/TAO_IDL/TAO_IDL_BE.dsp +TAO/TAO_IDL/TAO_IDL_FE.dsp +TAO/TAO_IDL/TAO_IDL_EXE.dsp +TAO/tao/TAO.dsp +TAO/tao/Valuetype.dsp +TAO/tao/IORInterceptor.dsp +TAO/tao/ObjRefTemplate.dsp +TAO/tao/PortableServer.dsp +TAO/tao/DynamicAny.dsp +TAO/tao/IORManipulation.dsp +TAO/tao/IORTable.dsp +TAO/tao/Messaging.dsp +TAO/tao/DynamicInterface.dsp +TAO/tao/Strategies.dsp +TAO/tao/RTCORBA.dsp +TAO/tao/RTPortableServer.dsp +TAO/tao/Utils.dsp +TAO/tao/RTScheduler.dsp +TAO/tao/IFR_Client.dsp +TAO/tao/TypeCodeFactory.dsp +TAO/orbsvcs/orbsvcs/Svc_Utils.dsp +TAO/orbsvcs/orbsvcs/CosNaming.dsp +TAO/orbsvcs/orbsvcs/CosProperty.dsp +TAO/orbsvcs/orbsvcs/CosTrading.dsp +TAO/orbsvcs/orbsvcs/AV.dsp +TAO/orbsvcs/orbsvcs/ETCL.dsp +TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp +TAO/orbsvcs/orbsvcs/RTEvent.dsp +TAO/orbsvcs/orbsvcs/RTSched.dsp +TAO/orbsvcs/orbsvcs/RTSchedEvent.dsp +TAO/orbsvcs/orbsvcs/RTOLDEvent.dsp +TAO/orbsvcs/orbsvcs/CosEvent.dsp +TAO/orbsvcs/orbsvcs/RTKokyuEvent.dsp +TAO/orbsvcs/orbsvcs/CosConcurrency.dsp +TAO/orbsvcs/orbsvcs/CosLifeCycle.dsp +TAO/orbsvcs/orbsvcs/CosTime.dsp +TAO/orbsvcs/orbsvcs/CosNotification.dsp +TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp +TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp +TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp +TAO/orbsvcs/orbsvcs/FTORB_Utils.dsp +TAO/orbsvcs/orbsvcs/FT_ClientORB.dsp +TAO/orbsvcs/orbsvcs/FT_ServerORB.dsp +TAO/orbsvcs/orbsvcs/FtRtEvent.dsp +TAO/orbsvcs/orbsvcs/PortableGroup.dsp +TAO/orbsvcs/orbsvcs/FaultTolerance.dsp +TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp +TAO/orbsvcs/orbsvcs/IFRService.dsp +TAO/orbsvcs/orbsvcs/RTCORBAEvent.dsp +TAO/orbsvcs/orbsvcs/RT_Notification.dsp +TAO/orbsvcs/Naming_Service/Naming_Service.dsp +TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Lib.dsp +TAO/orbsvcs/orbsvcs/FTRT_ClientORB.dsp +TAO/orbsvcs/tests/Event/lib/Event_Test_Lib.dsp +TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.dsp +TAO/orbsvcs/tests/Trading/Trading_Test_Lib.dsp +TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.dsp +TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.dsp +TAO/tests/Smart_Proxies/Collocation/SP_Collocation_TestStubsLib.dsp +TAO/tests/Collocation/Collocation_Test_Stub.dsp +TAO/examples/POA/Generic_Servant/POA_Generic_Servant_Lib.dsp +TAO/examples/Simple/time-date/Simple_Time_Date_Lib.dsp +TAO/docs/tutorials/Quoter/idl/Quoter_Idl_Lib.dsp +TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common.dsp +tests/Test_Output.dsp +performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp +examples/Service_Configurator/Misc/Service_Configurator_Misc_Timer.dsp +ASNMP/asnmp/asnmp_lib.dsp +netsvcs/lib/netsvcs.dsp +netsvcs/clients/Naming/Client/Netsvsc_Client_Test_Lib.dsp +netsvcs/clients/Naming/Dump_Restore/Netsvcs_Dump_Restore_Lib.dsp +websvcs/lib/websvcs.dsp diff --git a/bin/mwc.pl b/bin/mwc.pl index 688d278b513..0715e948b99 100755 --- a/bin/mwc.pl +++ b/bin/mwc.pl @@ -14,7 +14,6 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' use strict; use Cwd; -use Config; use File::Basename; if ( $^O eq 'VMS' ) { @@ -22,7 +21,7 @@ if ( $^O eq 'VMS' ) { import VMS::Filespec qw(unixpath); } -my($basePath) = getExecutePath($0) . '/MakeProjectCreator'; +my($basePath) = getExecutePath($0) . 'MakeProjectCreator'; unshift(@INC, $basePath . '/modules'); my($mpcroot) = $ENV{MPC_ROOT}; @@ -61,23 +60,31 @@ my(@creators) = ('GNUACEWorkspaceCreator', # Subroutine Section # ************************************************************ -sub getBasePath { - return $mpcpath; -} - - sub which { - my($prog) = shift; - my($exec) = $prog; - - if (defined $ENV{'PATH'}) { - my($part) = ''; - my($envSep) = $Config{'path_sep'}; - foreach $part (split(/$envSep/, $ENV{'PATH'})) { - $part .= "/$prog"; - if ( -x $part ) { - $exec = $part; - last; + my($prog) = shift; + my($exec) = $prog; + my($part) = ''; + if ( $^O eq 'VMS' ) { + my($envSep) = ';'; + if (defined $ENV{'PATH'}) { + foreach $part (split(/$envSep/, $ENV{'PATH'})) { + $part .= "$prog"; + if ( -x $part ) { + $exec = $part; + last; + } + } + } + } + else { + my($envSep) = ($^O eq 'MSWin32' ? ';' : ':'); + if (defined $ENV{'PATH'}) { + foreach $part (split(/$envSep/, $ENV{'PATH'})) { + $part .= "/$prog"; + if ( -x $part ) { + $exec = $part; + last; + } } } } @@ -90,33 +97,51 @@ sub getExecutePath { my($prog) = shift; my($loc) = ''; - if ($prog ne basename($prog)) { - my($dir) = ($^O eq 'VMS' ? unixpath(dirname($prog)) : dirname($prog)); - if ($prog =~ /^[\/\\]/ || - $prog =~ /^[A-Za-z]:[\/\\]?/) { - $loc = $dir; + if ( $^O eq 'VMS' ) { + if ($prog ne basename($prog)) { + my($dir) = unixpath( dirname($prog) ); + if ($prog =~ /^[\/\\]/) { + $loc = $dir; + } + else { + $loc = unixpath(getcwd()) . $dir; + } } else { - $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()) . '/' . $dir; + $loc = unixpath( dirname(which($prog)) ); } - } - else { - $loc = dirname(which($prog)); - if ($^O eq 'VMS') { - $loc = unixpath($loc); + + if ($loc eq '.') { + $loc = unixpath( getcwd() ); } - } + } else { + if ($prog ne basename($prog)) { + if ($prog =~ /^[\/\\]/ || + $prog =~ /^[A-Za-z]:[\/\\]?/) { + $loc = dirname($prog); + } + else { + $loc = getcwd() . '/' . dirname($prog); + } + } + else { + $loc = dirname(which($prog)); + } + + $loc =~ s/\/\.$//; - $loc =~ s/\/\.$//; + if ($loc eq '.') { + $loc = getcwd(); + } - if ($loc eq '.') { - $loc = ($^O eq 'VMS' ? unixpath(getcwd()) : getcwd()); + if ($loc ne '') { + $loc .= '/'; + } } return $loc; } - # ************************************************************ # Main Section # ************************************************************ diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst index b4617dc690f..5036aa1fd6e 100644 --- a/bin/tao_orb_tests.lst +++ b/bin/tao_orb_tests.lst @@ -20,8 +20,8 @@ TAO/tests/Collocation_Opportunities/run_test.pl: !ST TAO/tests/OctetSeq/run_test.pl TAO/tests/OctetSeq/run_test1.pl: !STATIC TAO/tests/OctetSeq/run_test2.pl: !STATIC -TAO/tests/BiDirectional/run_test.pl: !MINIMUM !GIOP10 !DISABLE_BIDIR -TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR +TAO/tests/BiDirectional/run_test.pl: !MINIMUM !GIOP10 +TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 TAO/tests/Leader_Followers/run_test.pl: !ST TAO/tests/Leader_Followers/run_test_mt.pl: !ST TAO/tests/Multiple_Inheritance/run_test.pl @@ -69,7 +69,7 @@ TAO/tests/Cache_Growth_Test/run_test.pl TAO/tests/Muxing/run_test.pl: !ST TAO/tests/Muxed_GIOP_Versions/run_test.pl: !ST TAO/tests/MT_Client/run_test.pl: !ST -TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !GIOP10 !DISABLE_BIDIR +TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !GIOP10 TAO/tests/File_IO/run_test.pl: !ST !MINIMUM TAO/tests/MT_Server/run_test.pl: !ST TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM diff --git a/bin/tao_other_tests.lst b/bin/tao_other_tests.lst index f9fcc6fb19b..4b31a2fe859 100644 --- a/bin/tao_other_tests.lst +++ b/bin/tao_other_tests.lst @@ -30,7 +30,7 @@ TAO/performance-tests/Throughput/run_test.pl TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM !SUNCC5_1 -TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM !DISABLE_BIDIR +TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM TAO/examples/POA/DSI/run_test.pl: !MINIMUM TAO/examples/POA/Default_Servant/run_test.pl: !MINIMUM TAO/examples/POA/Explicit_Activation/run_test.pl: !MINIMUM @@ -48,8 +48,8 @@ TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING TAO/examples/Quoter/run_test.pl: !MINIMUM TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !SUNCC5_1 -TAO/examples/PluggableUDP/tests/Basic/run_test.pl: !STATIC !ST !NO_DIOP -TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl: !NO_DIOP +TAO/examples/PluggableUDP/tests/Basic/run_test.pl: !STATIC !ST +TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP @@ -63,7 +63,7 @@ TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p TCP,UDP,RTP TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM -TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM +TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !NO_MESSAGING TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM @@ -78,12 +78,12 @@ TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: SANDBOX TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING -TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !MINIMUM +TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !MINIMUM TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING -TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING -TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING -TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM +TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING +TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING +TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING |