diff options
23 files changed, 193 insertions, 46 deletions
diff --git a/ACEXML/common/common.mpc b/ACEXML/common/common.mpc index ea8fa0ae0fe..bd496a82123 100644 --- a/ACEXML/common/common.mpc +++ b/ACEXML/common/common.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(ACEXML): acelib, acememorylib_for_tao, acecodecslib_for_tao, codecs, core { +project(ACEXML): acelib, codecs, core { + avoids += ace_for_tao sharedname = ACEXML dynamicflags += ACEXML_BUILD_DLL diff --git a/ChangeLog b/ChangeLog index 68ac7d77290..f523426c3f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +Fri Nov 11 11:06:31 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ACEXML/common/common.mpc: + * ace/ACE_Codecs_export.h: + * ace/Codecs.h: + * ace/ace.mwc: + * ace/ace_codecs_for_tao.mpc: + * apps/JAWS/server/server.mpc: + * apps/JAWS3/jaws3/jaws3.mpc: + * examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc: + * examples/Threads/Threads.mpc: + * examples/Web_Crawler/Web_Crawler.mpc: + * netsvcs/clients/Naming/Client/Client.mpc: + * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc: + * netsvcs/lib/lib.mpc: + * performance-tests/Misc/Misc.mpc: + * performance-tests/SCTP/SCTP.mpc: + * performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc: + * performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc: + * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc: + * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc: + * performance-tests/TCP/TCP.mpc: + * performance-tests/UDP/UDP.mpc: + * tests/tests.mpc: + + Addressed some "ace_for_tao" link-time failures. + Fri Nov 11 09:21:53 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * include/makeinclude/wrapper_macros.GNU: diff --git a/ace/ACE_Codecs_export.h b/ace/ACE_Codecs_export.h new file mode 100644 index 00000000000..9999c5270ab --- /dev/null +++ b/ace/ACE_Codecs_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ACE_Codecs +// ------------------------------ +#ifndef ACE_CODECS_EXPORT_H +#define ACE_CODECS_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ACE_CODECS_HAS_DLL) +# define ACE_CODECS_HAS_DLL 1 +#endif /* ! ACE_CODECS_HAS_DLL */ + +#if defined (ACE_CODECS_HAS_DLL) && (ACE_CODECS_HAS_DLL == 1) +# if defined (ACE_CODECS_BUILD_DLL) +# define ACE_Codecs_Export ACE_Proper_Export_Flag +# define ACE_CODECS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ACE_CODECS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ACE_CODECS_BUILD_DLL */ +# define ACE_Codecs_Export ACE_Proper_Import_Flag +# define ACE_CODECS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ACE_CODECS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ACE_CODECS_BUILD_DLL */ +#else /* ACE_CODECS_HAS_DLL == 1 */ +# define ACE_Codecs_Export +# define ACE_CODECS_SINGLETON_DECLARATION(T) +# define ACE_CODECS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ACE_CODECS_HAS_DLL == 1 */ + +// Set ACE_CODECS_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ACE_CODECS_NTRACE) +# if (ACE_NTRACE == 1) +# define ACE_CODECS_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ACE_CODECS_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ACE_CODECS_NTRACE */ + +#if (ACE_CODECS_NTRACE == 1) +# define ACE_CODECS_TRACE(X) +#else /* (ACE_CODECS_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ACE_CODECS_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ACE_CODECS_NTRACE == 1) */ + +#endif /* ACE_CODECS_EXPORT_H */ + +// End of auto generated file. diff --git a/ace/Codecs.h b/ace/Codecs.h index 9c2152a4fa6..23d6bf38456 100644 --- a/ace/Codecs.h +++ b/ace/Codecs.h @@ -21,13 +21,22 @@ #include /**/ "ace/pre.h" -#include "ace/Basic_Types.h" -#include "ace/Global_Macros.h" +#ifdef ACE_THREADS_BUILD_DLL +# include "ace/ACE_Codecs_export.h" +#else +# include "ace/ACE_export.h" +# define ACE_Codecs_Export ACE_Export +#endif /* ACE_THREADS_BUILD_DLL */ + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Basic_Types.h" +#include "ace/Global_Macros.h" + + ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -40,7 +49,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * canonical form before encoding. * */ -class ACE_Export ACE_Base64 +class ACE_Codecs_Export ACE_Base64 { public: diff --git a/ace/ace.mwc b/ace/ace.mwc index dadb95c37fd..cb71d5ecbff 100644 --- a/ace/ace.mwc +++ b/ace/ace.mwc @@ -1,9 +1,11 @@ // -*- MPC -*- +// // $Id$ workspace { ace.mpc ace_for_tao.mpc + ace_codecs_for_tao.mpc ace_memory_for_tao.mpc ace_reactor_for_tao.mpc ace_sockets_for_tao.mpc diff --git a/ace/ace_codecs_for_tao.mpc b/ace/ace_codecs_for_tao.mpc index 1761664e3ac..c1b7f4de2ff 100644 --- a/ace/ace_codecs_for_tao.mpc +++ b/ace/ace_codecs_for_tao.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(ACE_Codecs_FOR_TAO) : acedefaults, core, pkgconfig { +project(ACE_Codecs_FOR_TAO) : acedefaults, core, pkgconfig, ace_for_tao { requires = ace_for_tao libout = $(ACE_ROOT)/lib diff --git a/apps/JAWS/server/server.mpc b/apps/JAWS/server/server.mpc index 1785965f478..a79e488cf83 100644 --- a/apps/JAWS/server/server.mpc +++ b/apps/JAWS/server/server.mpc @@ -2,10 +2,11 @@ // $Id$ project(JAWS) : acelib { - sharedname = JAWS + sharedname = JAWS dynamicflags = ACE_BUILD_SVC_DLL requires += ace_filecache - avoids += uses_wchar + avoids += uses_wchar + avoids += ace_for_tao Source_Files { HTTP_Server.cpp @@ -27,9 +28,9 @@ project(JAWS_server) : aceexe { libs += JAWS requires += ace_filecache avoids += uses_wchar + avoids += ace_for_tao Source_Files { main.cpp } } - diff --git a/apps/JAWS3/jaws3/jaws3.mpc b/apps/JAWS3/jaws3/jaws3.mpc index 39670f1c384..eaa9ecd0196 100644 --- a/apps/JAWS3/jaws3/jaws3.mpc +++ b/apps/JAWS3/jaws3/jaws3.mpc @@ -5,6 +5,7 @@ project(JAWS3) : acelib { sharedname = JAWS3 dynamicflags = JAWS_BUILD_DLL avoids += uses_wchar + avoids += ace_for_tao includes += .. Source_Files { Asynch_IO.cpp @@ -70,6 +71,7 @@ project(JAWS3) : acelib { project(JAWS3_server) : aceexe { avoids += uses_wchar + avoids += ace_for_tao includes += .. exename = main after += JAWS3 diff --git a/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc b/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc index f8dfd26377b..c44b40c6e32 100644 --- a/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc +++ b/examples/Service_Configurator/IPC-tests/server/Svc_Cfg_IPC_Server.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Lib) : acelib { + avoids += ace_for_tao sharedname = IPC_Tests_Server dynamicflags += ACE_BUILD_SVC_DLL Source_Files { @@ -19,6 +20,7 @@ project(*Lib) : acelib { } project(*test) : aceexe { + avoids += ace_for_tao exename = server_test after += Svc_Cfg_IPC_Server_Lib libs += IPC_Tests_Server diff --git a/examples/Threads/Threads.mpc b/examples/Threads/Threads.mpc index 2ce2c2497f2..eba2a99d254 100644 --- a/examples/Threads/Threads.mpc +++ b/examples/Threads/Threads.mpc @@ -7,7 +7,7 @@ project(*auto_event) : aceexe { auto_event.cpp } } -project(*barrier1) : aceexe { +project(*barrier1) : aceexe, acethreadslib_for_tao { exename = barrier1 Source_Files { barrier1.cpp @@ -25,13 +25,13 @@ project(*cancel) : aceexe { cancel.cpp } } -project(*future1) : aceexe { +project(*future1) : aceexe, acethreadslib_for_tao { exename = future1 Source_Files { future1.cpp } } -project(*future2) : aceexe { +project(*future2) : aceexe, acethreadslib_for_tao { exename = future2 Source_Files { future2.cpp @@ -49,7 +49,7 @@ project(*process_mutex) : aceexe { process_mutex.cpp } } -project(*process_semaphore) : aceexe { +project(*process_semaphore) : aceexe, acethreadslib_for_tao { exename = process_semaphore Source_Files { process_semaphore.cpp @@ -91,7 +91,7 @@ project(*task_two) : aceexe { task_two.cpp } } -project(*task_one) : aceexe { +project(*task_one) : aceexe, acethreadslib_for_tao { exename = task_one Source_Files { task_one.cpp diff --git a/examples/Web_Crawler/Web_Crawler.mpc b/examples/Web_Crawler/Web_Crawler.mpc index a7df4bfef17..7750d7cbd5d 100644 --- a/examples/Web_Crawler/Web_Crawler.mpc +++ b/examples/Web_Crawler/Web_Crawler.mpc @@ -2,5 +2,6 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = main } diff --git a/netsvcs/clients/Naming/Client/Client.mpc b/netsvcs/clients/Naming/Client/Client.mpc index 29eb2271c7a..54d828b8774 100644 --- a/netsvcs/clients/Naming/Client/Client.mpc +++ b/netsvcs/clients/Naming/Client/Client.mpc @@ -2,6 +2,7 @@ // $Id$ project(Netsvsc_Client_Test_Lib): acelib { + avoids += ace_for_tao sharedname = Client_Test dynamicflags += ACE_CLIENT_TEST_BUILD_DLL Source_Files { @@ -10,9 +11,10 @@ project(Netsvsc_Client_Test_Lib): acelib { } project(Netsvcs_Client_Test) : aceexe { + avoids += ace_for_tao exename = main - libs += Client_Test - after += Client_Test Netsvsc_Client_Test_Lib + libs += Client_Test + after += Client_Test Netsvsc_Client_Test_Lib Source_Files { main.cpp } diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc index 54b1a657c19..c88bb05e2e2 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc +++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.mpc @@ -2,6 +2,7 @@ // $Id$ project(Netsvcs_Dump_Restore_Lib): acelib { + avoids += ace_for_tao sharedname = Dump_Restore dynamicflags += ACE_BUILD_SVC_DLL Source_Files { @@ -10,7 +11,8 @@ project(Netsvcs_Dump_Restore_Lib): acelib { } project(Netsvcs_Dump_Restore) : aceexe { - exename = main + avoids += ace_for_tao + exename = main libs += Dump_Restore after += Netsvcs_Dump_Restore_Lib Source_Files { diff --git a/netsvcs/lib/lib.mpc b/netsvcs/lib/lib.mpc index ff262f00ff2..d1e2f34a9fa 100644 --- a/netsvcs/lib/lib.mpc +++ b/netsvcs/lib/lib.mpc @@ -2,6 +2,7 @@ // $Id$ project(netsvcs): acelib { + avoids += ace_for_tao sharedname = netsvcs dynamicflags += ACE_NETSVCS_BUILD_DLL Source_Files { diff --git a/performance-tests/Misc/Misc.mpc b/performance-tests/Misc/Misc.mpc index 5c2aa3ec7d5..3bffd12d021 100644 --- a/performance-tests/Misc/Misc.mpc +++ b/performance-tests/Misc/Misc.mpc @@ -2,6 +2,7 @@ // $Id$ project(*basic_perf) : aceexe { + avoids += ace_for_tao exename = basic_perf Source_Files { basic_func.cpp @@ -10,6 +11,7 @@ project(*basic_perf) : aceexe { } project(*childbirth_time) : aceexe { + avoids += ace_for_tao exename = childbirth_time Source_Files { childbirth_time.cpp @@ -17,6 +19,7 @@ project(*childbirth_time) : aceexe { } project(*context_switch_time) : aceexe { + avoids += ace_for_tao exename = context_switch_time Source_Files { context_switch_time.cpp @@ -24,6 +27,7 @@ project(*context_switch_time) : aceexe { } project(*test_mutex) : aceexe { + avoids += ace_for_tao exename = test_mutex Source_Files { test_mutex.cpp @@ -31,6 +35,7 @@ project(*test_mutex) : aceexe { } project(*test_naming) : aceexe { + avoids += ace_for_tao exename = test_naming Source_Files { test_naming.cpp @@ -38,6 +43,7 @@ project(*test_naming) : aceexe { } project(*test_singleton) : aceexe { + avoids += ace_for_tao exename = test_singleton Source_Files { test_singleton.cpp diff --git a/performance-tests/SCTP/SCTP.mpc b/performance-tests/SCTP/SCTP.mpc index 91e7b815f4d..ae8b4e27746 100644 --- a/performance-tests/SCTP/SCTP.mpc +++ b/performance-tests/SCTP/SCTP.mpc @@ -2,6 +2,7 @@ // $Id$ project(*SOCK_STREAM_clt) : aceexe { + avoids += ace_for_tao exename = SOCK_STREAM_clt source_files { SOCK_STREAM_clt.cpp @@ -26,6 +27,7 @@ project(*SOCK_STREAM_srv) : aceexe { } project(*SOCK_SEQPACK_clt) : aceexe { + avoids += ace_for_tao exename = SOCK_SEQPACK_clt source_files { SOCK_SEQPACK_clt.cpp @@ -41,7 +43,7 @@ project(*SOCK_SEQPACK_clt) : aceexe { } } -project(*SOCK_SEQPACK_srv) : aceexe { +project(*SOCK_SEQPACK_srv) : aceexe, acesocketslib_for_tao { exename = SOCK_SEQPACK_srv source_files { SOCK_SEQPACK_srv.cpp @@ -49,7 +51,7 @@ project(*SOCK_SEQPACK_srv) : aceexe { } } -project(*SOCK_SEQPACK_Association_Test) : aceexe { +project(*SOCK_SEQPACK_Association_Test) : aceexe, acesocketslib_for_tao { exename = SOCK_SEQPACK_Association_Test source_files { SOCK_SEQPACK_Association_Test.cpp diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc b/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc index d4a5ce02924..90e800b468a 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc +++ b/performance-tests/Server_Concurrency/Leader_Follower/Svr_Conc_Leader_Follower.mpc @@ -2,6 +2,7 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = leader_follower source_files { leader_follower.cpp @@ -9,6 +10,7 @@ project : aceexe { } project(*RT_CORBA) : aceexe { + avoids += ace_for_tao exename = RT_CORBA_Leader_Follower source_files { RT_CORBA_Leader_Follower.cpp diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc b/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc index d916bb820ac..12566016d17 100644 --- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc +++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/Svr_Conc_Queue_Based_Workers.mpc @@ -2,6 +2,7 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = workers source_files { workers.cpp @@ -9,6 +10,7 @@ project : aceexe { } project(*RTCorba) : aceexe { + avoids += ace_for_tao exename = RT_CORBA_Workers source_files { RT_CORBA_Workers.cpp diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc index 3f34fc753a9..5e056bcf881 100644 --- a/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc +++ b/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc @@ -2,8 +2,9 @@ // $Id$ project : acelib { + avoids += ace_for_tao after += Synch_Lib libs += Synch_Lib libpaths += ../Synch_Lib includes += .. -}
\ No newline at end of file +} diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc index 3f34fc753a9..1c6fd932a6b 100644 --- a/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc +++ b/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc @@ -2,6 +2,7 @@ // $Id$ project : acelib { + avoids += ace_for_tao after += Synch_Lib libs += Synch_Lib libpaths += ../Synch_Lib diff --git a/performance-tests/TCP/TCP.mpc b/performance-tests/TCP/TCP.mpc index e2244fe35a3..09cb362e007 100644 --- a/performance-tests/TCP/TCP.mpc +++ b/performance-tests/TCP/TCP.mpc @@ -2,5 +2,6 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = tcp_test } diff --git a/performance-tests/UDP/UDP.mpc b/performance-tests/UDP/UDP.mpc index 355aba0d9db..19928979e7b 100644 --- a/performance-tests/UDP/UDP.mpc +++ b/performance-tests/UDP/UDP.mpc @@ -2,6 +2,7 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = udp_test verbatim(gnuace, local) { LDLIBS += $(MATHLIB) diff --git a/tests/tests.mpc b/tests/tests.mpc index 6c119da73b4..e023e9f2ac9 100644 --- a/tests/tests.mpc +++ b/tests/tests.mpc @@ -64,7 +64,7 @@ project(DLL Test Lib) : acelib, dll_test_parent_lib { } } -project(Based Pointer Test Lib) : acelib { +project(Based Pointer Test Lib) : acelib, acememorylib_for_tao { sharedname = Based_Pointer_Test_Lib dynamicflags = ACE_SVC_BUILD_DLL @@ -153,7 +153,7 @@ project(Auto IncDec Test) : acetest { } } -project(Barrier Test) : acetest { +project(Barrier Test) : acetest, acethreadslib_for_tao { exename = Barrier_Test Source_Files { Barrier_Test.cpp @@ -167,7 +167,7 @@ project(Basic Types Test) : acetest { } } -project(Bound Ptr Test) : acetest { +project(Bound Ptr Test) : acetest, acethreadslib_for_tao { exename = Bound_Ptr_Test Source_Files { Bound_Ptr_Test.cpp @@ -196,6 +196,7 @@ project(Cache Map Manager Test) : acetest { } project(Memcpy_Test) : acetest { + avoids += ace_for_tao exename = Memcpy_Test Source_Files { Memcpy_Test.cpp @@ -203,6 +204,7 @@ project(Memcpy_Test) : acetest { } project(Cached Accept Conn Test) : acetest { + avoids += ace_for_tao exename = Cached_Accept_Conn_Test Source_Files { Cached_Accept_Conn_Test.cpp @@ -210,6 +212,7 @@ project(Cached Accept Conn Test) : acetest { } project(Cached Allocator Test) : acetest { + avoids += ace_for_tao exename = Cached_Allocator_Test Source_Files { Cached_Allocator_Test.cpp @@ -217,6 +220,7 @@ project(Cached Allocator Test) : acetest { } project(Cached Conn Test) : acetest { + avoids += ace_for_tao exename = Cached_Conn_Test Source_Files { Cached_Conn_Test.cpp @@ -224,6 +228,7 @@ project(Cached Conn Test) : acetest { } project(Capabilities Test) : acetest { + avoids += ace_for_tao exename = Capabilities_Test Source_Files { Capabilities_Test.cpp @@ -231,6 +236,7 @@ project(Capabilities Test) : acetest { } project(CDR File Test) : acetest { + avoids += ace_for_tao exename = CDR_File_Test Source_Files { CDR_File_Test.cpp @@ -253,6 +259,7 @@ project(Collection Test) : acetest { } project(Config Test) : acetest { + avoids += ace_for_tao exename = Config_Test Source_Files { Config_Test.cpp @@ -264,6 +271,7 @@ project(Config Test) : acetest { } project(Conn Test) : acetest { + avoids += ace_for_tao exename = Conn_Test Source_Files { Conn_Test.cpp @@ -271,6 +279,7 @@ project(Conn Test) : acetest { } project(Date Time Test) : acetest { + avoids += ace_for_tao exename = Date_Time_Test Source_Files { Date_Time_Test.cpp @@ -285,6 +294,7 @@ project(Dev Poll Reactor Test) : acetest { } project(Dirent Test) : acetest { + avoids += ace_for_tao exename = Dirent_Test Source_Files { Dirent_Test.cpp @@ -292,6 +302,7 @@ project(Dirent Test) : acetest { } project(DLList Test) : acetest { + avoids += ace_for_tao exename = DLList_Test Source_Files { DLList_Test.cpp @@ -321,14 +332,14 @@ project(Env Value Test) : acetest { } } -project(Future Test) : acetest { +project(Future Test) : acetest, acethreadslib_for_tao { exename = Future_Test Source_Files { Future_Test.cpp } } -project(Future Set Test) : acetest { +project(Future Set Test) : acetest, acethreadslib_for_tao { exename = Future_Set_Test Source_Files { Future_Set_Test.cpp @@ -343,6 +354,7 @@ project(Get Opt Test) : acetest { } project(Handle Set Test) : acetest { + avoids += ace_for_tao exename = Handle_Set_Test Source_Files { Handle_Set_Test.cpp @@ -350,6 +362,7 @@ project(Handle Set Test) : acetest { } project(High Res Timer Test) : acetest { + avoids += ace_for_tao exename = High_Res_Timer_Test Source_Files { High_Res_Timer_Test.cpp @@ -392,6 +405,7 @@ project(Lazy Map Manager Test) : acetest { } project(Log Msg Test) : acetest { + avoids += ace_for_tao exename = Log_Msg_Test Source_Files { Log_Msg_Test.cpp @@ -405,7 +419,7 @@ project(Logging Strategy Test) : acetest { } } -project(Malloc Test) : acetest { +project(Malloc Test) : acetest, acememorylib_for_tao, acethreadslib_for_tao { exename = Malloc_Test Source_Files { Malloc_Test.cpp @@ -420,6 +434,7 @@ project(Manual_Event Test) : acetest { } project(Map Test) : acetest { + avoids += ace_for_tao exename = Map_Test Source_Files { Map_Test.cpp @@ -440,21 +455,21 @@ project(Max Default Port Test) : acetest { } } -project(MEM Stream Test) : acetest { +project(MEM Stream Test) : acetest, acememorylib_for_tao, acethreadslib_for_tao { exename = MEM_Stream_Test Source_Files { MEM_Stream_Test.cpp } } -project(Mem Map Test) : acetest { +project(Mem Map Test) : acetest, acememorylib_for_tao { exename = Mem_Map_Test Source_Files { Mem_Map_Test.cpp } } -project(MM Shared Memory Test) : acetest { +project(MM Shared Memory Test) : acetest, acememorylib_for_tao, acethreadslib_for_tao { exename = MM_Shared_Memory_Test Source_Files { MM_Shared_Memory_Test.cpp @@ -482,7 +497,7 @@ project(MT SOCK Test) : acetest { } } -project(Message Block Test) : acetest { +project(Message Block Test) : acetest, acethreadslib_for_tao { exename = Message_Block_Test Source_Files { Message_Block_Test.cpp @@ -490,6 +505,7 @@ project(Message Block Test) : acetest { } project(Message Queue Test) : acetest { + avoids += ace_for_tao exename = Message_Queue_Test Source_Files { Message_Queue_Test.cpp @@ -497,6 +513,7 @@ project(Message Queue Test) : acetest { } project(Message Queue Test Ex) : acetest { + avoids += ace_for_tao exename = Message_Queue_Test_Ex Source_Files { Message_Queue_Test_Ex.cpp @@ -510,7 +527,7 @@ project(Message Queue Notifications Test) : acetest { } } -project(Multicast Test) : acetest { +project(Multicast Test) : acetest, acesocketslib_for_tao { exename = Multicast_Test Source_Files { Multicast_Test.cpp @@ -574,6 +591,7 @@ project(OS Test) : acetest { } project(Proactor Scatter Gather Test) : acetest { + avoids += ace_for_tao exename = Proactor_Scatter_Gather_Test Source_Files { Proactor_Scatter_Gather_Test.cpp @@ -581,6 +599,7 @@ project(Proactor Scatter Gather Test) : acetest { } project(Proactor Test) : acetest { + avoids += ace_for_tao exename = Proactor_Test Source_Files { Proactor_Test.cpp @@ -588,34 +607,35 @@ project(Proactor Test) : acetest { } project(Proactor Timer Test) : acetest { + avoids += ace_for_tao exename = Proactor_Timer_Test Source_Files { Proactor_Timer_Test.cpp } } -project(Process Manual Event Test) : acetest { +project(Process Manual Event Test) : acetest, acethreadslib_for_tao { exename = Process_Manual_Event_Test Source_Files { Process_Manual_Event_Test.cpp } } -project(Process Mutex Test) : acetest { +project(Process Mutex Test) : acetest, acethreadslib_for_tao { exename = Process_Mutex_Test Source_Files { Process_Mutex_Test.cpp } } -project(Process Semaphore Test) : acetest { +project(Process Semaphore Test) : acetest, acethreadslib_for_tao { exename = Process_Semaphore_Test Source_Files { Process_Semaphore_Test.cpp } } -project(Process Strategy Test) : acetest { +project(Process Strategy Test) : acetest, acethreadslib_for_tao { exename = Process_Strategy_Test Source_Files { Process_Strategy_Test.cpp @@ -643,21 +663,21 @@ project(Priority Task Test) : acetest { } } -project(Priority Reactor Test) : acetest { +project(Priority Reactor Test) : acetest, acereactorlib_for_tao { exename = Priority_Reactor_Test Source_Files { Priority_Reactor_Test.cpp } } -project(Process Manager Test) : acetest { +project(Process Manager Test) : acetest, acethreadslib_for_tao { exename = Process_Manager_Test Source_Files { Process_Manager_Test.cpp } } -project(Pipe Test) : acetest { +project(Pipe Test) : acetest, acethreadslib_for_tao { exename = Pipe_Test Source_Files { Pipe_Test.cpp @@ -685,7 +705,7 @@ project(Reactor Exceptions Test) : acetest { } } -project(Reactor Notify Test) : acetest { +project(Reactor Notify Test) : acetest, acethreadslib_for_tao { exename = Reactor_Notify_Test Source_Files { Reactor_Notify_Test.cpp @@ -707,6 +727,7 @@ project(Reactor Dispatch Order Test) : acetest { } project(Reactor Performance Test) : acetest { + avoids += ace_for_tao exename = Reactor_Performance_Test Source_Files { Reactor_Performance_Test.cpp @@ -714,6 +735,7 @@ project(Reactor Performance Test) : acetest { } project(Reactor Timer Test) : acetest { + avoids += ace_for_tao exename = Reactor_Timer_Test Source_Files { Reactor_Timer_Test.cpp @@ -748,7 +770,7 @@ project(Recursive Mutex Test) : acetest { } } -project(Refcounted Auto Ptr Test) : acetest { +project(Refcounted Auto Ptr Test) : acetest, acethreadslib_for_tao { exename = Refcounted_Auto_Ptr_Test Source_Files { Refcounted_Auto_Ptr_Test.cpp @@ -819,6 +841,7 @@ project(SOCK Send Recv Test) : acetest { } project(SPIPE Test) : acetest { + avoids += ace_for_tao exename = SPIPE_Test Source_Files { SPIPE_Test.cpp @@ -840,6 +863,7 @@ project(SV Shared Memory Test) : acetest { } project(Svc Handler Test) : acetest { + avoids += ace_for_tao exename = Svc_Handler_Test Source_Files { Svc_Handler_Test.cpp @@ -916,7 +940,7 @@ project(Token Strategy Test) : acetest { } } -project(TP Reactor Test) : acetest { +project(TP Reactor Test) : acetest, acethreadslib_for_tao { exename = TP_Reactor_Test Source_Files { TP_Reactor_Test.cpp @@ -959,6 +983,7 @@ project(Upgradable RW Test) : acetest { } project(Naming Test) : acetest { + avoids += ace_for_tao exename = Naming_Test requires += ace_other @@ -1016,7 +1041,7 @@ project(TkReactor Test) : acetest,ace_tkreactor { } } -project(Codecs Test) : acetest { +project(Codecs Test) : acetest, acecodecslib_for_tao { exename = Codecs_Test requires += ace_codecs @@ -1035,6 +1060,7 @@ project(Tokens Test) : acetest { } project(CDR Array Test) : acetest { + avoids += ace_for_tao exename = CDR_Array_Test Source_Files { CDR_Array_Test.cpp @@ -1167,14 +1193,14 @@ project(Max Default Port Test IPV6) : acetest { } } -project(Multicast Test IPV6) : acetest { +project(Multicast Test IPV6) : acetest, acesocketslib_for_tao { exename = Multicast_Test_IPV6 Source_Files { Multicast_Test_IPV6.cpp } } -project(Multihomed INET Addr Test IPV6) : acetest { +project(Multihomed INET Addr Test IPV6) : acetest, acesocketslib_for_tao { exename = Multihomed_INET_Addr_Test_IPV6 Source_Files { Multihomed_INET_Addr_Test_IPV6.cpp @@ -1182,6 +1208,7 @@ project(Multihomed INET Addr Test IPV6) : acetest { } project(Proactor Test IPV6) : acetest { + avoids += ace_for_tao exename = Proactor_Test_IPV6 Source_Files { Proactor_Test_IPV6.cpp @@ -1202,14 +1229,14 @@ project(SOCK Test IPv6) : acetest { } } -project(SOCK_Dgram_Bcast_Test) : acetest { +project(SOCK_Dgram_Bcast_Test) : acetest, acesocketslib_for_tao, acethreadslib_for_tao { exename = SOCK_Dgram_Bcast_Test Source_Files { SOCK_Dgram_Bcast_Test.cpp } } -project(SOCK_SEQPACK_SCTP_Test) : acetest { +project(SOCK_SEQPACK_SCTP_Test) : acetest, acesocketslib_for_tao { exename = SOCK_SEQPACK_SCTP_Test Source_Files { SOCK_SEQPACK_SCTP_Test.cpp @@ -1227,7 +1254,7 @@ project(QtReactor Test) : acetest, ace_qtreactor { } } -project(Based Pointer Test) : acetest { +project(Based Pointer Test) : acetest, acememorylib_for_tao { after += Based_Pointer_Test_Lib exename = Based_Pointer_Test Source_Files { |