diff options
Diffstat (limited to 'TAO')
50 files changed, 117 insertions, 38 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index e7565f580ae..e6aececf1e3 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,20 @@ +Thu Jan 3 07:18:22 2002 Christopher Kohlhoff <chris@kohlhoff.com> + + * orbsvcs/LifeCycle_Service/LifeCycle_Service.bor: + Added library required for a statically linked build. + + * orbsvcs/Notify_Service/NT_Notify_Service.bor: + * orbsvcs/Notify_Service/Notify_Service.bor: + Reverted the changes made to these files in + Sun Dec 30 20:30:12 2001 Johnny Willemsen <jwillemsen@remedy.nl> + as the trading library is required for a static build. + + * orbsvcs/orbsvcs/*.bor: + * orbsvcs/orbsvcs/Security.rc: + * tao/*/Makefile.bor: + * tao/*/*.rc: + Added Borland makefile support for the new resource files. + Wed Jan 2 20:48:36 2002 Douglas C. Schmidt <schmidt@siesta.cs.wustl.edu> * TAO-INSTALL.html: Fixed a couple of missing links. Thanks to diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor index 2ac5676a032..f7a851b12a4 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor @@ -16,9 +16,10 @@ CFLAGS = \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_SVC_UTILS_CFLAGS) \ - $(TAO_LIFECYCLE_CFLAGS) \ - $(TAO_TRADING_CFLAGS) \ - $(TAO_IORTABLE_CFLAGS) + $(TAO_LIFECYCLE_CFLAGS) \ + $(TAO_TRADING_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ + $(TAO_DYNAMICANY_CFLAGS) LIBFILES = \ $(ACE_LIB) \ @@ -26,9 +27,10 @@ LIBFILES = \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_SVC_UTILS_LIB) \ - $(TAO_LIFECYCLE_LIB) \ - $(TAO_TRADING_LIB) \ - $(TAO_IORTABLE_LIB) + $(TAO_LIFECYCLE_LIB) \ + $(TAO_TRADING_LIB) \ + $(TAO_IORTABLE_LIB) \ + $(TAO_DYNAMICANY_LIB) CPPDIR = . diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor index f302bde29d7..d784e76b77d 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor @@ -16,6 +16,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_EVENT_CFLAGS) \ + $(TAO_TRADING_CFLAGS) \ $(TAO_NOTIFY_CFLAGS) LIBFILES = \ @@ -27,6 +28,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_EVENT_LIB) \ + $(TAO_TRADING_LIB) \ $(TAO_NOTIFY_LIB) CPPDIR = . diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.bor b/TAO/orbsvcs/Notify_Service/Notify_Service.bor index 3671a2f703d..02921809acb 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.bor +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.bor @@ -15,6 +15,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_EVENT_CFLAGS) \ + $(TAO_TRADING_CFLAGS) \ $(TAO_NOTIFY_CFLAGS) LIBFILES = \ @@ -26,6 +27,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_EVENT_LIB) \ + $(TAO_TRADING_LIB) \ $(TAO_NOTIFY_LIB) CPPDIR = . diff --git a/TAO/orbsvcs/orbsvcs/AV.bor b/TAO/orbsvcs/orbsvcs/AV.bor index 3ee1f9a2b04..fc38017d92d 100644 --- a/TAO/orbsvcs/orbsvcs/AV.bor +++ b/TAO/orbsvcs/orbsvcs/AV.bor @@ -39,7 +39,7 @@ OBJFILES = \ $(OBJDIR)\Transport.obj \ $(OBJDIR)\UDP.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\AV.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.bor b/TAO/orbsvcs/orbsvcs/CosConcurrency.bor index 77548299ed3..49cff0fa343 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.bor +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.bor @@ -20,7 +20,7 @@ OBJFILES = \ $(OBJDIR)\CosConcurrencyControlC.obj \ $(OBJDIR)\CosConcurrencyControlS.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\CosConcurrency.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.bor b/TAO/orbsvcs/orbsvcs/CosEvent.bor index 476c41576bf..af0f94b487c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.bor +++ b/TAO/orbsvcs/orbsvcs/CosEvent.bor @@ -44,7 +44,7 @@ OBJFILES = \ # $(OBJDIR)\ProxyPushSupplier_i.obj \ # $(OBJDIR)\SupplierAdmin_i.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\CosEvent.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor b/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor index 30aaf11cbcd..67226b16ec1 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor @@ -19,7 +19,7 @@ OBJFILES = \ $(OBJDIR)\LifeCycleServiceC.obj \ $(OBJDIR)\LifeCycleServiceS.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\CosLifeCycle.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.bor b/TAO/orbsvcs/orbsvcs/CosNaming.bor index 5291e08ae9f..23e60c39666 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.bor +++ b/TAO/orbsvcs/orbsvcs/CosNaming.bor @@ -25,7 +25,7 @@ OBJFILES = \ $(OBJDIR)\Persistent_Naming_Context.obj \ $(OBJDIR)\Transient_Naming_Context.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\CosNaming.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.bor b/TAO/orbsvcs/orbsvcs/CosNotification.bor index 7d2488c682e..6cfcb1c937c 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.bor +++ b/TAO/orbsvcs/orbsvcs/CosNotification.bor @@ -61,7 +61,7 @@ OBJFILES = \ $(OBJDIR)\Notify_Buffering_Strategy.obj \ $(OBJDIR)\Notify_MT_Worker_Task.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\CosNotification.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.bor b/TAO/orbsvcs/orbsvcs/CosProperty.bor index 75b9573c770..67f3958f05a 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.bor +++ b/TAO/orbsvcs/orbsvcs/CosProperty.bor @@ -17,7 +17,7 @@ OBJFILES = \ $(OBJDIR)\CosPropertyServiceC.obj \ $(OBJDIR)\CosPropertyServiceS.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\CosProperty.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/CosTime.bor b/TAO/orbsvcs/orbsvcs/CosTime.bor index 995e0d989c7..6b109270fae 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.bor +++ b/TAO/orbsvcs/orbsvcs/CosTime.bor @@ -21,7 +21,7 @@ OBJFILES = \ $(OBJDIR)\TimeServiceC.obj \ $(OBJDIR)\TimeServiceS.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\CosTime.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.bor b/TAO/orbsvcs/orbsvcs/CosTrading.bor index ff59a69cad2..d2267b79dfc 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.bor +++ b/TAO/orbsvcs/orbsvcs/CosTrading.bor @@ -37,7 +37,7 @@ OBJFILES = \ $(OBJDIR)\Trader_Utils.obj \ $(OBJDIR)\Trading_Loader.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\CosTrading.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor index f8d12fc3763..3b2bb3fc47f 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor @@ -24,7 +24,7 @@ OBJFILES = \ $(OBJDIR)\LogMgr_i.obj \ $(OBJDIR)\LogRecordStore.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\DsLogAdmin.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.bor b/TAO/orbsvcs/orbsvcs/FaultTolerance.bor index 0b9c4ac8685..508e87dd021 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.bor +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.bor @@ -28,7 +28,7 @@ OBJFILES = \ $(OBJDIR)\FT_Service_Callbacks.obj \ $(OBJDIR)\FT_ORBInitializer.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\FaultTolerance.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.bor b/TAO/orbsvcs/orbsvcs/LoadBalancing.bor index e592e8af352..10ff721b2f4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing.bor +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing.bor @@ -26,7 +26,7 @@ OBJFILES = \ $(OBJDIR)\ReplicaProxy.obj \ $(OBJDIR)\Round_Robin_Strategy.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\LoadBalancing.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.bor b/TAO/orbsvcs/orbsvcs/RTEvent.bor index a68a2c16885..81ad3fc4704 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.bor +++ b/TAO/orbsvcs/orbsvcs/RTEvent.bor @@ -71,7 +71,7 @@ OBJFILES = \ $(OBJDIR)\RtecUDPAdminC.obj \ $(OBJDIR)\RtecUDPAdminS.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\RTEvent.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.bor b/TAO/orbsvcs/orbsvcs/RTOLDEvent.bor index 79aa833154a..91e9ed2f8f6 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.bor +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.bor @@ -17,7 +17,7 @@ OBJFILES = \ $(OBJDIR)\RT_Task.obj \ $(OBJDIR)\Timer_Module.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\RTOldEvent.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/RTSched.bor b/TAO/orbsvcs/orbsvcs/RTSched.bor index bc56a540574..f0c141b4e3a 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.bor +++ b/TAO/orbsvcs/orbsvcs/RTSched.bor @@ -27,7 +27,7 @@ OBJFILES = \ $(OBJDIR)\Scheduler_Utilities.obj \ $(OBJDIR)\Strategy_Scheduler.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\RTSched.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.bor b/TAO/orbsvcs/orbsvcs/RTSchedEvent.bor index 0eea654d791..b2b6d6de1e1 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.bor +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.bor @@ -12,7 +12,7 @@ OBJFILES = \ $(OBJDIR)\EC_Sched_Filter.obj \ $(OBJDIR)\EC_Sched_Filter_Builder.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\RTSchedEvent.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.bor b/TAO/orbsvcs/orbsvcs/SSLIOP.bor index baa666ea1ba..97851f01591 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.bor +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.bor @@ -39,7 +39,7 @@ OBJFILES = \ $(OBJDIR)\SSLIOP_X509.obj \ $(OBJDIR)\SSLIOPC.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\SSLIOP.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/Security.bor b/TAO/orbsvcs/orbsvcs/Security.bor index a03e1fbe9c9..af460a0b81b 100644 --- a/TAO/orbsvcs/orbsvcs/Security.bor +++ b/TAO/orbsvcs/orbsvcs/Security.bor @@ -30,7 +30,7 @@ OBJFILES = \ $(OBJDIR)\InvocationCredentialsPolicy.obj \ $(OBJDIR)\QOPPolicy.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\Security.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/orbsvcs/orbsvcs/Security.rc b/TAO/orbsvcs/orbsvcs/Security.rc new file mode 100644 index 00000000000..9138ebe5f3b --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Security.rc @@ -0,0 +1,30 @@ +#include "..\..\tao\Version.h" + +1 VERSIONINFO + FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 + PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "Security\0" + VALUE "FileVersion", TAO_VERSION "\0" + VALUE "InternalName", "TAO_SecurityDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "TAO_Security.DLL\0" + VALUE "ProductName", "ORBSVCS\0" + VALUE "ProductVersion", TAO_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.bor b/TAO/orbsvcs/orbsvcs/Svc_Utils.bor index f46f7dfb55c..5945f833544 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.bor +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.bor @@ -21,7 +21,7 @@ OBJFILES = \ $(OBJDIR)\RtecBaseC.obj \ $(OBJDIR)\RtecBaseS.obj -RESOURCE = $(OBJDIR)\orbsvcs.res +RESOURCE = $(OBJDIR)\Svc_Utils.res CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/tao/BiDir_GIOP/Makefile.bor b/TAO/tao/BiDir_GIOP/Makefile.bor index a0fd68a7711..e2381da89e8 100644 --- a/TAO/tao/BiDir_GIOP/Makefile.bor +++ b/TAO/tao/BiDir_GIOP/Makefile.bor @@ -11,6 +11,8 @@ OBJFILES = \ $(OBJDIR)\BiDir_PolicyFactory.obj \ $(OBJDIR)\BiDir_Policy_i.obj +RESOURCE = $(OBJDIR)\TAO_BiDir_GIOP.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_BIDIRGIOP_CFLAGS) !else diff --git a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc index 945b1f70d1e..13c255b63ad 100644 --- a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc +++ b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/Domain/Makefile.bor b/TAO/tao/Domain/Makefile.bor index 9951fb04250..d1a3c15a915 100644 --- a/TAO/tao/Domain/Makefile.bor +++ b/TAO/tao/Domain/Makefile.bor @@ -7,6 +7,8 @@ NAME = TAO_Domain OBJFILES = \ $(OBJDIR)\DomainS.obj +RESOURCE = $(OBJDIR)\TAO_Domain.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DOMAIN_CFLAGS) !else diff --git a/TAO/tao/Domain/TAO_Domain.rc b/TAO/tao/Domain/TAO_Domain.rc index 0e114ae2050..38d9e0edc5b 100644 --- a/TAO/tao/Domain/TAO_Domain.rc +++ b/TAO/tao/Domain/TAO_Domain.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/DynamicAny/Makefile.bor b/TAO/tao/DynamicAny/Makefile.bor index 29831e99991..9550a066e11 100644 --- a/TAO/tao/DynamicAny/Makefile.bor +++ b/TAO/tao/DynamicAny/Makefile.bor @@ -16,6 +16,8 @@ OBJFILES = \ $(OBJDIR)\DynStruct_i.obj \ $(OBJDIR)\DynUnion_i.obj +RESOURCE = $(OBJDIR)\TAO_DynamicAny.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICANY_CFLAGS) !else diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny.rc b/TAO/tao/DynamicAny/TAO_DynamicAny.rc index c91ede9438d..f8f1131c54d 100644 --- a/TAO/tao/DynamicAny/TAO_DynamicAny.rc +++ b/TAO/tao/DynamicAny/TAO_DynamicAny.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/DynamicInterface/Makefile.bor b/TAO/tao/DynamicInterface/Makefile.bor index ee4bbe3b857..d7e038ad47b 100644 --- a/TAO/tao/DynamicInterface/Makefile.bor +++ b/TAO/tao/DynamicInterface/Makefile.bor @@ -15,6 +15,8 @@ OBJFILES = \ $(OBJDIR)\Server_Request.obj \ $(OBJDIR)\Unknown_User_Exception.obj +RESOURCE = $(OBJDIR)\TAO_DynamicInterface.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICINTERFACE_CFLAGS) !else diff --git a/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc b/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc index 437901cb349..5cca9fe43d2 100644 --- a/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc +++ b/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/IFR_Client/Makefile.bor b/TAO/tao/IFR_Client/Makefile.bor index 85d1739d83a..dc664449ec5 100644 --- a/TAO/tao/IFR_Client/Makefile.bor +++ b/TAO/tao/IFR_Client/Makefile.bor @@ -11,6 +11,8 @@ OBJFILES = \ $(OBJDIR)\IFR_ComponentsC.obj \ $(OBJDIR)\IFR_Client_Adapter_Impl.obj +RESOURCE = $(OBJDIR)\TAO_IFR_Client.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IFR_CLIENT_CFLAGS) !else diff --git a/TAO/tao/IFR_Client/TAO_IFR_Client.rc b/TAO/tao/IFR_Client/TAO_IFR_Client.rc index 9b4e81104f3..c981fee5b26 100644 --- a/TAO/tao/IFR_Client/TAO_IFR_Client.rc +++ b/TAO/tao/IFR_Client/TAO_IFR_Client.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/IORManipulation/Makefile.bor b/TAO/tao/IORManipulation/Makefile.bor index 85d6e12e3e7..9d58de05409 100644 --- a/TAO/tao/IORManipulation/Makefile.bor +++ b/TAO/tao/IORManipulation/Makefile.bor @@ -9,6 +9,8 @@ OBJFILES = \ $(OBJDIR)\IORManip_Loader.obj \ $(OBJDIR)\IORManipulation.obj \ +RESOURCE = $(OBJDIR)\TAO_IORManip.res + CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IORMANIP_CFLAGS) \ -DTAO_IORMANIP_BUILD_DLL diff --git a/TAO/tao/IORManipulation/TAO_IORManip.rc b/TAO/tao/IORManipulation/TAO_IORManip.rc index 588f62039d2..9874dd6f19e 100644 --- a/TAO/tao/IORManipulation/TAO_IORManip.rc +++ b/TAO/tao/IORManipulation/TAO_IORManip.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/IORTable/Makefile.bor b/TAO/tao/IORTable/Makefile.bor index d6156da1bd2..87c029b7ce6 100644 --- a/TAO/tao/IORTable/Makefile.bor +++ b/TAO/tao/IORTable/Makefile.bor @@ -10,6 +10,8 @@ OBJFILES = \ $(OBJDIR)\Table_Adapter.obj \ $(OBJDIR)\IOR_Table_Impl.obj +RESOURCE = $(OBJDIR)\TAO_IORTable.res + CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IORTABLE_CFLAGS) \ -DTAO_IORTABLE_BUILD_DLL diff --git a/TAO/tao/IORTable/TAO_IORTable.rc b/TAO/tao/IORTable/TAO_IORTable.rc index 25ab022e1b3..eb75c022a62 100644 --- a/TAO/tao/IORTable/TAO_IORTable.rc +++ b/TAO/tao/IORTable/TAO_IORTable.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor index c033be79671..c13cbdc399b 100644 --- a/TAO/tao/PortableServer/Makefile.bor +++ b/TAO/tao/PortableServer/Makefile.bor @@ -35,6 +35,8 @@ OBJFILES = \ $(OBJDIR)\Strategized_Object_Proxy_Broker.obj \ $(OBJDIR)\ThruPOA_Object_Proxy_Impl.obj +RESOURCE = $(OBJDIR)\TAO_PortableServer.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) !else diff --git a/TAO/tao/PortableServer/TAO_PortableServer.rc b/TAO/tao/PortableServer/TAO_PortableServer.rc index 017465fd7d7..f16419968f5 100644 --- a/TAO/tao/PortableServer/TAO_PortableServer.rc +++ b/TAO/tao/PortableServer/TAO_PortableServer.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/RTCORBA/Makefile.bor b/TAO/tao/RTCORBA/Makefile.bor index 9c264d4c1ae..ca428a9be4c 100644 --- a/TAO/tao/RTCORBA/Makefile.bor +++ b/TAO/tao/RTCORBA/Makefile.bor @@ -33,6 +33,8 @@ OBJFILES = \ $(OBJDIR)\RT_Stub_Factory.obj \ $(OBJDIR)\Thread_Pool.obj +RESOURCE = $(OBJDIR)\TAO_RTCORBA.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_RTCORBA_CFLAGS) !else diff --git a/TAO/tao/RTCORBA/TAO_RTCORBA.rc b/TAO/tao/RTCORBA/TAO_RTCORBA.rc index 0d71fc34865..c4c1b19b422 100644 --- a/TAO/tao/RTCORBA/TAO_RTCORBA.rc +++ b/TAO/tao/RTCORBA/TAO_RTCORBA.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/RTPortableServer/Makefile.bor b/TAO/tao/RTPortableServer/Makefile.bor index f277f226983..c3bf945bca4 100644 --- a/TAO/tao/RTPortableServer/Makefile.bor +++ b/TAO/tao/RTPortableServer/Makefile.bor @@ -18,6 +18,8 @@ OBJFILES = \ $(OBJDIR)\RT_Policy_Validator.obj \ $(OBJDIR)\RT_Servant_Dispatcher.obj +RESOURCE = $(OBJDIR)\TAO_RTPortableServer.res + !ifdef STATIC CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc b/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc index 96bcd6b17b8..b0eb456a209 100644 --- a/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc +++ b/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/SmartProxies/Makefile.bor b/TAO/tao/SmartProxies/Makefile.bor index f16111ec47f..ecc7eabf740 100644 --- a/TAO/tao/SmartProxies/Makefile.bor +++ b/TAO/tao/SmartProxies/Makefile.bor @@ -7,6 +7,8 @@ NAME = TAO_SmartProxies OBJFILES = \ $(OBJDIR)\Smart_Proxies.obj +RESOURCE = $(OBJDIR)\SmartProxies.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SMARTPROXIES_CFLAGS) !else diff --git a/TAO/tao/SmartProxies/SmartProxies.rc b/TAO/tao/SmartProxies/SmartProxies.rc index d3ad1987aba..2c2665118ef 100644 --- a/TAO/tao/SmartProxies/SmartProxies.rc +++ b/TAO/tao/SmartProxies/SmartProxies.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/Strategies/Makefile.bor b/TAO/tao/Strategies/Makefile.bor index 9be8690496f..b22cfa44a16 100644 --- a/TAO/tao/Strategies/Makefile.bor +++ b/TAO/tao/Strategies/Makefile.bor @@ -34,6 +34,8 @@ OBJFILES = \ $(OBJDIR)\NULL_Connection_Purging_Strategy.obj \ $(OBJDIR)\LF_Strategy_Null.obj +RESOURCE = $(OBJDIR)\TAO_Strategies.res + !ifdef STATIC CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_STRATEGIES_CFLAGS) !else diff --git a/TAO/tao/Strategies/TAO_Strategies.rc b/TAO/tao/Strategies/TAO_Strategies.rc index 5e2a54a1794..d0646d177f1 100644 --- a/TAO/tao/Strategies/TAO_Strategies.rc +++ b/TAO/tao/Strategies/TAO_Strategies.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 diff --git a/TAO/tao/TypeCodeFactory/Makefile.bor b/TAO/tao/TypeCodeFactory/Makefile.bor index c72930b933b..082d180d860 100644 --- a/TAO/tao/TypeCodeFactory/Makefile.bor +++ b/TAO/tao/TypeCodeFactory/Makefile.bor @@ -10,6 +10,8 @@ OBJFILES = \ $(OBJDIR)\TypeCodeFactory_Loader.obj \ $(OBJDIR)\TypeCodeFactory_Adapter_Impl.obj +RESOURCE = $(OBJDIR)\TypeCodeFactory.res + !ifdef STATIC CFLAGS = \ $(ACE_CFLAGS) \ diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc index 3deda1b0de0..87bd0426914 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc @@ -1,4 +1,4 @@ -#include "Version.h" +#include "..\Version.h" 1 VERSIONINFO FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 |