diff options
author | mbrudka <mbrudka@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-04 15:55:12 +0000 |
---|---|---|
committer | mbrudka <mbrudka@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-04 15:55:12 +0000 |
commit | cee71152826a607e68c1d1a46779cbfec495325f (patch) | |
tree | 10295064cb27813c475ecdacc2dd9e7e9ff8479a | |
parent | 106db0bdb481330862e50f8b8f97a2858fa84908 (diff) | |
download | ATCD-cee71152826a607e68c1d1a46779cbfec495325f.tar.gz |
ChangeLogTag: Sat Dec 4 16:53:18 2004 Marek Brudka <mbrudka@aster.pl>
-rw-r--r-- | ChangeLog | 21 | ||||
-rw-r--r-- | TAO/CIAO/ChangeLog | 5 | ||||
-rw-r--r-- | TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc | 2 | ||||
-rw-r--r-- | ace/ace_qtreactor.mpc | 2 | ||||
-rw-r--r-- | ace/qt_reactor.mpb | 14 | ||||
-rw-r--r-- | bin/MakeProjectCreator/config/ace_qt.mpb | 2 | ||||
-rw-r--r-- | bin/MakeProjectCreator/config/ace_qtreactor.mpb | 3 | ||||
-rwxr-xr-x | tests/.cvsignore | 154 |
8 files changed, 182 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 65c99f806ad..4192833d3d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Sat Dec 4 16:53:18 2004 Marek Brudka <mbrudka@aster.pl> + + * tests/.cvsignore (Module): + Added linux executables to prevent cvs warnings + +Sat Dec 4 16:02:30 2004 Marek Brudka <mbrudka@aster.pl> + + * ace/qt_reactor.mpb (Module): + This base project is no necessary now. + +Sat Dec 4 15:51:01 2004 Marek Brudka <mbrudka@aster.pl> + + * bin/MakeProjectCreator/config/ace_qtreactor.mpb (Module): + * ace/ace_qtreactor.mpc (Module): + Removed depracated qt_moc project. + +Sat Dec 4 15:49:03 2004 Marek Brudka <mbrudka@aster.pl> + + * ACE-INSTALL.html (Module): + Added paragraph on building ACE_QtLibrary. + Sat Dec 4 14:28:54 2004 Marek Brudka <mbrudka@aster.pl> * bin/MakeProjectCreator/config/global.features (Module): diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 7b0b3bcbe5c..75524d89135 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 4 15:49:38 2004 Marek Brudka <mbrudka@aster.pl> + + * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module): + Removed deprecated qt_moc base project. + Tue Nov 30 21:41:58 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * CIDLC/ServantSourceGenerator.cpp (namespace): diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc index e48a08219bd..cb5cea1b621 100644 --- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc +++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc @@ -1,5 +1,5 @@ // $Id$ -project(NavDisplayGUI_exec) : ciao_component, qt, qt_moc { +project(NavDisplayGUI_exec) : ciao_component, qt { after += NavDisplay_exec requires += qt sharedname = NavDisplayGUI_exec diff --git a/ace/ace_qtreactor.mpc b/ace/ace_qtreactor.mpc index f4c28609912..482bde12f72 100644 --- a/ace/ace_qtreactor.mpc +++ b/ace/ace_qtreactor.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- now wouldn't this be cool... // ace_qtreactor.mpc,v -project(ACE_QtReactor) : acedefaults, aceversion, core, acelib, ace_qt, qt_moc { +project(ACE_QtReactor) : acedefaults, aceversion, core, acelib, ace_qt { libout = $(ACE_ROOT)/lib sharedname = ACE_QtReactor dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL diff --git a/ace/qt_reactor.mpb b/ace/qt_reactor.mpb deleted file mode 100644 index e596b5e5d5c..00000000000 --- a/ace/qt_reactor.mpb +++ /dev/null @@ -1,14 +0,0 @@ -// -*- MPC -*- -// $Id$ - -feature(qt): ace_qt, qt_moc { - MOC_Files { - QtReactor.h - } - - Source_Files(ACE_COMPONENTS) { - Demux { - QtReactor_moc.cpp - } - } -} diff --git a/bin/MakeProjectCreator/config/ace_qt.mpb b/bin/MakeProjectCreator/config/ace_qt.mpb index efa49a0b678..2376c51e1e0 100644 --- a/bin/MakeProjectCreator/config/ace_qt.mpb +++ b/bin/MakeProjectCreator/config/ace_qt.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -feature(qt): qt { +project: qt { macros += ACE_HAS_QT // Depends on configration from include/makeinclude/platform_*.GNU diff --git a/bin/MakeProjectCreator/config/ace_qtreactor.mpb b/bin/MakeProjectCreator/config/ace_qtreactor.mpb index 7b74c0215ef..4245c2614eb 100644 --- a/bin/MakeProjectCreator/config/ace_qtreactor.mpb +++ b/bin/MakeProjectCreator/config/ace_qtreactor.mpb @@ -1,7 +1,6 @@ // -*- MPC -*- -project : acelib, ace_qt, qt_moc { - requires += qt_reactor +project : acelib, ace_qt { after += ACE_QtReactor libs += ACE_QtReactor } diff --git a/tests/.cvsignore b/tests/.cvsignore index bfe9b1ba53f..342f41d59d1 100755 --- a/tests/.cvsignore +++ b/tests/.cvsignore @@ -1,5 +1,155 @@ *.ilk -*.pdb -*.plg *.ncb *.opt +*.pdb +*.plg +ACE_Init_Test +ACE_Test +ARGV_Test +Aio_Platform_Test +Arg_Shifter_Test +Atomic_Op_Test +Auto_IncDec_Test +Barrier_Test +Basic_Types_Test +Bound_Ptr_Test +Buffer_Stream_Test +Bug_1576_Regression_Test +CDR_Array_Test +CDR_File_Test +CDR_Test +Cache_Map_Manager_Test +Cached_Accept_Conn_Test +Cached_Allocator_Test +Cached_Conn_Test +Capabilities_Test +Codecs_Test +Collection_Test +Config_Test +Conn_Test +DLL_Test +DLList_Test +Date_Time_Test +Dev_Poll_Reactor_Test +Dirent_Test +Dynamic_Priority_Test +Enum_Interfaces_Test +Env_Value_Test +FIFO_Test +FlReactor_Test +Framework_Component_Test +Future_Set_Test +Future_Test +Get_Opt_Test +Handle_Set_Test +Hash_Map_Bucket_Iterator_Test +Hash_Map_Manager_Test +High_Res_Timer_Test +INET_Addr_Test +INET_Addr_Test_IPV6 +IOStream_Test +Lazy_Map_Manager_Test +Log_Msg_Test +Logging_Strategy_Test +MEM_Stream_Test +MM_Shared_Memory_Test +MT_Reactor_Timer_Test +MT_Reactor_Upcall_Test +MT_Reference_Counted_Event_Handler_Test +MT_Reference_Counted_Notify_Test +MT_SOCK_Test +Malloc_Test +Map_Manager_Test +Map_Test +Max_Default_Port_Test +Max_Default_Port_Test_IPV6 +Mem_Map_Test +Message_Block_Test +Message_Queue_Notifications_Test +Message_Queue_Test +Message_Queue_Test_Ex +Multicast_Test +Multicast_Test_IPV6 +Multihomed_INET_Addr_Test +Multihomed_INET_Addr_Test_IPV6 +Naming_Test +Network_Adapters_Test +New_Fail_Test +NonBlocking_Conn_Test +Notify_Performance_Test +OS_Test +Object_Manager_Test +Obstack_Test +OrdMultiSet_Test +Pipe_Test +Priority_Buffer_Test +Priority_Reactor_Test +Priority_Task_Test +Proactor_Scatter_Gather_Test +Proactor_Test +Proactor_Test_IPV6 +Proactor_Timer_Test +Process_Manager_Test +Process_Mutex_Test +Process_Strategy_Test +QtReactor_Test +QtReactor_Test_moc.cpp +RB_Tree_Test +Reactor_Dispatch_Order_Test +Reactor_Exceptions_Test +Reactor_Notification_Queue_Test +Reactor_Notify_Test +Reactor_Performance_Test +Reactor_Registration_Test +Reactor_Timer_Test +Reactors_Test +Reader_Writer_Test +Recursive_Condition_Bug_Test +Recursive_Condition_Test +Recursive_Mutex_Test +Refcounted_Auto_Ptr_Test +Reference_Counted_Event_Handler_Test +Reverse_Lock_Test +SOCK_Connector_Test +SOCK_Dgram_Bcast_Test +SOCK_Dgram_Test +SOCK_SEQPACK_SCTP_Test +SOCK_Send_Recv_Test +SOCK_Send_Recv_Test_IPV6 +SOCK_Test +SOCK_Test_IPv6 +SPIPE_Test +SString_Test +SV_Shared_Memory_Test +Semaphore_Test +Service_Config_Test +Signal_Test +Sigset_Ops_Test +Simple_Message_Block_Test +Svc_Handler_Test +TP_Reactor_Test +TSS_Static_Test +TSS_Test +Task_Ex_Test +Task_Test +Thread_Manager_Test +Thread_Mutex_Test +Thread_Pool_Reactor_Resume_Test +Thread_Pool_Reactor_Test +Thread_Pool_Test +Time_Service_Test +Time_Value_Test +Timeprobe_Test +Timer_Cancellation_Test +Timer_Queue_Reference_Counting_Test +Timer_Queue_Test +TkReactor_Test +Token_Strategy_Test +Tokens_Test +UPIPE_SAP_Test +UUIDTest +Unbounded_Set_Test_Ex +Upgradable_RW_Test +Vector_Test +WFMO_Reactor_Test +XtReactor_Test |