diff options
Diffstat (limited to 'ACE')
301 files changed, 911 insertions, 2098 deletions
diff --git a/ACE/ACEXML/Makefile.am b/ACE/ACEXML/Makefile.am index 5e025e19d26..f0541d979c7 100644 --- a/ACE/ACEXML/Makefile.am +++ b/ACE/ACEXML/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ common \ diff --git a/ACE/ACEXML/apps/Makefile.am b/ACE/ACEXML/apps/Makefile.am index 7f7bf963687..81f0c9cbd88 100644 --- a/ACE/ACEXML/apps/Makefile.am +++ b/ACE/ACEXML/apps/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ svcconf diff --git a/ACE/ACEXML/apps/svcconf/Makefile.am b/ACE/ACEXML/apps/svcconf/Makefile.am index 0a05c085864..88cef2d99a5 100644 --- a/ACE/ACEXML/apps/svcconf/Makefile.am +++ b/ACE/ACEXML/apps/svcconf/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ACEXML/apps/svcconf diff --git a/ACE/ACEXML/common/Makefile.am b/ACE/ACEXML/common/Makefile.am index 148a0ccffb4..d2f2e33a28e 100644 --- a/ACE/ACEXML/common/Makefile.am +++ b/ACE/ACEXML/common/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ACEXML/common pkgconfigdir = @libdir@/pkgconfig @@ -118,7 +118,7 @@ CLEANFILES = \ ACEXML.pc ACEXML.pc: ${top_builddir}/config.status ${srcdir}/ACEXML.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACEXML.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACEXML.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/ACEXML/examples/Makefile.am b/ACE/ACEXML/examples/Makefile.am index 0ddb642570a..8a2494ea586 100644 --- a/ACE/ACEXML/examples/Makefile.am +++ b/ACE/ACEXML/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ SAXPrint diff --git a/ACE/ACEXML/examples/SAXPrint/Makefile.am b/ACE/ACEXML/examples/SAXPrint/Makefile.am index 8b7853648cf..e8098217c3e 100644 --- a/ACE/ACEXML/examples/SAXPrint/Makefile.am +++ b/ACE/ACEXML/examples/SAXPrint/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ACEXML/parser/Makefile.am b/ACE/ACEXML/parser/Makefile.am index 35c60abcb8d..de38e543937 100644 --- a/ACE/ACEXML/parser/Makefile.am +++ b/ACE/ACEXML/parser/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ parser diff --git a/ACE/ACEXML/parser/parser/Makefile.am b/ACE/ACEXML/parser/parser/Makefile.am index f4440e30faf..942e6a22bb4 100644 --- a/ACE/ACEXML/parser/parser/Makefile.am +++ b/ACE/ACEXML/parser/parser/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ACEXML/parser/parser pkgconfigdir = @libdir@/pkgconfig @@ -56,7 +56,7 @@ CLEANFILES = \ ACEXML_Parser.pc ACEXML_Parser.pc: ${top_builddir}/config.status ${srcdir}/ACEXML_Parser.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACEXML_Parser.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACEXML_Parser.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/ACEXML/tests/Makefile.am b/ACE/ACEXML/tests/Makefile.am index 7fdae59421a..926a3fd9212 100644 --- a/ACE/ACEXML/tests/Makefile.am +++ b/ACE/ACEXML/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ACEXML/tests/util/Makefile.am b/ACE/ACEXML/tests/util/Makefile.am index 4de2a3fd78c..486d37c1902 100644 --- a/ACE/ACEXML/tests/util/Makefile.am +++ b/ACE/ACEXML/tests/util/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/Makefile.am b/ACE/ASNMP/Makefile.am index 7ff1160c8a3..fa06f83a3c9 100644 --- a/ACE/ASNMP/Makefile.am +++ b/ACE/ASNMP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ asnmp \ diff --git a/ACE/ASNMP/agent/Makefile.am b/ACE/ASNMP/agent/Makefile.am index c19ef46e3ae..b37fe7aec9e 100644 --- a/ACE/ASNMP/agent/Makefile.am +++ b/ACE/ASNMP/agent/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/asnmp/Makefile.am b/ACE/ASNMP/asnmp/Makefile.am index 7b117dab9f6..71347a6d858 100644 --- a/ACE/ASNMP/asnmp/Makefile.am +++ b/ACE/ASNMP/asnmp/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/Makefile.am b/ACE/ASNMP/examples/Makefile.am index ba48f01c667..1855938d914 100644 --- a/ACE/ASNMP/examples/Makefile.am +++ b/ACE/ASNMP/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ get \ diff --git a/ACE/ASNMP/examples/get/Makefile.am b/ACE/ASNMP/examples/get/Makefile.am index ca0673d929d..c691338b998 100644 --- a/ACE/ASNMP/examples/get/Makefile.am +++ b/ACE/ASNMP/examples/get/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/next/Makefile.am b/ACE/ASNMP/examples/next/Makefile.am index 72495394d8a..dae95eaeaba 100644 --- a/ACE/ASNMP/examples/next/Makefile.am +++ b/ACE/ASNMP/examples/next/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/set/Makefile.am b/ACE/ASNMP/examples/set/Makefile.am index 66f049d7f34..7810a658eed 100644 --- a/ACE/ASNMP/examples/set/Makefile.am +++ b/ACE/ASNMP/examples/set/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/trap/Makefile.am b/ACE/ASNMP/examples/trap/Makefile.am index 522ef31476c..52307634b67 100644 --- a/ACE/ASNMP/examples/trap/Makefile.am +++ b/ACE/ASNMP/examples/trap/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/walk/Makefile.am b/ACE/ASNMP/examples/walk/Makefile.am index 87205a69c0a..f0bc64a36cf 100644 --- a/ACE/ASNMP/examples/walk/Makefile.am +++ b/ACE/ASNMP/examples/walk/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/tests/Makefile.am b/ACE/ASNMP/tests/Makefile.am index fc8c1f12657..0b9ae3d1ce7 100644 --- a/ACE/ASNMP/tests/Makefile.am +++ b/ACE/ASNMP/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3ed6c17170b..34ca08c3c4f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,614 +1,3 @@ -Fri Nov 24 13:27:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * bin/MakeProjectCreator/config/automake.features: - - Set stl and boost. We'll use automake conditionals to defer - this option to configure time. - -Fri Nov 24 13:05:01 UTC 2006 Olli Savia <ops@iki.fi> - - * tests/OS_Test.cpp: - Added ACE_OS::snprintf test. - -Fri Nov 24 10:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Sock_Connect.cpp: - Fixed compile errors when building on linux with no - networking support - -Thu Nov 23 17:06:17 UTC 2006 Simon McQueen <sm@prismtech.com> - - * ace/OS_Errno.h: - * ace/OS_Errno.cpp: - - Fix compile errors with g++ on Solaris with NDEBUG. - -Thu Nov 23 14:09:17 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/rules.lib.GNU: Corrected error introduced by - Wed Nov 22 21:53:17 UTC 2006 Steve Huston <shuston@riverace.com>. - -Thu Nov 23 06:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/ace_for_tao.mpb: - Added ACE_LACKS_MSG_WFMO as define, that prevents other projects - to try to use the msg wfmo reactor which is not available in the - ace_for_tao configuration - -Thu Nov 23 03:14:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * tests/Integer_Truncate_Test.cpp: - * apps/JAWS/clients/WebSTONE/src/README: - - Removed svn:executable property. - -Wed Nov 22 23:16:22 UTC 2006 Steve Huston <shuston@riverace.com> - - * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: Ignore SIGQUIT code - for platforms with ACE_LACKS_UNIX_SIGNALS. Fixes WinCE build error. - -Wed Nov 22 21:58:16 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/RB_Tree_Test.cpp: Don't use ACE_ASSERT for code - it doesn't - get executed in Release builds. - - Pulled these in from the 5.5 stream: - - Mon Nov 20 21:26:24 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-win32-msvc.h: - * ace/OS_Memory.h: - The MFC new/exception code needed the ability to delete a caught - CMemoryException object to prevent memory leaks (see - http://msdn2.microsoft.com/de-de/library/0e5twxsh(VS.80).aspx). - This necessitates that every platform other than Windows/MFC gets - an empty define for ACE_del_bad_alloc, and the ACE_NEW... macros - have ACE_del_bad_alloc expanded in the catch block. - For past history of this issue, see the trail starting at: - Tue Aug 8 09:15:00 UTC 2006 Simon Massey <sma@prismtech.com> - - Thu Nov 16 16:14:32 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/String_Base.{h inl}: Added a capacity() method that returns - the number of allocated CHAR units in the string object. Thanks to - Kelly Hickel <kfh at mqsoftware dot com> for supplying this. - - * NEWS: Updated with recent ACE_String_Base and build additions. - - Mon Nov 13 17:40:58 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/String_Base.{h cpp}: Added a fast_resize(size_t) method to - manage the sizing/reallocating of the string, but doesn't do the - memory setting of resize(). Changed resize() to call fast_resize() - then do the memory setting. - Thank you to Kelly Hickel <kfh at mqsoftware dot com> for these - additions. - - -Wed Nov 22 21:53:17 UTC 2006 Steve Huston <shuston@riverace.com> - - Pulled these in from the 5.5 stream: - - Thu Nov 16 21:56:37 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/rules.local.GNU: For creating the object file - directories (e.g., VDIR and VSHDIR, and their subdirectories), change - from using the directory as a prerequisite and make that prereq - a PHONY target to embed the command(s) to check and create the - directory if needed. This accomplishes two things: 1) allows the - make to work with clearmake in GNU compatibility mode (clearmake - always saw the PHONY target as remade and remade every file in the - project), and 2) avoids using a PHONY target as a prerequisite, - something the GNU make manual says to avoid. Thank you to Howard - Finer <hfiner at sonusnet dot com> for motivating and assisting - in this effort. - - Tue Nov 14 22:33:03 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/rules.lib.GNU: Change VLOBJS and VSHOBJS to - use $(patsubst) instead of $(if) to look for entries that have - relative directories in them (../). Avoids $(if) which does not - work in Clearcase's clearmake GNU compatibility mode. - -Wed Nov 22 19:52:23 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/Select_Reactor_T.inl: - - Add #include of "Log_Msg.h". This is required to bring things - into scope on systems where ACE_TEMPLATES_REQUIRE_SOURCE isn't - defined/needed. - -Wed Nov 22 18:27:39 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am: - - Regenerated. - - * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc: - - Add automake specific includes definition to find headers - relative to source directory. - -Wed Nov 22 16:57:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am: - - Regenerated. - - * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc: - - Add automake specific includes definition to find headers - relative to source directory. - -Wed Nov 22 16:48:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * Makefile.am: - - Hand tweak, HTBP tests depend on Test_Output library. This - requires changing the build order so that the protocols dir - is built after tests. - - * apps/gperf/tests/Makefile.am: - - Hand tweak to find gperf executable on automake builds. Chad - has given me info to make MPC generation work, which I'll add - in the near future. - - * m4/ace.m4: - - Placeholder for a BUILD_WXWINDOWS feature test. For now it - always returns false. - - * configure.ac: - - Configure examples/ConfigViewer/Makefile. - -Wed Nov 22 15:34:12 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/Version.h: - - Remove extraneous whitespace from ACE_VERSION macro definition. - - * ace/Makefile.am: - - Hand tweak. - - * ace/QoS/Makefile.am: - - Revert to earlier version until MPC generation issues are - resolved. - - * apps/JAWS2/JAWS/Makefile.am: - * apps/JAWS3/jaws3/Makefile.am: - - Regenerated. - - * apps/JAWS2/JAWS/jaws2.mpc: - * apps/JAWS3/jaws3/jaws3.mpc: - - Add automake specific includes definition to find headers - relative to source directory. - -Wed Nov 22 14:24:31 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/Makefile.am: - - Regenerated. - - * ace/ace_xtreactor.mpc: - * ace/ace_tkreactor.mpc: - * ace/ace_flreactor.mpc: - * ace/ace_qtreactor.mpc: - - Changed to specify full name of pkgconfig template file, - the MPC Custom spec does not automatically match *.pc.in - files. - -Wed Nov 22 14:16:40 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * examples/ConfigViewer/Makefile.am: - - New file. - -Wed Nov 22 14:10:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * protocols/tests/RMCast/Makefile.am: - * protocols/tests/Makefile.am: - * protocols/tests/HTBP/Reactor_Tests/Makefile.am: - * protocols/tests/HTBP/Send_Large_Msg/Makefile.am: - * protocols/tests/HTBP/Makefile.am: - * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am: - * protocols/tests/HTBP/ping/Makefile.am: - * protocols/ace/RMCast/Makefile.am: - * protocols/ace/Makefile.am: - * protocols/ace/TMCast/Makefile.am: - * protocols/ace/HTBP/Makefile.am: - * protocols/examples/RMCast/Send_Msg/Makefile.am: - * protocols/examples/RMCast/Makefile.am: - * protocols/examples/Makefile.am: - * protocols/examples/TMCast/Member/Makefile.am: - * protocols/examples/TMCast/Makefile.am: - * ace/Makefile.am: - * ace/SSL/Makefile.am: - * ace/QoS/Makefile.am: - * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am: - * performance-tests/Synch-Benchmarks/Makefile.am: - * performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am: - * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am: - * performance-tests/Server_Concurrency/Leader_Follower/Makefile.am: - * performance-tests/Server_Concurrency/Makefile.am: - * performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am: - * performance-tests/TCP/Makefile.am: - * performance-tests/UDP/Makefile.am: - * performance-tests/SCTP/Makefile.am: - * performance-tests/Makefile.am: - * performance-tests/Misc/Makefile.am: - * Kokyu/tests/FIFO/Makefile.am: - * Kokyu/tests/DSRT_MIF/Makefile.am: - * Kokyu/tests/Makefile.am: - * Kokyu/tests/EDF/Makefile.am: - * Kokyu/Makefile.am: - * tests/SSL/Makefile.am: - * tests/Makefile.am: - * apps/Gateway/Gateway/Makefile.am: - * apps/Gateway/Makefile.am: - * apps/Gateway/Peer/Makefile.am: - * apps/mkcsregdb/Makefile.am: - * apps/drwho/Makefile.am: - * apps/gperf/tests/Makefile.am: - * apps/gperf/src/Makefile.am: - * apps/gperf/Makefile.am: - * apps/JAWS/clients/Blobby/Makefile.am: - * apps/JAWS/clients/Makefile.am: - * apps/JAWS/clients/Caching/Makefile.am: - * apps/JAWS/server/Makefile.am: - * apps/JAWS/Makefile.am: - * apps/JAWS2/JAWS/Makefile.am: - * apps/JAWS2/Makefile.am: - * apps/JAWS3/jaws3/Makefile.am: - * apps/JAWS3/Makefile.am: - * apps/soreduce/Makefile.am: - * bin/Makefile.am: - * ACEXML/tests/Makefile.am: - * ACEXML/tests/util/Makefile.am: - * ACEXML/apps/svcconf/Makefile.am: - * ACEXML/apps/Makefile.am: - * ACEXML/common/Makefile.am: - * ACEXML/Makefile.am: - * ACEXML/parser/Makefile.am: - * ACEXML/parser/parser/Makefile.am: - * ACEXML/examples/SAXPrint/Makefile.am: - * ACEXML/examples/Makefile.am: - * websvcs/tests/Makefile.am: - * websvcs/lib/Makefile.am: - * websvcs/Makefile.am: - * netsvcs/clients/Logger/Makefile.am: - * netsvcs/clients/Tokens/rw_lock/Makefile.am: - * netsvcs/clients/Tokens/mutex/Makefile.am: - * netsvcs/clients/Tokens/deadlock/Makefile.am: - * netsvcs/clients/Tokens/collection/Makefile.am: - * netsvcs/clients/Tokens/invariant/Makefile.am: - * netsvcs/clients/Tokens/manual/Makefile.am: - * netsvcs/clients/Naming/Dump_Restore/Makefile.am: - * netsvcs/clients/Naming/Makefile.am: - * netsvcs/clients/Naming/Client/Makefile.am: - * netsvcs/clients/Makefile.am: - * netsvcs/lib/Makefile.am: - * netsvcs/servers/Makefile.am: - * netsvcs/Makefile.am: - * ASNMP/tests/Makefile.am: - * ASNMP/Makefile.am: - * ASNMP/agent/Makefile.am: - * ASNMP/asnmp/Makefile.am: - * ASNMP/examples/get/Makefile.am: - * ASNMP/examples/trap/Makefile.am: - * ASNMP/examples/Makefile.am: - * ASNMP/examples/set/Makefile.am: - * ASNMP/examples/next/Makefile.am: - * ASNMP/examples/walk/Makefile.am: - * examples/OS/Makefile.am: - * examples/OS/Process/Makefile.am: - * examples/Synch/Makefile.am: - * examples/Timer_Queue/Makefile.am: - * examples/Log_Msg/Makefile.am: - * examples/Misc/Makefile.am: - * examples/ASX/CCM_App/Makefile.am: - * examples/ASX/Event_Server/Transceiver/Makefile.am: - * examples/ASX/Event_Server/Event_Server/Makefile.am: - * examples/ASX/Event_Server/Makefile.am: - * examples/ASX/Message_Queue/Makefile.am: - * examples/ASX/UPIPE_Event_Server/Makefile.am: - * examples/ASX/Makefile.am: - * examples/Web_Crawler/Makefile.am: - * examples/Shared_Malloc/Makefile.am: - * examples/QOS/Change_Sender_TSpec/Makefile.am: - * examples/QOS/Diffserv/Makefile.am: - * examples/QOS/Simple/Makefile.am: - * examples/QOS/Change_Receiver_FlowSpec/Makefile.am: - * examples/Bounded_Packet_Relay/Makefile.am: - * examples/System_V_IPC/SV_Message_Queues/Makefile.am: - * examples/System_V_IPC/Makefile.am: - * examples/System_V_IPC/SV_Semaphores/Makefile.am: - * examples/Map_Manager/Makefile.am: - * examples/APG/Svc_Config/Makefile.am: - * examples/APG/ThreadSafety/Makefile.am: - * examples/APG/ThreadPools/Makefile.am: - * examples/APG/Active_Objects/Makefile.am: - * examples/APG/Logging/Makefile.am: - * examples/APG/Misc_IPC/Makefile.am: - * examples/APG/Proactor/Makefile.am: - * examples/APG/Threads/Makefile.am: - * examples/APG/Shared_Memory/Makefile.am: - * examples/APG/Reactor/Makefile.am: - * examples/APG/Signals/Makefile.am: - * examples/APG/Timers/Makefile.am: - * examples/APG/ThreadManagement/Makefile.am: - * examples/APG/Config/Makefile.am: - * examples/APG/Containers/Makefile.am: - * examples/APG/Processes/Makefile.am: - * examples/APG/Naming/Makefile.am: - * examples/APG/Makefile.am: - * examples/APG/Sockets/Makefile.am: - * examples/APG/Streams/Makefile.am: - * examples/Registry/Makefile.am: - * examples/Smart_Pointers/Makefile.am: - * examples/DLL/Makefile.am: - * examples/IPC_SAP/DEV_SAP/reader/Makefile.am: - * examples/IPC_SAP/DEV_SAP/Makefile.am: - * examples/IPC_SAP/DEV_SAP/writer/Makefile.am: - * examples/IPC_SAP/FILE_SAP/Makefile.am: - * examples/IPC_SAP/SOCK_SAP/Makefile.am: - * examples/IPC_SAP/SPIPE_SAP/Makefile.am: - * examples/IPC_SAP/ATM_SAP/Makefile.am: - * examples/IPC_SAP/SSL_SAP/Makefile.am: - * examples/IPC_SAP/UPIPE_SAP/Makefile.am: - * examples/IPC_SAP/FIFO_SAP/Makefile.am: - * examples/IPC_SAP/Makefile.am: - * examples/IPC_SAP/TLI_SAP/Makefile.am: - * examples/Logger/Acceptor-server/Makefile.am: - * examples/Logger/Makefile.am: - * examples/Logger/simple-server/Makefile.am: - * examples/Logger/client/Makefile.am: - * examples/Export/Makefile.am: - * examples/Service_Configurator/Makefile.am: - * examples/Service_Configurator/IPC-tests/server/Makefile.am: - * examples/Service_Configurator/IPC-tests/Makefile.am: - * examples/Service_Configurator/IPC-tests/client/Makefile.am: - * examples/Service_Configurator/Misc/Makefile.am: - * examples/IOStream/server/Makefile.am: - * examples/IOStream/Makefile.am: - * examples/IOStream/client/Makefile.am: - * examples/Threads/Makefile.am: - * examples/Shared_Memory/Makefile.am: - * examples/Reactor/Ntalker/Makefile.am: - * examples/Reactor/TP_Reactor/Makefile.am: - * examples/Reactor/FIFO/Makefile.am: - * examples/Reactor/Multicast/Makefile.am: - * examples/Reactor/WFMO_Reactor/Makefile.am: - * examples/Reactor/Proactor/Makefile.am: - * examples/Reactor/Makefile.am: - * examples/Reactor/Dgram/Makefile.am: - * examples/Reactor/Misc/Makefile.am: - * examples/Connection/non_blocking/Makefile.am: - * examples/Connection/blocking/Makefile.am: - * examples/Connection/Makefile.am: - * examples/Connection/misc/Makefile.am: - * examples/NT_Service/Makefile.am: - * examples/Naming/Makefile.am: - * examples/Makefile.am: - * examples/Mem_Map/IO-tests/Makefile.am: - * examples/Mem_Map/file-reverse/Makefile.am: - * examples/Mem_Map/Makefile.am: - * examples/C++NPv1/Makefile.am: - * examples/C++NPv2/Makefile.am: - - Regenerated. - -Wed Nov 22 13:45:43 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - - Update for HTBP unit test and TMCast example move. - - * protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc: - * protocols/tests/HTBP/Reactor_Tests/client.cpp: - * protocols/tests/HTBP/Reactor_Tests/inside.conf: - * protocols/tests/HTBP/Reactor_Tests/server.cpp: - * protocols/tests/HTBP/Reactor_Tests/Makefile.am: - * protocols/tests/HTBP/Reactor_Tests/test_config.h: - * protocols/tests/HTBP/Reactor_Tests/run_test.pl: - * protocols/tests/HTBP/HTBP_Config.conf: - * protocols/tests/HTBP/Send_Large_Msg/client.cpp: - * protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc: - * protocols/tests/HTBP/Send_Large_Msg/server.cpp: - * protocols/tests/HTBP/Send_Large_Msg/Makefile.am: - * protocols/tests/HTBP/Send_Large_Msg/run_test.pl: - * protocols/tests/HTBP/Makefile.am: - * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc: - * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am: - * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp: - * protocols/tests/HTBP/htbptest.mpb: - * protocols/tests/HTBP/ping/client.cpp: - * protocols/tests/HTBP/ping/server.cpp: - * protocols/tests/HTBP/ping/Makefile.am: - * protocols/tests/HTBP/ping/ping.mpc: - * protocols/tests/HTBP/ping/run_test.pl: - * protocols/tests/HTBP/README: - - Move HTBP unit tests to protocols/tests/HTBP... - - * tests/HTBP/Reactor_Tests/Reactor_Tests.mpc: - * tests/HTBP/Reactor_Tests/client.cpp: - * tests/HTBP/Reactor_Tests/inside.conf: - * tests/HTBP/Reactor_Tests/server.cpp: - * tests/HTBP/Reactor_Tests/Makefile.am: - * tests/HTBP/Reactor_Tests/test_config.h: - * tests/HTBP/Reactor_Tests/run_test.pl: - * tests/HTBP/HTBP_Config.conf: - * tests/HTBP/Send_Large_Msg/client.cpp: - * tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc: - * tests/HTBP/Send_Large_Msg/server.cpp: - * tests/HTBP/Send_Large_Msg/Makefile.am: - * tests/HTBP/Send_Large_Msg/run_test.pl: - * tests/HTBP/Makefile.am: - * tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc: - * tests/HTBP/Send_Recv_Tests/Makefile.am: - * tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp: - * tests/HTBP/htbptest.mpb: - * tests/HTBP/ping/client.cpp: - * tests/HTBP/ping/server.cpp: - * tests/HTBP/ping/Makefile.am: - * tests/HTBP/ping/ping.mpc: - * tests/HTBP/ping/run_test.pl: - * tests/HTBP/README: - - ...from tests/HTBP. - - * protocols/examples/TMCast/Member/Member.mpc: - * protocols/examples/TMCast/Member/member.cpp: - * protocols/examples/TMCast/Member/Makefile.am: - * protocols/examples/TMCast/Member/README: - * protocols/examples/TMCast/Makefile.am: - - Moved TMCast examples to protocols/examples/TMCast... - - * examples/TMCast/Member/Member.mpc: - * examples/TMCast/Member/member.cpp: - * examples/TMCast/Member/Makefile.am: - * examples/TMCast/Member/README: - * examples/TMCast/Makefile.am: - - ...from examples/TMCast. - -Wed Nov 22 13:25:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ace_for_tao.mpc: - Add uuid as base project. For building COIOP as part of the - TAO strategies library we need uuid. The nicest solution would - be to make the uuid feature dependent on the ace_for_tao - feature and let the user overrule this but that is not - possible yet. If you are using ace_for_tao and don't want - to have uuid pulled in, set uuid explicitly to 0 in your - default.features file. - -Wed Nov 22 10:48:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Log_Msg.cpp: - Refactored handling of %W. Added a check for a nill pointer - as we have for ascii strings. Fixes bugzilla 2277. - - * tests/Log_Msg_Test.cpp: - Added test for %W with a string as argument and with a - nill pointer. Fixes bugzilla 2715. - -Wed Nov 22 10:38:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Misc/test_XtReactor1.cpp: - * examples/Misc/test_XtReactor2.cpp: - * tests/FlReactor_Test.cpp: - * tests/XtReactor_Test.cpp: - * tests/TkReactor_Test.cpp: - * tests/QtReactor_Test.cpp: - Updated because of move below. - -Wed Nov 22 10:35:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/QtReactor*.*: - * ace/FlReactor*.*: - * ace/XtReactor*.*: - * ace/TkReactor*.*: - Moved these reactors to their own subdirectories to make - maintenance a lot easier. - -Wed Nov 22 10:45:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/core_anytypecode.mpb: - Removed svn:executable property - - * bin/MakeProjectCreator/config/core_strategies.mpb - New base project for the strategies library when build in - ace_for_tao configuration - - * bin/MakeProjectCreator/config/orbsvcslib.mpb: - Removed -GT so that we also don't generate TIE files for the - orbsvcs anymore. Will speedup builds and simplify other mpc - files - - * bin/MakeProjectCreator/config/strategies.mpb - Derive from core_strategies. Now the strategies library - does get build in an ace_for_tao configuration but - shmiop and uiop are not build at all, other protocols - can be build. This way we can build COIOP in an ace_for_tao - setup - - * bin/make_release: - Removed dsp/dsw reference, corrected naming of the ACE - packages when the version number gets added. - - * include/makeinclude/platform_hpux_aCC.GNU: - Removed HPUX 10.20 support - - * include/makeinclude/platform_lynxos.GNU: - ACE_HAS_BROKEN_THREAD_KEYFREE is now set in the config file - - * include/makeinclude/wrapper_macros.GNU: - Removed ACE_HAS_GNUG_PRE_2_8 checks - -Wed Nov 22 09:07:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/run_test.txt: - Document ACE_RUN_VX_TGT_HOST - - * docs/bczar/bczar.html: - Updated this file - - * ace/config-freebsd.h: - * ace/POSIX_Proactor.cpp: - Added ACE_HAS_SIGVAL_SIGVAL_INT, this fixes bugzilla - bug 2716. Thanks to Craig Rodrigues - <rodrigc at crodrigues dot org> for reporting this. - - * ace/ace.mpc: - Added missing OS.inl. This fixes bugzilla bug 2705. - Thanks to Daniel Black <dragonheart at gentoo dot org> - for reporting this. - - * Release: - Removed dsw files - - * ace/config-rtems.h: - * ace/config-posix-nonetworking.h: - Moved the configuration to build without no networking - support to its own file so that we can reuse this for - example on linux - - * ace/config-rtems.h: - Added support for rtems 4.7 - - * ace/config-unixware-7.1.0.udk.h: - Cleanup - - * ace/config-lyxos.h: - Added support for LynxOS 4.2 - - * ace/config-linux.h: - * ace/config-linux-common.h: - Moved ACE_HAS_GETIFADDRS to the common file and added - support for ACE_LACKS_NETWORKING on linux - - * ace/INET_Addr.cpp: - * ace/OS_NS_netdb.cpp - Fixed compile problem when using ACE_LACKS_NETWORKING on - linux - - * ace/Obstack.h: - Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors - on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for - reporting this and testing out the patch. - - * ace/OS_NS_string.inl: - Initialise pointer with 0 - Mon Nov 20 08:16:34 2006 Simon McQueen <sm@prismtech.com> * ACE version 5.5.4 released. diff --git a/ACE/Kokyu/Makefile.am b/ACE/Kokyu/Makefile.am index 86deb01005e..8a68d21c2eb 100644 --- a/ACE/Kokyu/Makefile.am +++ b/ACE/Kokyu/Makefile.am @@ -2,11 +2,6 @@ ## ## $Id$ ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/Kokyu pkgconfigdir = @libdir@/pkgconfig @@ -35,7 +30,7 @@ libKokyu_la_SOURCES = \ Kokyu_defs.cpp libKokyu_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ + -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ libKokyu_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la @@ -65,11 +60,7 @@ nobase_include_HEADERS = \ Kokyu_dsrt.h \ Kokyu_dsrt.inl -pkgconfig_DATA = \ - Kokyu.pc - -CLEANFILES = \ - Kokyu.pc +pkgconfig_DATA = Kokyu.pc Kokyu.pc: ${top_builddir}/config.status ${srcdir}/Kokyu.pc.in ${top_builddir}/config.status --file $@:${srcdir}/Kokyu.pc.in diff --git a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am index 4ed16f988cd..9e51858b971 100644 --- a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am +++ b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am @@ -6,16 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) - -## Makefile.DSRT_MIF.am - -if !BUILD_ACE_FOR_TAO - +## Makefile.DSRT_MIF.am noinst_PROGRAMS = MIF MIF_CPPFLAGS = \ @@ -27,10 +23,8 @@ MIF_SOURCES = \ MIF.cpp MIF_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO + $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/EDF/Makefile.am b/ACE/Kokyu/tests/EDF/Makefile.am index 9aa8fcdf71d..22b09e8251a 100644 --- a/ACE/Kokyu/tests/EDF/Makefile.am +++ b/ACE/Kokyu/tests/EDF/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.EDF.am - +## Makefile.EDF.am noinst_PROGRAMS = EDF EDF_CPPFLAGS = \ @@ -24,8 +23,8 @@ EDF_SOURCES = \ test.cpp EDF_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/FIFO/Makefile.am b/ACE/Kokyu/tests/FIFO/Makefile.am index 05b7dbe9e38..9852af122e0 100644 --- a/ACE/Kokyu/tests/FIFO/Makefile.am +++ b/ACE/Kokyu/tests/FIFO/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.FIFO.am - +## Makefile.FIFO.am noinst_PROGRAMS = FIFO FIFO_CPPFLAGS = \ @@ -24,8 +23,8 @@ FIFO_SOURCES = \ test.cpp FIFO_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/Makefile.am b/ACE/Kokyu/tests/Makefile.am index 9745459d4e3..39737061deb 100644 --- a/ACE/Kokyu/tests/Makefile.am +++ b/ACE/Kokyu/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc SUBDIRS = \ DSRT_MIF \ diff --git a/ACE/Makefile.am b/ACE/Makefile.am index b659276338c..340e2a53ff1 100644 --- a/ACE/Makefile.am +++ b/ACE/Makefile.am @@ -19,7 +19,8 @@ endif SUBDIRS += \ apps \ bin \ - netsvcs + netsvcs \ + protocols if BUILD_EXAMPLES SUBDIRS += examples @@ -31,7 +32,6 @@ SUBDIRS += tests endif SUBDIRS += \ - protocols \ websvcs \ @KOKYU@ \ @TAO@ @@ -5,44 +5,6 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) . (Remedy) RTEMS port -PLANNED CHANGES FOR "ACE-5.5.5" -=============================== -* (OO) Minor 64 bit file offset fixes for ACE AIO classes on HP-UX. -* (OO) Various other fixes that have been piling up. - -USER VISIBLE CHANGES BETWEEN ACE-5.5.4 and ACE-5.5.5 -==================================================== - -. There are a number of new methods defined on ACE_String_Base<CHAR>: - - size_t capacity (void) const: This method returns the number - of allocated CHAR units in the string object. - - void fast_resize (size_t): This method manage the sizing/reallocating - of the string, but doesn't do the memory setting of resize(). - - bool operator!= (const CHAR *) const - bool operator== (const CHAR *) const: These methods compare the - string with a nul-terminated CHAR* string. - - nonmember functions operator== and operator!= where also added - that compare const ACE_String_Base and const CHAR*; these make - it possible to switch ACE_String and CHAR* on either side of - the operator. - - Thank you to Kelly Hickel <kfh at mqsoftware dot com> for these additions. - -. There are 2 new build options on the traditional make command: - dmalloc and mtrace. When specified at build time (e.g. make mtrace=1) - the PLATFORM_DMALLOC_CPPFLAGS and/or PLATFORM_MTRACE_CPPFLAGS values - are added to CPPFLAGS. For dmalloc, the PLATFORM_DMALLOC_LDFLAGS and - PLATFORM_DMALLOC_LIBS are added to LDFLAGS and LIBS, respectively. - Thank you to Howard Finer for supplying these additions. - -. Added the ability to specify additional purify and quantify command-line - options by setting PLATFORM_PURIFY_OPTIONS and PLATFORM_QUANTIFY_OPTIONS, - respectively. Thank you to Howard Finer for supplying these additions. - USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4 ==================================================== diff --git a/ACE/Release b/ACE/Release index 6072314a11f..bec32e4a29c 100644 --- a/ACE/Release +++ b/ACE/Release @@ -86,6 +86,7 @@ RELEASE_FILES = \ $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \ ACE_wrappers/ACE-INSTALL \ ACE_wrappers/GNUmake* \ + ACE_wrappers/*.dsw \ ACE_wrappers/*.sln \ ACE_wrappers/*.bor \ ACE_wrappers/*.vcw \ @@ -117,10 +118,10 @@ RELEASE_LIB_FILES = \ RELEASE_TAG_FILES = \ html -.PHONY: tag ACE TAO CIAO acesources taosources ciaosources +.PHONY: tag ACE TAO CIAO acesources taosources ciaosources .PHONY: allsources manpages all -# Some useful defines which are used to create the release bundle. +# Some useful defines which are used to create the release bundle. ACE_TAG_VALUE = $(shell head -1 VERSION | perl -ne \ 's/.* ([\d\.]+),.*\n/$$1/; tr/./_/; print "ACE-$$_";') ACE_TAG = -ta $(ACE_TAG_VALUE) @@ -162,22 +163,22 @@ acesources: $(APPLY_NEW_TAG) @$(ACE_ROOT)/bin/make_release -k ace $(ACE_TAG) \ $(INSTALL_KIT) $(ZIP_FILES) $(CHECK) -#### The following target is for use by the TAO Release target. It -#### should not be called directly from the command line. This is +#### The following target is for use by the TAO Release target. It +#### should not be called directly from the command line. This is #### invoked by the TAO target this Release file. taosources: @$(ACE_ROOT)/bin/make_release -k ace+tao $(ACE_TAG) $(TAO_TAG) \ $(INSTALL_KIT) $(ZIP_FILES) $(CHECK) -#### The following target is for use by the TAO Release target. It -#### should not be called directly from the command line. This is +#### The following target is for use by the TAO Release target. It +#### should not be called directly from the command line. This is #### invoked by the TAO target this Release file. ciaosources: @$(ACE_ROOT)/bin/make_release -k ace+tao+ciao $(ACE_TAG) $(TAO_TAG) $(CIAO_TAG) \ $(INSTALL_KIT) $(ZIP_FILES) $(CHECK) ######################################################################### -## The following targets are a matter of convinience. We don't +## The following targets are a matter of convinience. We don't ## believe that we ever will release ACE+TAO+CIAO seperately. If that ## happens then we have these to help us out. ######################################################################### diff --git a/ACE/THANKS b/ACE/THANKS index 11f2984daa9..4936d09d3ab 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2160,9 +2160,6 @@ N Johnson <nj at artesys dot info> Adam Nagel <nagelar at isis dot vanderbilt dot edu> Robert Neumann <robert dot neumann at gmail dot com> Venkat <swara101 at yahoo dot com> -Juraj Ivancic <juraj dot ivancic at gmail dot com> -Daniel Black <dragonheart at gentoo dot org> -Richard Ridgway <Richard_Ridgway at ml dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/FlReactor/ACE_FlReactor.pc.in b/ACE/ace/ACE_FlReactor.pc.in index c284481585d..c284481585d 100644 --- a/ACE/ace/FlReactor/ACE_FlReactor.pc.in +++ b/ACE/ace/ACE_FlReactor.pc.in diff --git a/ACE/ace/FlReactor/ACE_FlReactor_export.h b/ACE/ace/ACE_FlReactor_export.h index f46b66cb3f7..f46b66cb3f7 100644 --- a/ACE/ace/FlReactor/ACE_FlReactor_export.h +++ b/ACE/ace/ACE_FlReactor_export.h diff --git a/ACE/ace/QtReactor/ACE_QtReactor.pc.in b/ACE/ace/ACE_QtReactor.pc.in index 4e7aa83e6be..4e7aa83e6be 100644 --- a/ACE/ace/QtReactor/ACE_QtReactor.pc.in +++ b/ACE/ace/ACE_QtReactor.pc.in diff --git a/ACE/ace/QtReactor/ACE_QtReactor_export.h b/ACE/ace/ACE_QtReactor_export.h index f7192051a29..f7192051a29 100644 --- a/ACE/ace/QtReactor/ACE_QtReactor_export.h +++ b/ACE/ace/ACE_QtReactor_export.h diff --git a/ACE/ace/TkReactor/ACE_TkReactor.pc.in b/ACE/ace/ACE_TkReactor.pc.in index e53797e600c..e53797e600c 100644 --- a/ACE/ace/TkReactor/ACE_TkReactor.pc.in +++ b/ACE/ace/ACE_TkReactor.pc.in diff --git a/ACE/ace/TkReactor/ACE_TkReactor_export.h b/ACE/ace/ACE_TkReactor_export.h index bd74f861e60..bd74f861e60 100644 --- a/ACE/ace/TkReactor/ACE_TkReactor_export.h +++ b/ACE/ace/ACE_TkReactor_export.h diff --git a/ACE/ace/XtReactor/ACE_XtReactor.pc.in b/ACE/ace/ACE_XtReactor.pc.in index 118c61c5632..118c61c5632 100644 --- a/ACE/ace/XtReactor/ACE_XtReactor.pc.in +++ b/ACE/ace/ACE_XtReactor.pc.in diff --git a/ACE/ace/XtReactor/ACE_XtReactor_export.h b/ACE/ace/ACE_XtReactor_export.h index 3d9049cb7af..3d9049cb7af 100644 --- a/ACE/ace/XtReactor/ACE_XtReactor_export.h +++ b/ACE/ace/ACE_XtReactor_export.h diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor.cpp index 611b9a14a19..f45ce67a994 100644 --- a/ACE/ace/FlReactor/FlReactor.cpp +++ b/ACE/ace/FlReactor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/FlReactor/FlReactor.h" +#include "ace/FlReactor.h" ACE_RCSID(ace, FlReactor, "$Id$") diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor.h index e35572b99e1..5126c52e0aa 100644 --- a/ACE/ace/FlReactor/FlReactor.h +++ b/ACE/ace/FlReactor.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/FlReactor/ACE_FlReactor_export.h" +#include "ace/ACE_FlReactor_export.h" #include "ace/Select_Reactor.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index 63dd22fbdfb..e65a1529849 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -660,18 +660,12 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); -#if !defined (ACE_LACKS_HTONL) this->reset (); if (this->set (port_name, htonl (inet_address), protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); -#else - ACE_UNUSED_ARG (port_name); - ACE_UNUSED_ARG (inet_address); - ACE_UNUSED_ARG (protocol); -#endif } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 0d399caa9ab..52866c75050 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -1701,26 +1701,33 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'W': { -#if defined (ACE_HAS_WCHAR) +#if defined (ACE_WIN32) + ACE_TCHAR *wstr = va_arg (argp, ACE_TCHAR *); +# if defined (ACE_USES_WCHAR) + ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); +# else /* ACE_USES_WCHAR */ + ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); +# endif /* ACE_USES_WCHAR */ + if (can_check) + this_len = ACE_OS::snprintf + (bp, bspace, format, wstr ? wstr : ACE_LIB_TEXT ("(null)")); + else + this_len = ACE_OS::sprintf + (bp, format, wstr ? wstr : ACE_LIB_TEXT ("(null)")); +#elif defined (ACE_HAS_WCHAR) wchar_t *wchar_str = va_arg (argp, wchar_t *); # if defined (HPUX) ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); -# elif defined (ACE_WIN32) -# if defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); -# else /* ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); -# endif /* ACE_USES_WCHAR */ # else ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); # endif /* HPUX */ if (can_check) this_len = ACE_OS::snprintf - (bp, bspace, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)")); + (bp, bspace, format, wchar_str); else this_len = ACE_OS::sprintf - (bp, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)")); -#endif /* ACE_HAS_WCHAR */ + (bp, format, wchar_str); +#endif /* ACE_WIN32 / ACE_HAS_WCHAR */ ACE_UPDATE_COUNT (bspace, this_len); } break; diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index 955b88be851..845a3ec75ee 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ace pkgconfigdir = @libdir@/pkgconfig @@ -16,7 +16,7 @@ ACE_ROOT = $(top_srcdir) SUBDIRS = \ . \ - QoS \ + QoS \ SSL CLEANFILES = @@ -33,6 +33,8 @@ lib_LTLIBRARIES += libACE.la libACE_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ + -DACE_HAS_ACE_TOKEN \ + -DACE_HAS_ACE_SVCCONF \ -DACE_BUILD_DLL libACE_la_SOURCES = \ @@ -239,7 +241,6 @@ libACE_la_SOURCES = \ Registry_Name_Space.cpp \ Remote_Name_Space.cpp \ Remote_Tokens.cpp \ - Rtems_init.c \ SOCK.cpp \ SOCK_Acceptor.cpp \ SOCK_CODgram.cpp \ @@ -391,7 +392,6 @@ nobase_include_HEADERS += \ Asynch_Pseudo_Task.h \ Atomic_Op.h \ Atomic_Op.inl \ - Atomic_Op_Sparc.h \ Atomic_Op_T.cpp \ Atomic_Op_T.h \ Atomic_Op_T.inl \ @@ -568,9 +568,6 @@ nobase_include_HEADERS += \ Hash_Map_With_Allocator_T.cpp \ Hash_Map_With_Allocator_T.h \ Hash_Map_With_Allocator_T.inl \ - Hash_Multi_Map_Manager_T.cpp \ - Hash_Multi_Map_Manager_T.h \ - Hash_Multi_Map_Manager_T.inl \ Hashable.h \ Hashable.inl \ High_Res_Timer.h \ @@ -1211,7 +1208,7 @@ CLEANFILES += \ ACE.pc ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE.pc.in endif !BUILD_ACE_FOR_TAO @@ -1235,7 +1232,7 @@ libACE_FlReactor_la_CPPFLAGS = \ -DACE_FLREACTOR_BUILD_DLL libACE_FlReactor_la_SOURCES = \ - FlReactor/FlReactor.cpp + FlReactor.cpp libACE_FlReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_FLTK_LDFLAGS) @@ -1245,8 +1242,8 @@ libACE_FlReactor_la_LIBADD = \ $(ACE_FLTK_LIBS) nobase_include_HEADERS += \ - FlReactor/ACE_FlReactor_export.h \ - FlReactor/FlReactor.h + ACE_FlReactor_export.h \ + FlReactor.h pkgconfig_DATA += \ ACE_FlReactor.pc @@ -1254,15 +1251,15 @@ pkgconfig_DATA += \ CLEANFILES += \ ACE_FlReactor.pc -ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/FlReactor/ACE_FlReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/FlReactor/ACE_FlReactor.pc.in +ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_FlReactor.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_FlReactor.pc.in endif BUILD_X11 endif BUILD_GL endif BUILD_FL EXTRA_DIST += \ - FlReactor/ACE_FlReactor.pc.in + ACE_FlReactor.pc.in ## Makefile.ACE_QtReactor.am @@ -1270,13 +1267,13 @@ EXTRA_DIST += \ if BUILD_QT BUILT_SOURCES = \ - QtReactor/QtReactor_moc.cpp + QtReactor_moc.cpp CLEANFILES += \ - QtReactor/QtReactor_moc.cpp + QtReactor_moc.cpp -QtReactor/QtReactor_moc.cpp: $(srcdir)/QtReactor/QtReactor.h - $(QTDIR)/bin/moc $(srcdir)/QtReactor/QtReactor.h -o QtReactor/QtReactor_moc.cpp +QtReactor_moc.cpp: $(srcdir)/QtReactor.h + $(QTDIR)/bin/moc -o QtReactor_moc.cpp $(srcdir)/QtReactor.h lib_LTLIBRARIES += libACE_QtReactor.la @@ -1287,8 +1284,8 @@ libACE_QtReactor_la_CPPFLAGS = \ -DACE_QTREACTOR_BUILD_DLL libACE_QtReactor_la_SOURCES = \ - QtReactor/QtReactor.cpp \ - QtReactor/QtReactor_moc.cpp + QtReactor.cpp \ + QtReactor_moc.cpp libACE_QtReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_QT_LDFLAGS) @@ -1298,8 +1295,8 @@ libACE_QtReactor_la_LIBADD = \ $(ACE_QT_LIBS) nobase_include_HEADERS += \ - QtReactor/ACE_QtReactor_export.h \ - QtReactor/QtReactor.h + ACE_QtReactor_export.h \ + QtReactor.h pkgconfig_DATA += \ ACE_QtReactor.pc @@ -1307,13 +1304,13 @@ pkgconfig_DATA += \ CLEANFILES += \ ACE_QtReactor.pc -ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/QtReactor/ACE_QtReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/QtReactor/ACE_QtReactor.pc.in +ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_QtReactor.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_QtReactor.pc.in endif BUILD_QT EXTRA_DIST += \ - QtReactor/ACE_QtReactor.pc.in + ACE_QtReactor.pc.in ## Makefile.ACE_TkReactor.am @@ -1330,7 +1327,7 @@ libACE_TkReactor_la_CPPFLAGS = \ -DACE_TKREACTOR_BUILD_DLL libACE_TkReactor_la_SOURCES = \ - TkReactor/TkReactor.cpp + TkReactor.cpp libACE_TkReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) @@ -1341,8 +1338,8 @@ libACE_TkReactor_la_LIBADD = \ $(ACE_TCL_LIBS) nobase_include_HEADERS += \ - TkReactor/ACE_TkReactor_export.h \ - TkReactor/TkReactor.h + ACE_TkReactor_export.h \ + TkReactor.h pkgconfig_DATA += \ ACE_TkReactor.pc @@ -1350,13 +1347,13 @@ pkgconfig_DATA += \ CLEANFILES += \ ACE_TkReactor.pc -ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/TkReactor/ACE_TkReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TkReactor/ACE_TkReactor.pc.in +ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_TkReactor.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_TkReactor.pc.in endif BUILD_TK EXTRA_DIST += \ - TkReactor/ACE_TkReactor.pc.in + ACE_TkReactor.pc.in ## Makefile.ACE_XtReactor.am @@ -1374,7 +1371,7 @@ libACE_XtReactor_la_CPPFLAGS = \ -DACE_XTREACTOR_BUILD_DLL libACE_XtReactor_la_SOURCES = \ - XtReactor/XtReactor.cpp + XtReactor.cpp libACE_XtReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) @@ -1385,8 +1382,8 @@ libACE_XtReactor_la_LIBADD = \ $(ACE_X11_LIBS) nobase_include_HEADERS += \ - XtReactor/ACE_XtReactor_export.h \ - XtReactor/XtReactor.h + ACE_XtReactor_export.h \ + XtReactor.h pkgconfig_DATA += \ ACE_XtReactor.pc @@ -1394,14 +1391,14 @@ pkgconfig_DATA += \ CLEANFILES += \ ACE_XtReactor.pc -ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/XtReactor/ACE_XtReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/XtReactor/ACE_XtReactor.pc.in +ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_XtReactor.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_XtReactor.pc.in endif BUILD_XT endif BUILD_X11 EXTRA_DIST += \ - XtReactor/ACE_XtReactor.pc.in + ACE_XtReactor.pc.in ## Clean up template repositories, etc. diff --git a/ACE/ace/OS_Errno.cpp b/ACE/ace/OS_Errno.cpp index 6f9905cad1f..25266ae5c55 100644 --- a/ACE/ace/OS_Errno.cpp +++ b/ACE/ace/OS_Errno.cpp @@ -6,10 +6,9 @@ ACE_RCSID(ace, OS_Errno, "$Id$") // Inlining this class on debug builds with gcc on Solaris can cause -// deadlocks during static initialization. On non debug builds it -// causes compilation errors. +// deadlocks during static initialization. #if !defined (ACE_HAS_INLINED_OSCALLS) || \ - (defined (__GNUG__) && defined (__sun__)) + (defined (__GNUG__) && defined (__sun__) && !defined (ACE_NDEBUG)) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h index 077aff14ff8..d67868631c1 100644 --- a/ACE/ace/OS_Errno.h +++ b/ACE/ace/OS_Errno.h @@ -86,10 +86,9 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL // Inlining this class on debug builds with gcc on Solaris can cause -// deadlocks during static initialization. On non debug builds it -// causes compilation errors. +// deadlocks during static initialization. #if defined (ACE_HAS_INLINED_OSCALLS) && \ - (!defined (__GNUG__) || !defined (__sun__)) + (!defined (__GNUG__) || !defined (__sun__) || defined (ACE_NDEBUG)) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h index 70716bedfc2..2ca472e762e 100644 --- a/ACE/ace/OS_Memory.h +++ b/ACE/ace/OS_Memory.h @@ -81,19 +81,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif #endif -// The Windows MFC exception mechanism requires that a caught CException -// (including the CMemoryException in use here) be freed using its Delete() -// method. Thus, when MFC is in use and we're catching exceptions as a result -// of new(), the exception's Delete() method has to be called. No other -// platform imposes this sort of restriction/requirement. The Windows -// config stuff (at least for MSVC/MFC) defines a ACE_del_bad_alloc macro -// that works with its ACE_bad_alloc macro to implement this cleanup -// requirement. Since no other platform requires this, define it as -// empty here. -#if !defined (ACE_del_bad_alloc) -# define ACE_del_bad_alloc -#endif - #if defined (ACE_NEW_THROWS_EXCEPTIONS) // Since new() throws exceptions, we need a way to avoid passing @@ -158,7 +145,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL # elif defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) # include /**/ <new> # if !defined (ACE_bad_alloc) -# define ACE_bad_alloc std::bad_alloc + // MFC changes the behavior of operator new at all MSVC versions from 6 up. +# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) +# define ACE_bad_alloc CMemoryException* +# else +# define ACE_bad_alloc std::bad_alloc +# endif # endif # define ACE_nothrow std::nothrow # define ACE_nothrow_t std::nothrow_t @@ -171,7 +163,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL # else # include /**/ <new> # if !defined (ACE_bad_alloc) -# define ACE_bad_alloc bad_alloc + // MFC changes the behavior of operator new at all MSVC versions from 6 up. +# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) +# define ACE_bad_alloc CMemoryException* +# else +# define ACE_bad_alloc bad_alloc +# endif # endif # define ACE_nothrow nothrow # define ACE_nothrow_t nothrow_t @@ -201,17 +198,17 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; return RET_VAL; } \ + catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; return RET_VAL; } \ } while (0) # define ACE_NEW(POINTER,CONSTRUCTOR) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; return; } \ + catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; return; } \ } while (0) # define ACE_NEW_NORETURN(POINTER,CONSTRUCTOR) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; } \ + catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; } \ } while (0) # endif /* ACE_HAS_NEW_NOTHROW */ diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index a788714eefd..92a853b2895 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -356,7 +356,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) return 0; -#elif defined (linux) && !defined (ACE_LACKS_NETWORKING) +#elif defined (linux) struct ifreq ifr; diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl index 204ea5db435..c1b8aef93e5 100644 --- a/ACE/ace/OS_NS_string.inl +++ b/ACE/ace/OS_NS_string.inl @@ -525,7 +525,7 @@ ACE_INLINE wchar_t * ACE_OS::strtok (wchar_t *s, const wchar_t *tokens) { #if defined (ACE_HAS_3_PARAM_WCSTOK) - static wchar_t *lasts = 0; + static wchar_t *lasts; return ::wcstok (s, tokens, &lasts); #else return ::wcstok (s, tokens); diff --git a/ACE/ace/Obstack.h b/ACE/ace/Obstack.h index 81b9f7ab105..511f7715f69 100644 --- a/ACE/ace/Obstack.h +++ b/ACE/ace/Obstack.h @@ -21,7 +21,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_EXPORT_SINGLETON_DECLARATION (ACE_Obstack_T <char>;) +ACE_SINGLETON_DECLARATION (ACE_Obstack_T <char>;) typedef ACE_Obstack_T<char> ACE_Obstack; diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 395f5a08a32..1664200ecf6 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -1720,7 +1720,7 @@ int ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) { // Get this process id. - pid_t const pid = ACE_OS::getpid (); + pid_t pid = ACE_OS::getpid (); if (pid == (pid_t) -1) ACE_ERROR_RETURN ((LM_ERROR, "Error:%N:%l(%P | %t):%p", @@ -1729,11 +1729,11 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) // Set the signal information. sigval value; -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) value.sigval_int = -1; #else value.sival_int = -1; -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif /* __FreeBSD__ */ // Queue the signal. if (sigqueue (pid, sig_num, value) == 0) @@ -1870,11 +1870,11 @@ ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) // store index!!, not pointer in signal info result->aio_sigevent.sigev_notify = SIGEV_SIGNAL; result->aio_sigevent.sigev_signo = result->signal_number (); -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) result->aio_sigevent.sigev_value.sigval_int = static_cast<int> (i); #else result->aio_sigevent.sigev_value.sival_int = static_cast<int> (i); -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif /* __FreeBSD__ */ return static_cast<ssize_t> (i); } @@ -1922,11 +1922,11 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) flg_aio = 1; // AIO signal received // define index to start // nothing will happen if it contains garbage -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) index = static_cast<size_t> (sig_info.si_value.sigval_int); #else index = static_cast<size_t> (sig_info.si_value.sival_int); -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif // Assume we have a correctly-functioning implementation, and that // there is one I/O to process, and it's correctly specified in the // siginfo received. There are, however, some special situations diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor.cpp index 79d196fc2a7..a6983ab9463 100644 --- a/ACE/ace/QtReactor/QtReactor.cpp +++ b/ACE/ace/QtReactor.cpp @@ -1,6 +1,6 @@ //$Id$ -#include "ace/QtReactor/QtReactor.h" +#include "ace/QtReactor.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor.h index 33e50058c15..c3ccb82f7f3 100644 --- a/ACE/ace/QtReactor/QtReactor.h +++ b/ACE/ace/QtReactor.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "ace/QtReactor/ACE_QtReactor_export.h" +#include "ace/ACE_QtReactor_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c index a6c62c66d52..4ed83fd7696 100644 --- a/ACE/ace/Rtems_init.c +++ b/ACE/ace/Rtems_init.c @@ -205,8 +205,6 @@ struct rtems_bsdnet_config rtems_bsdnet_config = { #endif /* ACE_LACKS_NETWORKING */ -extern int main (int, char *[]); - /* * RTEMS Startup Task */ @@ -219,7 +217,7 @@ Init (rtems_task_argument not_used) rtems_bsdnet_initialize_network (); rtems_bsdnet_show_inet_routes (); #endif /* ACE_LACKS_NETWORKING */ - int retval = main (0, 0); + exit (0); } #elif !defined (__GNUC__) diff --git a/ACE/ace/SSL/Makefile.am b/ACE/ace/SSL/Makefile.am index 135fa9b937b..b5ca23f600e 100644 --- a/ACE/ace/SSL/Makefile.am +++ b/ACE/ace/SSL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ace/SSL pkgconfigdir = @libdir@/pkgconfig @@ -18,7 +18,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.SSL.am if BUILD_SSL -if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES = libACE_SSL.la @@ -67,9 +66,8 @@ CLEANFILES = \ ACE_SSL.pc ACE_SSL.pc: ${top_builddir}/config.status ${srcdir}/ACE_SSL.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_SSL.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_SSL.pc.in -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL EXTRA_DIST = \ diff --git a/ACE/ace/Select_Reactor_T.inl b/ACE/ace/Select_Reactor_T.inl index ebbdfba1e5f..0ad9033f9a0 100644 --- a/ACE/ace/Select_Reactor_T.inl +++ b/ACE/ace/Select_Reactor_T.inl @@ -4,7 +4,6 @@ #include "ace/Reactor.h" #include "ace/Signal.h" -#include "ace/Sig_Handler.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 5bce2dd0ada..5737aff7f2e 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -1599,7 +1599,7 @@ ACE::get_ip_interfaces (size_t &count, #elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600) return get_ip_interfaces_vxworks_lt600 (count, addrs); -#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS)) && !defined (ACE_LACKS_NETWORKING) +#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) // COMMON (SVR4 and BSD) UNIX CODE size_t num_ifs, num_ifs_found; @@ -1835,7 +1835,7 @@ ACE::count_interfaces (ACE_HANDLE handle, # endif /* SIOCGLIFNUM */ return 0; -#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS)) && !defined (ACE_LACKS_NETWORKING) +#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) // Note: DEC CXX doesn't define "unix". BSD compatible OS: HP UX, // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp index 525dcbc2553..01de0963b72 100644 --- a/ACE/ace/String_Base.cpp +++ b/ACE/ace/String_Base.cpp @@ -267,29 +267,19 @@ ACE_String_Base<CHAR>::resize (typename ACE_String_Base<CHAR>::size_type len, { ACE_TRACE ("ACE_String_Base<CHAR>::resize"); - fast_resize(len); - ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR)); -} - -template <class CHAR> void -ACE_String_Base<CHAR>::fast_resize (size_t len) -{ - ACE_TRACE ("ACE_String_Base<CHAR>::fast_resize"); - // Only reallocate if we don't have enough space... if (this->buf_len_ <= len) { - if (this->buf_len_ != 0 && this->release_ != 0) + if (this->buf_len_ != 0 && this->release_ != 0) this->allocator_->free (this->rep_); - this->rep_ = static_cast<CHAR*> - (this->allocator_->malloc ((len + 1) * sizeof (CHAR))); + this->rep_ = static_cast<CHAR*>( + this->allocator_->malloc ((len + 1) * sizeof (CHAR))); this->buf_len_ = len + 1; this->release_ = 1; } this->len_ = 0; - if (len > 0) - this->rep_[0] = 0; + ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR)); } template <class CHAR> void diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index 239019b0fae..a2d565a8420 100644 --- a/ACE/ace/String_Base.h +++ b/ACE/ace/String_Base.h @@ -337,15 +337,6 @@ public: size_type length (void) const; /** - * Return the number of allocated CHARs in the string object. - * This may be greater than the current length of the string. - * - * @return Maximum number of CHAR units that can be stored, including - * any terminating nul that may be needed. - */ - size_t capacity (void) const; - - /** * Return @c true if the length of the string is zero, else @c false. */ bool is_empty (void) const; @@ -474,7 +465,7 @@ public: /** * Inequality comparison operator. * - * @param s String to compare against stored string. + * @param s Input ACE_String_Base string to compare against stored string. * @return @c true if not equal, @c false otherwise. */ bool operator != (const ACE_String_Base<CHAR> &s) const; @@ -514,14 +505,10 @@ public: * Rather than fix the method to work as documented, the code is * left as is, but the second parameter should probably not be used. * - * fast_resize just adjusts the buffer if needed and sets the length, - * it doesn't fill the buffer, so is much faster. - * * @param len The number of CHARs to reserve * @param c The CHAR to use when filling the string. */ void resize (size_type len, CHAR c = 0); - void fast_resize (size_t len); /// Swap the contents of this @c ACE_String_Base with @a str. /** diff --git a/ACE/ace/String_Base.inl b/ACE/ace/String_Base.inl index e244cf4ed6d..45abd5eb83b 100644 --- a/ACE/ace/String_Base.inl +++ b/ACE/ace/String_Base.inl @@ -33,13 +33,6 @@ ACE_String_Base<CHAR>::length (void) const return this->len_; } -template <class CHAR> ACE_INLINE size_t -ACE_String_Base<CHAR>::capacity (void) const -{ - ACE_TRACE ("ACE_String_Base<CHAR>::capacity"); - return this->buf_len_; -} - template <class CHAR> ACE_INLINE bool ACE_String_Base<CHAR>::is_empty (void) const { diff --git a/ACE/ace/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor.cpp index 942f66d7d1d..7f6ae69e320 100644 --- a/ACE/ace/TkReactor/TkReactor.cpp +++ b/ACE/ace/TkReactor.cpp @@ -1,4 +1,4 @@ -#include "ace/TkReactor/TkReactor.h" +#include "ace/TkReactor.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" diff --git a/ACE/ace/TkReactor/TkReactor.h b/ACE/ace/TkReactor.h index 80583bb8999..ca3f39474f6 100644 --- a/ACE/ace/TkReactor/TkReactor.h +++ b/ACE/ace/TkReactor.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/TkReactor/ACE_TkReactor_export.h" +#include "ace/ACE_TkReactor_export.h" #include "ace/Select_Reactor.h" #include /**/ <tk.h> diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 3cede3b8bba..8c22043e160 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -6,4 +6,4 @@ #define ACE_MAJOR_VERSION 5 #define ACE_MINOR_VERSION 5 #define ACE_BETA_VERSION 4 -#define ACE_VERSION "5.5.4" +#define ACE_VERSION " 5.5.4" diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor.cpp index 7bdef11b936..ab4612c9472 100644 --- a/ACE/ace/XtReactor/XtReactor.cpp +++ b/ACE/ace/XtReactor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor.h index 22fb39ceeed..c0d0a25ab80 100644 --- a/ACE/ace/XtReactor/XtReactor.h +++ b/ACE/ace/XtReactor.h @@ -22,10 +22,12 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/XtReactor/ACE_XtReactor_export.h" +#include "ace/ACE_XtReactor_export.h" #include "ace/Select_Reactor.h" +//#define String XtString #include /**/ <X11/Intrinsic.h> +//#undef String ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 7a2807cbe04..dc92a721395 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -367,7 +367,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache Swap.inl TSS_T.inl ace_wchar.inl - OS.inl } Header_Files { diff --git a/ACE/ace/ace_flreactor.mpc b/ACE/ace/ace_flreactor.mpc index 66b6a0ac29d..af3f7afaf9c 100644 --- a/ACE/ace/ace_flreactor.mpc +++ b/ACE/ace/ace_flreactor.mpc @@ -7,26 +7,24 @@ project(ACE_FlReactor) : acedefaults, core, acelib, ace_fl{ dynamicflags = ACE_FLREACTOR_BUILD_DLL Source_Files { - FlReactor + FlReactor.cpp } Header_Files { - FlReactor + ACE_FlReactor_export.h + FlReactor.h } Inline_Files { - FlReactor } Template_Files { - FlReactor } Resource_Files { - FlReactor } Pkgconfig_Files { - FlReactor/ACE_FlReactor.pc.in + ACE_FlReactor.pc.in } } diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index d3727e454f3..cd28be5635b 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -11,7 +11,7 @@ // link. This ACE_FOR_TAO subset library must remain as small as // possible. -project(ACE_FOR_TAO) : acedefaults, core, svcconf, uuid, versioned_namespace, pkgconfig { +project(ACE_FOR_TAO) : acedefaults, core, svcconf, versioned_namespace, pkgconfig { macros += ACE_LACKS_ACE_TOKEN requires = ace_for_tao ace_svcconf libout = $(ACE_ROOT)/lib diff --git a/ACE/ace/ace_qtreactor.mpc b/ACE/ace/ace_qtreactor.mpc index 90626153d54..549181b1348 100644 --- a/ACE/ace/ace_qtreactor.mpc +++ b/ACE/ace/ace_qtreactor.mpc @@ -7,32 +7,28 @@ project(ACE_QtReactor) : acedefaults, core, acelib, ace_qt { dynamicflags = ACE_QTREACTOR_BUILD_DLL MOC_Files { - QtReactor + QtReactor.h } Source_Files { - - QtReactor/QtReactor_moc.cpp - QtReactor + QtReactor_moc.cpp + QtReactor.cpp } Header_Files { - QtReactor + ACE_QtReactor_export.h } Inline_Files { - QtReactor } Template_Files { - QtReactor } Resource_Files { - QtReactor } Pkgconfig_Files { - QtReactor/ACE_QtReactor.pc.in + ACE_QtReactor.pc.in } } diff --git a/ACE/ace/ace_tkreactor.mpc b/ACE/ace/ace_tkreactor.mpc index 351af62857f..fbbda18160c 100644 --- a/ACE/ace/ace_tkreactor.mpc +++ b/ACE/ace/ace_tkreactor.mpc @@ -7,26 +7,24 @@ project(ACE_TkReactor) : acedefaults, core, acelib, ace_tk { dynamicflags = ACE_TKREACTOR_BUILD_DLL Source_Files { - TkReactor + TkReactor.cpp } Header_Files { - TkReactor + ACE_TkReactor_export.h + TkReactor.h } Inline_Files { - TkReactor } Template_Files { - TkReactor } Resource_Files { - TkReactor } Pkgconfig_Files { - TkReactor/ACE_TkReactor.pc.in + ACE_TkReactor.pc.in } } diff --git a/ACE/ace/ace_xtreactor.mpc b/ACE/ace/ace_xtreactor.mpc index 8f9ba8fda73..9d8c44e666f 100644 --- a/ACE/ace/ace_xtreactor.mpc +++ b/ACE/ace/ace_xtreactor.mpc @@ -7,26 +7,24 @@ project(ACE_XtReactor) : acedefaults, core, acelib, ace_xt { dynamicflags = ACE_XTREACTOR_BUILD_DLL Source_Files { - XtReactor + XtReactor.cpp } Header_Files { - XtReactor + XtReactor.h + ACE_XtReactor_export.h } Inline_Files { - XtReactor } Template_Files { - XtReactor } Resource_Files { - XtReactor } Pkgconfig_Files { - XtReactor/ACE_XtReactor.pc.in + ACE_XtReactor.pc.in } } diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h index 223ea873391..6ed6e250bcc 100644 --- a/ACE/ace/config-freebsd.h +++ b/ACE/ace/config-freebsd.h @@ -225,7 +225,7 @@ extern "C" { char * cuserid (char *s); } #define ACE_HAS_SIGWAIT // Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS +#define ACE_HAS_TERMIOS #if (__FreeBSD_version > 400000) #define ACE_HAS_UCONTEXT_T @@ -267,10 +267,6 @@ typedef union sigval sigval_t; # define ACE_HAS_PTHREAD_SETSTACK #endif -#if (__FreeBSD_version < 700007) -# define ACE_HAS_SIGVAL_SIGVAL_INT -#endif - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 4b8c63c80b9..95a7a07d8c0 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -395,12 +395,7 @@ #define ACE_HAS_VOIDPTR_MMAP -#if defined (ACE_LACKS_NETWORKING) -# include "ace/config-posix-nonetworking.h" -#else -# define ACE_HAS_NETLINK -# define ACE_HAS_GETIFADDRS -#endif +#define ACE_HAS_NETLINK #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) // Detect if getsockname() and getpeername() returns random values in diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h index ee3ca24eeeb..402ef191e16 100644 --- a/ACE/ace/config-linux.h +++ b/ACE/ace/config-linux.h @@ -58,6 +58,10 @@ #endif /* ACE_MT_SAFE */ +// This is certainly true for newer distributions. I'm not sure how +// far back this goes. +#define ACE_HAS_GETIFADDRS + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LINUX_H */ diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h index 2bf6665c8e2..739ecee49c8 100644 --- a/ACE/ace/config-lynxos.h +++ b/ACE/ace/config-lynxos.h @@ -54,6 +54,7 @@ #define ACE_HAS_MEMCHR #define ACE_HAS_MSG #define ACE_HAS_NONCONST_CLOCK_SETTIME +#define ACE_HAS_NONCONST_GETBY #define ACE_HAS_NONCONST_MSGSND #define ACE_HAS_NONCONST_READV #define ACE_HAS_NONCONST_SELECT_TIMEVAL @@ -78,20 +79,26 @@ #define ACE_HAS_TIMEZONE_GETTIMEOFDAY #define ACE_HAS_TYPENAME_KEYWORD #define ACE_LACKS_CONST_TIMESPEC_PTR +#define ACE_LACKS_GETOPT_PROTOTYPE #define ACE_LACKS_GETPGID +#define ACE_LACKS_INET_ATON_PROTOTYPE #define ACE_LACKS_MADVISE #define ACE_LACKS_MKSTEMP_PROTOTYPE #define ACE_LACKS_MKTEMP_PROTOTYPE #define ACE_LACKS_PUTENV_PROTOTYPE #define ACE_LACKS_REALPATH +#define ACE_LACKS_REGEX_H #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SCANDIR_PROTOTYPE #define ACE_LACKS_SETEGID #define ACE_LACKS_SETEUID #define ACE_LACKS_SIGINFO_H +#define ACE_LACKS_STRCASECMP_PROTOTYPE +#define ACE_LACKS_STRNCASECMP_PROTOTYPE #define ACE_LACKS_STRPTIME #define ACE_LACKS_SUSECONDS_T #define ACE_LACKS_SWAB_PROTOTYPE +#define ACE_LACKS_SYS_SELECT_H #define ACE_LACKS_TIMESPEC_T #define ACE_LACKS_UCONTEXT_H #define ACE_LACKS_USECONDS_T @@ -139,25 +146,5 @@ #define ALIGNBYTES (sizeof(int) - 1) #define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES) -#if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0 -# define ACE_LACKS_GETOPT_PROTOTYPE -# define ACE_LACKS_INET_ATON_PROTOTYPE -# define ACE_LACKS_REGEX_H -# define ACE_LACKS_STRCASECMP_PROTOTYPE -# define ACE_LACKS_STRNCASECMP_PROTOTYPE -# define ACE_LACKS_SYS_SELECT_H -# define ACE_HAS_NONCONST_GETBY -#endif - -#if (ACE_LYNXOS_MAJOR > 4) || (ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR >= 2) -// LynxOS 4.2 additons -# define ACE_HAS_POSIX_SEM_TIMEOUT -# define ACE_HAS_MUTEX_TIMEOUTS -#endif - -#if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) -# define ACE_HAS_BROKEN_THREAD_KEYFREE -#endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-posix-nonetworking.h b/ACE/ace/config-posix-nonetworking.h deleted file mode 100644 index c153f795a15..00000000000 --- a/ACE/ace/config-posix-nonetworking.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- C -*- */ -// $Id$ - -/* The following configuration file is designed to work for RTEMS - platforms using GNU C. -*/ - -#ifndef ACE_CONFIG_POSIX_NONETWORKING_H -#define ACE_CONFIG_POSIX_NONETWORKING_H - -// Missing header files -# define ACE_LACKS_SYS_UIO_H -# define ACE_LACKS_SYS_SOCKET_H -# define ACE_LACKS_NETINET_IN_H -# define ACE_LACKS_NETDB_H -# define ACE_LACKS_ARPA_INET_H -# define ACE_LACKS_SYS_SELECT_H -# define ACE_LACKS_NET_IF_H -# define ACE_LACKS_SYSLOG_H -# define ACE_LACKS_SYS_UN_H -# define ACE_LACKS_MEMORY_H -# define ACE_LACKS_SYS_SYSCTL_H -# define ACE_LACKS_NETINET_TCP_H - -// Missing types -# define ACE_LACKS_IOVEC -# define ACE_LACKS_IN_ADDR -# define ACE_LACKS_SOCKADDR_IN -# define ACE_LACKS_HOSTENT -# define ACE_LACKS_SOCKADDR -# define ACE_LACKS_IP_MREQ -# define ACE_LACKS_PROTOENT -# define ACE_LACKS_SERVENT -# define ACE_LACKS_IFREQ - -// Missing methods -# define ACE_LACKS_GETHOSTBYADDR -# define ACE_LACKS_GETHOSTBYNAME -# define ACE_LACKS_GETIPNODEBYADDR -# define ACE_LACKS_LISTEN -# define ACE_LACKS_BIND -# define ACE_LACKS_NTOHL -# define ACE_LACKS_HTONL -# define ACE_LACKS_HTONS -# define ACE_LACKS_NTOHS -# define ACE_LACKS_SELECT -# define ACE_LACKS_SOCKET -# define ACE_LACKS_SHUTDOWN -# define ACE_LACKS_SETSOCKOPT -# define ACE_LACKS_INET_ATON -# define ACE_LACKS_INET_ADDR -# define ACE_LACKS_INET_NTOA -# define ACE_LACKS_GET_BCAST_ADDR -# define ACE_LACKS_GETSERVBYNAME -# define ACE_LACKS_ACCEPT -# define ACE_LACKS_CONNECT -# define ACE_LACKS_GETPEERNAME -# define ACE_LACKS_GETSOCKNAME -# define ACE_LACKS_GETSOCKOPT -# define ACE_LACKS_RECV -# define ACE_LACKS_SEND -# define ACE_LACKS_SENDTO -# define ACE_LACKS_RECVFROM -# define ACE_LACKS_RECVMSG -# define ACE_LACKS_SENDMSG -# define ACE_LACKS_GETHOSTBYADDR_R -# define ACE_LACKS_GETPROTOBYNAME -# define ACE_LACKS_GETPROTOBYNUMBER -# define ACE_LACKS_GETSERVBYNAME -# define ACE_LACKS_READV -# define ACE_LACKS_WRITEV -# define ACE_LACKS_SOCKETPAIR -# undef ACE_HAS_MSG - -// Missing OS features -# define ACE_LACKS_UNIX_SYSLOG -# define ACE_LACKS_TCP_NODELAY - -#endif /* ACE_CONFIG_POSIX_NONETWORKING_H */ diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h index ff95c69c73a..9379c2ffc19 100644 --- a/ACE/ace/config-rtems.h +++ b/ACE/ace/config-rtems.h @@ -37,6 +37,10 @@ #define ACE_HAS_NONSTATIC_OBJECT_MANAGER +#if !defined (ACE_MAIN) +# define ACE_MAIN ace_main +#endif /* ! ACE_MAIN */ + #define ACE_LACKS_REGEX_H #define ACE_LACKS_STROPTS_H #define ACE_LACKS_DLFCN_H @@ -84,7 +88,6 @@ #define ACE_HAS_MEMCHR #define ACE_HAS_MSG #define ACE_HAS_MT_SAFE_MKTIME -#define ACE_HAS_NONCONST_READV #define ACE_HAS_POSIX_SEM #define ACE_HAS_POSIX_TIME #define ACE_HAS_REENTRANT_FUNCTIONS @@ -111,6 +114,7 @@ #define ACE_LACKS_PTHREAD_THR_SIGSETMASK #define ACE_LACKS_READDIR_R #define ACE_LACKS_READLINK +#define ACE_HAS_NONCONST_READV #define ACE_LACKS_READV #define ACE_LACKS_RLIMIT #define ACE_LACKS_RLIMIT_PROTOTYPE @@ -137,13 +141,73 @@ #define ACE_LACKS_FDOPEN #define ACE_HAS_TERMIOS -// rtems 4.7 or higher -#if (__RTEMS_MAJOR__ > 4) || (__RTEMS_MAJOR__ == 4 && __RTEMS_MINOR__ > 6) -# define ACE_HAS_UALARM -#endif - #if defined (ACE_LACKS_NETWORKING) -# include "ace/config-posix-nonetworking.h" + +// Missing header files +# define ACE_LACKS_SYS_UIO_H +# define ACE_LACKS_SYS_SOCKET_H +# define ACE_LACKS_NETINET_IN_H +# define ACE_LACKS_NETDB_H +# define ACE_LACKS_ARPA_INET_H +# define ACE_LACKS_SYS_SELECT_H +# define ACE_LACKS_NET_IF_H +# define ACE_LACKS_SYSLOG_H +# define ACE_LACKS_SYS_UN_H +# define ACE_LACKS_MEMORY_H +# define ACE_LACKS_SYS_SYSCTL_H +# define ACE_LACKS_NETINET_TCP_H + +// Missing types +# define ACE_LACKS_IOVEC +# define ACE_LACKS_IN_ADDR +# define ACE_LACKS_SOCKADDR_IN +# define ACE_LACKS_HOSTENT +# define ACE_LACKS_SOCKADDR +# define ACE_LACKS_IP_MREQ +# define ACE_LACKS_PROTOENT +# define ACE_LACKS_SERVENT +# define ACE_LACKS_IFREQ + +// Missing methods +# define ACE_LACKS_GETHOSTBYADDR +# define ACE_LACKS_GETHOSTBYNAME +# define ACE_LACKS_GETIPNODEBYADDR +# define ACE_LACKS_LISTEN +# define ACE_LACKS_BIND +# define ACE_LACKS_NTOHL +# define ACE_LACKS_HTONL +# define ACE_LACKS_HTONS +# define ACE_LACKS_NTOHS +# define ACE_LACKS_SELECT +# define ACE_LACKS_SOCKET +# define ACE_LACKS_SHUTDOWN +# define ACE_LACKS_SETSOCKOPT +# define ACE_LACKS_INET_ATON +# define ACE_LACKS_INET_ADDR +# define ACE_LACKS_INET_NTOA +# define ACE_LACKS_GET_BCAST_ADDR +# define ACE_LACKS_GETSERVBYNAME +# define ACE_LACKS_ACCEPT +# define ACE_LACKS_CONNECT +# define ACE_LACKS_GETPEERNAME +# define ACE_LACKS_GETSOCKNAME +# define ACE_LACKS_GETSOCKOPT +# define ACE_LACKS_RECV +# define ACE_LACKS_SEND +# define ACE_LACKS_SENDTO +# define ACE_LACKS_RECVFROM +# define ACE_LACKS_RECVMSG +# define ACE_LACKS_SENDMSG +# define ACE_LACKS_GETHOSTBYADDR_R +# define ACE_LACKS_GETPROTOBYNAME +# define ACE_LACKS_GETPROTOBYNUMBER +# define ACE_LACKS_GETSERVBYNAME +# undef ACE_HAS_MSG + +// Missing OS features +# define ACE_LACKS_UNIX_SYSLOG +# define ACE_LACKS_TCP_NODELAY + #endif #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h index 33f4205fb04..549db4416dd 100644 --- a/ACE/ace/config-unixware-7.1.0.udk.h +++ b/ACE/ace/config-unixware-7.1.0.udk.h @@ -199,9 +199,24 @@ /* Platform supports POSIX Threads */ #define ACE_HAS_PTHREADS +/* Platform supports POSIX Threads .4a Draft 4 */ +/* #undef ACE_HAS_PTHREADS_DRAFT4 */ + +/* Platform supports POSIX Threads .4a Draft 6 */ +/* #undef ACE_HAS_PTHREADS_DRAFT6 */ + +/* Platform supports POSIX Threads .1c Draft 7 */ +/* #undef ACE_HAS_PTHREADS_DRAFT7 */ + /* Platform supports POSIX.1c-1995 threads */ #define ACE_HAS_PTHREADS_STD +/* Platform has pthread_condattr_setkind_np(). */ +/* #undef ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP */ + +/* Platform has pthread_mutexattr_setkind_np(). */ +/* #undef ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP */ + /* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and PTHREAD_PROCESS_SHARED values */ #define ACE_HAS_PTHREAD_PROCESS_ENUM @@ -394,6 +409,9 @@ /* Platform needs to #include <sched.h> to get thread scheduling defs. */ #define ACE_NEEDS_SCHED_H 1 +/* Turns off the LM_DEBUG and LM_ERROR logging macros... */ +/* #undef ACE_NLOGGING */ + /* The OS/platform supports the poll() event demultiplexor */ #define ACE_USE_POLL 1 diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index b6758dfa96f..9b85888b05b 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -65,22 +65,12 @@ # error This version of Microsoft Visual C++ is not supported. #endif -// MFC changes the behavior of operator new at all MSVC versions from 6 up -// by throwing a static CMemoryException* instead of std::bad_alloc -// (see ace/OS_Memory.h). This MFC exception object needs to be cleaned up -// by calling its Delete() method. +// MFC changes the behavior of operator new at all MSVC versions from 6 up, +// see ace/OS_Memory.h (throws a static CMemoryException* instead of std::bad_alloc) #if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) # if !defined (ACE_NEW_THROWS_EXCEPTIONS) # define ACE_NEW_THROWS_EXCEPTIONS # endif -# if defined (ACE_bad_alloc) -# undef ACE_bad_alloc -# endif -# define ACE_bad_alloc CMemoryException *e -# if defined (ACE_del_bad_alloc) -# undef ACE_del_bad_alloc -# endif -# define ACE_del_bad_alloc e->Delete(); #endif /* ACE_HAS_MFC && ACE_HAS_MFC==1 */ #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) diff --git a/ACE/apps/Gateway/Gateway/Makefile.am b/ACE/apps/Gateway/Gateway/Makefile.am index ac8ddfab45c..83392e20564 100644 --- a/ACE/apps/Gateway/Gateway/Makefile.am +++ b/ACE/apps/Gateway/Gateway/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/Gateway/Makefile.am b/ACE/apps/Gateway/Makefile.am index e0b818fd319..ff47f4b6ecd 100644 --- a/ACE/apps/Gateway/Makefile.am +++ b/ACE/apps/Gateway/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Gateway \ diff --git a/ACE/apps/Gateway/Peer/Makefile.am b/ACE/apps/Gateway/Peer/Makefile.am index 42504dccb25..843f407270a 100644 --- a/ACE/apps/Gateway/Peer/Makefile.am +++ b/ACE/apps/Gateway/Peer/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/JAWS/Makefile.am b/ACE/apps/JAWS/Makefile.am index c922c992902..5703744183c 100644 --- a/ACE/apps/JAWS/Makefile.am +++ b/ACE/apps/JAWS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ clients \ diff --git a/ACE/apps/JAWS/clients/Blobby/Makefile.am b/ACE/apps/JAWS/clients/Blobby/Makefile.am index a8f473c45a9..e3846028703 100644 --- a/ACE/apps/JAWS/clients/Blobby/Makefile.am +++ b/ACE/apps/JAWS/clients/Blobby/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/JAWS/clients/Caching/Makefile.am b/ACE/apps/JAWS/clients/Caching/Makefile.am index 1e37c329085..ba2cde63635 100644 --- a/ACE/apps/JAWS/clients/Caching/Makefile.am +++ b/ACE/apps/JAWS/clients/Caching/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,23 +16,22 @@ ACE_ROOT = $(top_srcdir) if BUILD_ACE_FILECACHE if !BUILD_ACE_FOR_TAO -noinst_PROGRAMS = http_client +noinst_LTLIBRARIES = libhttp_client.la -http_client_CPPFLAGS = \ +libhttp_client_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -http_client_SOURCES = \ +libhttp_client_la_SOURCES = \ http_client.cpp \ - http_handler.cpp \ + http_handler.cpp + +noinst_HEADERS = \ Local_Locator.inl \ Locator_Request_Reply.inl \ URL_Properties.inl \ http_handler.h -http_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - endif !BUILD_ACE_FOR_TAO endif BUILD_ACE_FILECACHE diff --git a/ACE/apps/JAWS/clients/Makefile.am b/ACE/apps/JAWS/clients/Makefile.am index 76571aa387d..6f338fd5cc8 100644 --- a/ACE/apps/JAWS/clients/Makefile.am +++ b/ACE/apps/JAWS/clients/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Blobby \ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/README b/ACE/apps/JAWS/clients/WebSTONE/src/README index 2061342b7ae..2061342b7ae 100644..100755 --- a/ACE/apps/JAWS/clients/WebSTONE/src/README +++ b/ACE/apps/JAWS/clients/WebSTONE/src/README diff --git a/ACE/apps/JAWS/server/Makefile.am b/ACE/apps/JAWS/server/Makefile.am index d43dd1206f3..d13d91ad381 100644 --- a/ACE/apps/JAWS/server/Makefile.am +++ b/ACE/apps/JAWS/server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/JAWS2/JAWS/Makefile.am b/ACE/apps/JAWS2/JAWS/Makefile.am index bc1ac6d094b..b201afa54bd 100644 --- a/ACE/apps/JAWS2/JAWS/Makefile.am +++ b/ACE/apps/JAWS2/JAWS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/JAWS2/JAWS/jaws2.mpc b/ACE/apps/JAWS2/JAWS/jaws2.mpc index 90ebff97e5a..a7d5754b11a 100644 --- a/ACE/apps/JAWS2/JAWS/jaws2.mpc +++ b/ACE/apps/JAWS2/JAWS/jaws2.mpc @@ -5,13 +5,7 @@ project(JAWS2) : acelib { sharedname = JAWS2 dynamicflags = JAWS_BUILD_DLL avoids += uses_wchar ace_for_tao - - specific (automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } - + includes += .. Source_Files { Assoc_Array.cpp Cache_Manager.cpp diff --git a/ACE/apps/JAWS2/Makefile.am b/ACE/apps/JAWS2/Makefile.am index b42508c7ba2..5bc7afdf9fd 100644 --- a/ACE/apps/JAWS2/Makefile.am +++ b/ACE/apps/JAWS2/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ JAWS diff --git a/ACE/apps/JAWS3/Makefile.am b/ACE/apps/JAWS3/Makefile.am index 84294e864f3..647eab9416b 100644 --- a/ACE/apps/JAWS3/Makefile.am +++ b/ACE/apps/JAWS3/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ jaws3 diff --git a/ACE/apps/JAWS3/jaws3/Makefile.am b/ACE/apps/JAWS3/jaws3/Makefile.am index 7cbc4bb2925..549790b885c 100644 --- a/ACE/apps/JAWS3/jaws3/Makefile.am +++ b/ACE/apps/JAWS3/jaws3/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/JAWS3/jaws3/jaws3.mpc b/ACE/apps/JAWS3/jaws3/jaws3.mpc index 061c1952cd4..eaa9ecd0196 100644 --- a/ACE/apps/JAWS3/jaws3/jaws3.mpc +++ b/ACE/apps/JAWS3/jaws3/jaws3.mpc @@ -6,13 +6,7 @@ project(JAWS3) : acelib { dynamicflags = JAWS_BUILD_DLL avoids += uses_wchar avoids += ace_for_tao - - specific(automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } - + includes += .. Source_Files { Asynch_IO.cpp Concurrency.cpp @@ -78,13 +72,7 @@ project(JAWS3) : acelib { project(JAWS3_server) : aceexe { avoids += uses_wchar avoids += ace_for_tao - - specific(automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } - + includes += .. exename = main after += JAWS3 libs += JAWS3 diff --git a/ACE/apps/drwho/Makefile.am b/ACE/apps/drwho/Makefile.am index 7cf39818868..8a6e815e167 100644 --- a/ACE/apps/drwho/Makefile.am +++ b/ACE/apps/drwho/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/gperf/Makefile.am b/ACE/apps/gperf/Makefile.am index b8cdd293211..a6030210b21 100644 --- a/ACE/apps/gperf/Makefile.am +++ b/ACE/apps/gperf/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ diff --git a/ACE/apps/gperf/src/Makefile.am b/ACE/apps/gperf/src/Makefile.am index 99de5128122..623c9054179 100644 --- a/ACE/apps/gperf/src/Makefile.am +++ b/ACE/apps/gperf/src/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/gperf/tests/Makefile.am b/ACE/apps/gperf/tests/Makefile.am index 027d848b869..2a5fb70ce2f 100644 --- a/ACE/apps/gperf/tests/Makefile.am +++ b/ACE/apps/gperf/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,7 @@ CLEANFILES = BUILT_SOURCES = noinst_PROGRAMS = -## Makefile.adainset.am +## Makefile.adainset.am if !BUILD_USES_WCHAR @@ -23,10 +23,14 @@ BUILT_SOURCES += \ ada.cpp CLEANFILES += \ - ada.cpp + ada.cpp \ + ada-stamp -ada.cpp: $(srcdir)/ada.gperf +ada.cpp: ada-stamp + +ada-stamp: $(srcdir)/ada.gperf ../src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp + @touch $@ noinst_PROGRAMS += aout @@ -43,7 +47,7 @@ aout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.cinset.am +## Makefile.cinset.am if !BUILD_USES_WCHAR @@ -51,10 +55,14 @@ BUILT_SOURCES += \ c.cpp CLEANFILES += \ - c.cpp + c.cpp \ + c-stamp + +c.cpp: c-stamp -c.cpp: $(srcdir)/c.gperf +c-stamp: $(srcdir)/c.gperf ../src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp + @touch $@ noinst_PROGRAMS += cout @@ -71,7 +79,7 @@ cout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.cppinset.am +## Makefile.cppinset.am if !BUILD_USES_WCHAR @@ -79,10 +87,14 @@ BUILT_SOURCES += \ cpp.cpp CLEANFILES += \ - cpp.cpp + cpp.cpp \ + cpp-stamp -cpp.cpp: $(srcdir)/cpp.gperf +cpp.cpp: cpp-stamp + +cpp-stamp: $(srcdir)/cpp.gperf ../src/gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp + @touch $@ noinst_PROGRAMS += cppout @@ -99,7 +111,7 @@ cppout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.iinset.am +## Makefile.iinset.am if !BUILD_USES_WCHAR @@ -107,10 +119,14 @@ BUILT_SOURCES += \ idl.cpp CLEANFILES += \ - idl.cpp + idl.cpp \ + idl-stamp + +idl.cpp: idl-stamp -idl.cpp: $(srcdir)/idl.gperf +idl-stamp: $(srcdir)/idl.gperf ../src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp + @touch $@ noinst_PROGRAMS += iout @@ -127,7 +143,7 @@ iout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.iinset2.am +## Makefile.iinset2.am if !BUILD_USES_WCHAR @@ -135,11 +151,15 @@ BUILT_SOURCES += \ iout2_gen/idl.cpp CLEANFILES += \ - iout2_gen/idl.cpp + iout2_gen/idl.cpp \ + iout2_gen/idl-stamp + +iout2_gen/idl.cpp: iout2_gen/idl-stamp -iout2_gen/idl.cpp: $(srcdir)/idl.gperf +iout2_gen/idl-stamp: $(srcdir)/idl.gperf mkdir -p iout2_gen ../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp + @touch $@ noinst_PROGRAMS += iout2 @@ -156,7 +176,7 @@ iout2_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.m3inset.am +## Makefile.m3inset.am if !BUILD_USES_WCHAR @@ -164,10 +184,14 @@ BUILT_SOURCES += \ modula3.cpp CLEANFILES += \ - modula3.cpp + modula3.cpp \ + modula3-stamp -modula3.cpp: $(srcdir)/modula3.gperf +modula3.cpp: modula3-stamp + +modula3-stamp: $(srcdir)/modula3.gperf ../src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp + @touch $@ noinst_PROGRAMS += m3out @@ -184,7 +208,7 @@ m3out_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.pinset.am +## Makefile.pinset.am if !BUILD_USES_WCHAR @@ -192,10 +216,14 @@ BUILT_SOURCES += \ pascal.cpp CLEANFILES += \ - pascal.cpp + pascal.cpp \ + pascal-stamp + +pascal.cpp: pascal-stamp -pascal.cpp: $(srcdir)/pascal.gperf +pascal-stamp: $(srcdir)/pascal.gperf ../src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp + @touch $@ noinst_PROGRAMS += pout @@ -212,7 +240,7 @@ pout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.preinset.am +## Makefile.preinset.am if !BUILD_USES_WCHAR @@ -220,10 +248,14 @@ BUILT_SOURCES += \ adadefs.cpp CLEANFILES += \ - adadefs.cpp + adadefs.cpp \ + adadefs-stamp -adadefs.cpp: $(srcdir)/adadefs.gperf +adadefs.cpp: adadefs-stamp + +adadefs-stamp: $(srcdir)/adadefs.gperf ../src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp + @touch $@ noinst_PROGRAMS += preout @@ -240,7 +272,7 @@ preout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.taoinset.am +## Makefile.taoinset.am if !BUILD_USES_WCHAR @@ -248,10 +280,14 @@ BUILT_SOURCES += \ tao.cpp CLEANFILES += \ - tao.cpp + tao.cpp \ + tao-stamp + +tao.cpp: tao-stamp -tao.cpp: $(srcdir)/tao.gperf +tao-stamp: $(srcdir)/tao.gperf ../src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp + @touch $@ noinst_PROGRAMS += taoout @@ -268,7 +304,7 @@ taoout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.tinset.am +## Makefile.tinset.am if !BUILD_USES_WCHAR @@ -276,10 +312,14 @@ BUILT_SOURCES += \ corba.cpp CLEANFILES += \ - corba.cpp + corba.cpp \ + corba-stamp + +corba.cpp: corba-stamp -corba.cpp: $(srcdir)/corba.gperf +corba-stamp: $(srcdir)/corba.gperf ../src/gperf -a -o $(srcdir)/corba.gperf > corba.cpp + @touch $@ noinst_PROGRAMS += tout diff --git a/ACE/apps/mkcsregdb/Makefile.am b/ACE/apps/mkcsregdb/Makefile.am index b90caa15e4a..a08f795e30a 100644 --- a/ACE/apps/mkcsregdb/Makefile.am +++ b/ACE/apps/mkcsregdb/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/apps/soreduce/Makefile.am b/ACE/apps/soreduce/Makefile.am index 732dec5e383..4f50d294e0d 100644 --- a/ACE/apps/soreduce/Makefile.am +++ b/ACE/apps/soreduce/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb b/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb index 36b8309f1fc..809140c3fae 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb @@ -3,7 +3,7 @@ // $Id$ feature(ace_for_tao) { - macros += ACE_LACKS_ACE_TOKEN ACE_LACKS_MSG_WFMO + macros += ACE_LACKS_ACE_TOKEN after += ACE_FOR_TAO libs += ACE_FOR_TAO diff --git a/ACE/bin/MakeProjectCreator/config/automake.features b/ACE/bin/MakeProjectCreator/config/automake.features index a8ec69fd549..d78fdef842f 100644 --- a/ACE/bin/MakeProjectCreator/config/automake.features +++ b/ACE/bin/MakeProjectCreator/config/automake.features @@ -30,6 +30,3 @@ ace_xtreactor=1 tao_xtresource=1 wxWindows=1 - -stl=1 -boost=1 diff --git a/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb b/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb index dfa65b169aa..dfa65b169aa 100644..100755 --- a/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb +++ b/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb diff --git a/ACE/bin/MakeProjectCreator/config/core_strategies.mpb b/ACE/bin/MakeProjectCreator/config/core_strategies.mpb deleted file mode 100644 index 3c568c55192..00000000000 --- a/ACE/bin/MakeProjectCreator/config/core_strategies.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -// $Id$ - -feature(ace_for_tao) { - macros += TAO_HAS_SHMIOP=0 TAO_HAS_UIOP=0 -} diff --git a/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb index 483b93b2412..80575b1d459 100644 --- a/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb +++ b/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb @@ -4,7 +4,7 @@ project : taolib_with_idl, orbsvcs_output, anytypecode { tagname = TAO_ORBSVCS includes += $(TAO_ROOT)/orbsvcs - idlflags += -I$(TAO_ROOT)/orbsvcs + idlflags += -I$(TAO_ROOT)/orbsvcs -GT specific(automake) { includes += $(TAO_BUILDDIR)/orbsvcs diff --git a/ACE/bin/MakeProjectCreator/config/strategies.mpb b/ACE/bin/MakeProjectCreator/config/strategies.mpb index ae5383f50cb..c087499d5fd 100644 --- a/ACE/bin/MakeProjectCreator/config/strategies.mpb +++ b/ACE/bin/MakeProjectCreator/config/strategies.mpb @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib, anytypecode, core_strategies { +project : taolib, anytypecode { + avoids += ace_for_tao // Requires Unix domain sockets and MEM stuff after += Strategies libs += TAO_Strategies } diff --git a/ACE/bin/Makefile.am b/ACE/bin/Makefile.am index bc5c70469dc..996040dd287 100644 --- a/ACE/bin/Makefile.am +++ b/ACE/bin/Makefile.am @@ -29,7 +29,7 @@ envinfo_SOURCES = \ envinfo.cpp envinfo_LDADD = \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/bin/make_release b/ACE/bin/make_release index 0077bb83598..875897381b2 100755 --- a/ACE/bin/make_release +++ b/ACE/bin/make_release @@ -4,7 +4,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -# Creates an ACE or TAO kit. +# Creates an ACE or TAO kit. # # The first three lines above let this script run without specifying the # full path to perl, as long as it is in the user's PATH. @@ -164,7 +164,7 @@ if ($kit eq 'ace') { sub which { my $command = shift; - + my $cmd = `which $command`; chomp ($cmd); return $cmd; @@ -261,7 +261,7 @@ if ($update_versions) { $status = &check_workspace () || &get_and_update_versions () || &tag (); - + if ($status != 0) { print "Exited with an error!\n"; } @@ -289,56 +289,56 @@ if ($update_versions) { &ex ("$svn export $repo_root/MPC/tags/$kit_tag $stage_dir/ACE_wrappers/MPC") && die "$0: failed cvs export of MPC in $stage_dir\n"; } else { - &ex ("$svn export ./ACE $stage_dir/ACE_wrappers") && + &ex ("$svn export ./ACE $stage_dir/ACE_wrappers") && die "$0: failed svn export of ACE to $stage_dir/ACE_wrappers\n"; &ex ("$svn export ./ACE/MPC $stage_dir/ACE_wrappers/MPC") && die "$0: failed svn export of MPC to $stage_dir/ACE_wrapper/MPC\n"; } - + &ex ("cd $stage_dir/ACE_wrappers && $make ACE-INSTALL") && die "$0: failed make ACE-INSTALL in $stage_dir/ACE_wrappers\n"; } - + if ($kit =~ /tao/) { if ("$kit_tag") { &ex ("$svn export $repo_root/Middleware/tags/$kit_tag/TAO $stage_dir/ACE_wrappers/TAO > /dev/null") && die "$0: failed cvs export of $kit_tag in $stage_dir\n"; } else { - &ex ("$svn export ./TAO $stage_dir/ACE_wrappers/TAO") && + &ex ("$svn export ./TAO $stage_dir/ACE_wrappers/TAO") && die "$0: failed svn export of TAO to $stage_dir/ACE_wrappers/TAO\n"; } &ex ("cd $stage_dir/ACE_wrappers/TAO && $make TAO-INSTALL") && die "$0: failed make INSTALL in " . "$stage_dir/ACE_wrappers/TAO\n"; } - + if ($kit =~ /ciao/) { if ("$kit_tag") { &ex ("$svn export $repo_root/Middleware/tags/$kit_tag/CIAO $stage_dir/ACE_wrappers/TAO/CIAO > /dev/null") && die "$0: failed cvs export of $kit_tag in $stage_dir\n"; } else { - &ex ("$svn export ./CIAO $stage_dir/ACE_wrappers/TAO/CIAO") && + &ex ("$svn export ./CIAO $stage_dir/ACE_wrappers/TAO/CIAO") && die "$0: failed svn export of CIAO to $stage_dir/ACE_wrappers/TAO/CIAO\n"; } - + &ex ("cd $stage_dir/ACE_wrappers/TAO/CIAO && $make CIAO-INSTALL") && die "$0: failed make INSTALL in " . "$stage_dir/ACE_wrappers/TAO/CIAO\n"; - + } - + chdir $stage_dir; - + print "Creating source-only kits\n"; $status = &create_kit (1); print "Generating makefiles\n"; $status = &generate_makefiles (); - if ($status != 0) { - die "$0: failed to generate GNUmakefiles\n"; - } - + if ($status != 0) { + die "$0: failed to generate GNUmakefiles\n"; + } + print "Creating kits with build files\n"; $status = &create_kit (); @@ -380,7 +380,7 @@ sub check_workspace () { "MPC/trunk checked out as ACE_ROOT/MPC.\n"; if ("$exec_prefix") { - print "$svn status $module\n"; + print "$svn status $module\n"; } else { open (SVNSTATUS, "$svn status $module 2>&1 |") || die "$0: unable to open $svn for status\n"; @@ -388,7 +388,7 @@ sub check_workspace () { next if m%^\? ACE/include/makeinclude/platform_macros.GNU$%; next if m%^\? ACE/ace/config.h$%; next if m%^\s*\?\s*ACE/MPC\s*$%; - + push (@out_of_date, $_) if "$_"; } close SVNSTATUS; @@ -406,7 +406,7 @@ sub check_workspace () { sub get_and_update_versions () { # Update the version numbers for the various components. - my $retval = + my $retval = get_version ("ACE", 1) || update_version_files ("ACE") || update_changelog ("ACE") || @@ -416,10 +416,10 @@ sub get_and_update_versions () { get_version ("CIAO", 1) || update_version_files ("CIAO") || update_changelog ("CIAO"); - + # Commit changes &ex ("$svn commit -m '$log_line'"); - + $retval = 1 if $? >> 8; return $retval; } @@ -428,7 +428,7 @@ sub get_version { my $component = shift; my $update_version = shift; print "Getting version information for $component\n"; - + open (VERSION, "< $component/VERSION") || die "$0: unable to open $component/VERSION: $!\n"; while (<VERSION>) { @@ -452,7 +452,7 @@ sub get_version { } } close VERSION; - + if ($update_version) { # Increment the version count if ($release_type eq 'beta') { @@ -461,12 +461,12 @@ sub get_version { $comp_versions{"$component" . "_beta"} = 0; ++$comp_versions{"$component" . "_minor"}; } elsif ($release_type eq 'major' ) { - $comp_versions{"$component" . "_beta"} = + $comp_versions{"$component" . "_beta"} = $comp_versions{"$component" . "_minor"} = 0; ++$comp_versions{"$component" . "_major"}; } } - + if ($release_type eq 'beta') { $comp_versions{"$component" . "_version"} = $comp_versions{"$component" . "_major"} . '.' . @@ -477,7 +477,7 @@ sub get_version { $comp_versions{"$component" . "_major"} . '.' . $comp_versions{"$component" . "_minor"}; } - + return 0; } @@ -490,14 +490,14 @@ sub update_version_files { print "Updating version files for $component\n"; my $comp_version = $comp_versions{"$component" . "_version"}; - + chdir $component || die "Unable to chdir to $component\n"; - + # Needs to be done for all: &ex ("perl -pi -e " . "'s/$component version .*/$component version $comp_version, released $now./' VERSION"); return 1 if $? >> 8; - + if ("$exec_prefix") { print "$component version " . $comp_versions{$component . "_version"} . "\n"; } else { @@ -515,7 +515,7 @@ sub update_version_files { close VERSION_H; } - + # Component specific PRF. if ($component eq "CIAO") { # For CIAO we need to add ACE + TAO versions.. @@ -533,7 +533,7 @@ sub update_version_files { $comp_versions{"ACE_version"} . "/' PROBLEM-REPORT-FORM"); return 1 if $? >> 8; - + chdir "../"; } @@ -543,12 +543,12 @@ sub update_version_files { "/' PROBLEM-REPORT-FORM"); return 1 if $? >> 8; - &ex ("perl -pi -e 's/ACE VERSION:.*/ACE VERSION: " . - $comp_versions{"ACE_version"} . + &ex ("perl -pi -e 's/ACE VERSION:.*/ACE VERSION: " . + $comp_versions{"ACE_version"} . "/' PROBLEM-REPORT-FORM"); return 1 if $? >> 8; - + chdir "../"; } @@ -557,7 +557,7 @@ sub update_version_files { &ex ("perl -pi -e 's/$component VERSION:.*/$component VERSION: $comp_version/' " . "PROBLEM-REPORT-FORM"); return 1 if $? >> 8; - + chdir "../"; } @@ -598,7 +598,7 @@ sub update_changelog { || return 1; rename "ChangeLog.bak", "ChangeLog" || return 1; - + chdir "../"; 0; @@ -715,11 +715,12 @@ sub create_kit { get_version ("ACE_wrappers", 0); - # Get version but don't update version count + + # Get version but don't udpate version count (my $local_ace_tag = $comp_versions{"ACE_wrappers_version"}) =~ s|_|.|g; my $suffix = ""; - + if ($src_only) { $suffix = "-src"; } @@ -728,17 +729,21 @@ sub create_kit { #### Create kits with group write permission. umask 002; - + my $dest = $install ? "$export_dir" : 'created'; my $dispose = $install ? "$mv" : 'echo'; - my $checksum = "$md5sum"; + my $checksum = $install ? "$md5sum" : 'echo'; my $cksum_ext = 'md5'; my $redirect = $install ? '>' : '\>'; my $shell_cd = $install ? 'cd' : 'echo cd'; + +# (my $local_tao_tag = $kit_tag) =~ s|_|.|g; +# (my $local_ciao_tag = $kit_tag) =~ s|_|.|g; + # These files don't get LF->CRLF conversions done when making the zip. my $bin_files = - "\"\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|\\.xls\|" . + "\"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|\\.xls\|" . "\\.sxd|\\.gif|\\.vcp|\\.vcproj|\\.vcw|\\.sln\|\\.dfm\|\\.jpg\|\\.png\|\\.vsd\|\\.bz2\""; my $build_command; @@ -791,18 +796,18 @@ sub create_kit { &ex ($checksum_command); if ($kit eq 'ace+tao' || $kit eq 'ace+tao+ciao') { - # Set the release files once again + # Set the relese files once again my $tmp_rel_file = ''; - + if ($src_only == 0) { $status = &bootstrap_autotools (); - + if ($status != 0) { die "$0: failed to bootstrap autotools\n"; } } - chomp ($tmp_rel_file = `$regmake -f $ace_root/Release show_release_files`); + chomp ($tmp_rel_file = `$regmake -f $tao_root/Release show_release_files`); $release_files = $base_release_files; $release_files .= ' '; $release_files .= $tmp_rel_file; @@ -877,12 +882,12 @@ sub create_kit { "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip && " . "$dispose $package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $dest && " . "$dispose $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 $dest && " . - "$cp $dest/ACE$suffix.zip $old_versions_dir/ACE$suffix-$local_ace_tag.zip &&". - "$cp $dest/ACE$suffix-lib.zip $old_versions_dir/ACE$suffix-$local_ace_tag-lib.zip &&". - "$cp $dest/ACE$suffix.tar.gz $old_versions_dir/ACE$suffix-$local_ace_tag.tar.gz &&". - "$cp $dest/ACE$suffix-lib.tar.gz $old_versions_dir/ACE$suffix-$local_ace_tag-lib.tar.gz &&". - "$cp $dest/ACE$suffix.tar.bz2 $old_versions_dir/ACE$suffix-$local_ace_tag.tar.bz2 &&". - "$cp $dest/ACE$suffix-lib.tar.bz2 $old_versions_dir/ACEsuffix-$local_ace_tag-lib.tar.bz2;"; + "$cp $dest/ACE$suffix.zip $old_versions_dir/$local_ace_tag.zip &&". + "$cp $dest/ACE$suffix-lib.zip $old_versions_dir/$local_ace_tag-lib.zip &&". + "$cp $dest/ACE$suffix.tar.gz $old_versions_dir/$local_ace_tag.tar.gz &&". + "$cp $dest/ACE$suffix-lib.tar.gz $old_versions_dir/$local_ace_tag-lib.tar.gz &&". + "$cp $dest/ACE$suffix.tar.bz2 $old_versions_dir/$local_ace_tag.tar.bz2 &&". + "$cp $dest/ACE$suffix-lib.tar.bz2 $old_versions_dir/$local_ace_tag-lib.tar.bz2;"; $archives = " $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz ". "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 "; } diff --git a/ACE/configure.ac b/ACE/configure.ac index 4718b6c70cd..8d95e990321 100644 --- a/ACE/configure.ac +++ b/ACE/configure.ac @@ -7863,6 +7863,9 @@ AC_CONFIG_FILES([ protocols/ace/HTBP/Makefile protocols/ace/RMCast/Makefile protocols/ace/TMCast/Makefile + protocols/examples/Makefile + protocols/examples/RMCast/Makefile + protocols/examples/RMCast/Send_Msg/Makefile websvcs/Makefile websvcs/lib/Makefile websvcs/tests/Makefile @@ -7902,7 +7905,6 @@ if test $ace_build_examples = yes; then examples/Bounded_Packet_Relay/Makefile examples/C++NPv1/Makefile examples/C++NPv2/Makefile - examples/ConfigViewer/Makefile examples/Connection/Makefile examples/Connection/blocking/Makefile examples/Connection/misc/Makefile @@ -7965,14 +7967,11 @@ if test $ace_build_examples = yes; then examples/System_V_IPC/Makefile examples/System_V_IPC/SV_Message_Queues/Makefile examples/System_V_IPC/SV_Semaphores/Makefile + examples/TMCast/Makefile + examples/TMCast/Member/Makefile examples/Threads/Makefile examples/Timer_Queue/Makefile examples/Web_Crawler/Makefile - protocols/examples/Makefile - protocols/examples/RMCast/Makefile - protocols/examples/RMCast/Send_Msg/Makefile - protocols/examples/TMCast/Makefile - protocols/examples/TMCast/Member/Makefile ]) fi @@ -7982,23 +7981,23 @@ if test $ace_build_tests = yes; then performance-tests/Makefile performance-tests/Misc/Makefile performance-tests/SCTP/Makefile - performance-tests/Server_Concurrency/Leader_Follower/Makefile performance-tests/Server_Concurrency/Makefile + performance-tests/Server_Concurrency/Leader_Follower/Makefile performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile - performance-tests/Synch-Benchmarks/Base_Test/Makefile performance-tests/Synch-Benchmarks/Makefile - performance-tests/Synch-Benchmarks/Perf_Test/Makefile performance-tests/Synch-Benchmarks/Synch_Lib/Makefile + performance-tests/Synch-Benchmarks/Base_Test/Makefile + performance-tests/Synch-Benchmarks/Perf_Test/Makefile performance-tests/TCP/Makefile performance-tests/UDP/Makefile - protocols/tests/HTBP/Makefile - protocols/tests/HTBP/Reactor_Tests/Makefile - protocols/tests/HTBP/Send_Large_Msg/Makefile - protocols/tests/HTBP/Send_Recv_Tests/Makefile - protocols/tests/HTBP/ping/Makefile protocols/tests/Makefile protocols/tests/RMCast/Makefile tests/Makefile + tests/HTBP/Makefile + tests/HTBP/Reactor_Tests/Makefile + tests/HTBP/Send_Large_Msg/Makefile + tests/HTBP/Send_Recv_Tests/Makefile + tests/HTBP/ping/Makefile tests/SSL/Makefile ]) fi diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index dbe3bf5a53f..2e0e80b50a1 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -139,7 +139,7 @@ No default printer<br> -bash-3.00$ svn co https://svn.dre.vanderbilt.edu/DOC/MPC/trunk DOC_ROOT/ACE/MPC<br> -bash-3.00$ cd DOC_ROOT/<br> -bash-3.00$ ACE/bin/make_release -v beta -u<br> --bash-3.00$ ACE/bin/make_release -i -k ace+tao+ciao<br> +-bash-3.00$ ACE/bin/make_release -k ace+tao+ciao<br> </code> <p> Feel free to cut and paste with suitable edits. @@ -168,36 +168,29 @@ svn rm https://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z<br Note that this <em>only</em> needs to be done if the <em>tagging</em> fails. If kit creation fails, simply restart that process. -<li>The packages and up by default under /export/doc/latest, you can copy them to the webserver using the following commands. At the moment -you execute these commands all users can download these packages.</li> -<code> -cp /export/doc/latest/ACE* /export/www/download.dre/ACE+TAO-distribution<br> -cp /export/doc/previous-versions/ACE* /export/www/download.dre/previous_versions<br> -</code> + <li>Once the distribution is ready, get ready for creating doxygen documentation. This is slightly complicated than it requires. We will address the complexity soon.</li> <li>Login to naboo.dre.vanderbilt.edu as bczar</li> -<ul><li>After login, ssh to bczar@download.dre.vanderbilt.edu as bczar and check whether ssh succeeds. If not fix the problem. The make script tries to copy the tar.gz files to the website using ssh.</li></ul> -<li> go to /web/users/isisbuilds/tmp/ACE_wrappers and remove the contents of this directory</li> +<ul><li>After login, ssh to deuce.doc.wustl.edu as bugzilla and check whether ssh succeeds. If not fix the problem. The make script tries to copy the tar.gz files to the website using ssh.</li></ul> +<li> go to /web/users/isisbuilds/tmp/ACE_wrappers </li> +<li> Set the environment variables pointed above. </li> <li> Update the workspace with the right version tag </li> <code> svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/ACE ACE_wrappers<br> svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/TAO ACE_wrappers/TAO<br> svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/CIAO ACE_wrappers/TAO/CIAO<br> </code> -<li> Set the needed environment variables using</li> -<code> -export ACE_ROOT=/web/users/isisbuilds/tmp/ACE_wrappers/ACE_wrappers -</code> + <li> Run doxygen --version within the shell. </li> -<li> Open up $ACE_ROOT/bin/generate_rel_manpages in your favorite editor.</li> +<li> Open up $ACE_ROOT/bin/generate_rel_mangpages in your favorite editor.</li> <li> Search for the string 'doxy_version'. </li> <li> Check the version specified here. If it is the same as the one you got using doxygen --version then you don't have to worry. </li> <li> If it is different change the value of the doxy_version to the one installed on naboo.dre.vanderbilt.edu.</li> <li> Now you are ready to create documentation </li> -<li> Do a <code>cd $ACE_ROOT</code> and then run <tt>make -f Release manpages</tt> to create the doxygen +<li> Run <tt>make -f Release manpages</tt> to create the doxygen documentation.</li> <ul><li><b>If you can't leave the terminal window active for 6-9 hours, consider prefixing this command with <tt>nohup</tt></b></li></ul> diff --git a/ACE/docs/run_test.txt b/ACE/docs/run_test.txt index e236bcaa4cb..bd483b3105b 100644 --- a/ACE/docs/run_test.txt +++ b/ACE/docs/run_test.txt @@ -201,31 +201,13 @@ used when the server doesn't shut down itself. WaitKill is used when it does (such as when the client calls a shutdown method). Once again, we check the return status. + @verbatim unlink $server_ior; exit $status; @endverbatim -When you need the hostname the test is running on be aware of the -fact that with VxWorks we do cross host testing, part of the test -runs on the target, the other part on the host system. In your test -program add functionality to handle a commandline argument to pass -in the hostname of the target. In the run_test.pl script you can -then use the following code as example. - -@verbatim -$TARGETHOSTNAME = "localhost"; -if (PerlACE::is_vxworks_test()) { - $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'}; - $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210"); - } - else { - $SV = new PerlACE::Process ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210"); - } -$CL = new PerlACE::Process ("client", " -p 43210 -h $TARGETHOSTNAME"); -@endverbatim - And finally, we unlink any files that were created and then just exit with $status. diff --git a/ACE/examples/APG/Active_Objects/Makefile.am b/ACE/examples/APG/Active_Objects/Makefile.am index 5c0c5161247..4562743bc87 100644 --- a/ACE/examples/APG/Active_Objects/Makefile.am +++ b/ACE/examples/APG/Active_Objects/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Config/Makefile.am b/ACE/examples/APG/Config/Makefile.am index a0e289fdf8d..5320bfdf85c 100644 --- a/ACE/examples/APG/Config/Makefile.am +++ b/ACE/examples/APG/Config/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Containers/Makefile.am b/ACE/examples/APG/Containers/Makefile.am index b098b92d55a..e5ef96ad6dc 100644 --- a/ACE/examples/APG/Containers/Makefile.am +++ b/ACE/examples/APG/Containers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Logging/Makefile.am b/ACE/examples/APG/Logging/Makefile.am index 56201a69ba6..69564edb197 100644 --- a/ACE/examples/APG/Logging/Makefile.am +++ b/ACE/examples/APG/Logging/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Makefile.am b/ACE/examples/APG/Makefile.am index 5a191de8a82..f79765c9348 100644 --- a/ACE/examples/APG/Makefile.am +++ b/ACE/examples/APG/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Active_Objects \ diff --git a/ACE/examples/APG/Misc_IPC/Makefile.am b/ACE/examples/APG/Misc_IPC/Makefile.am index 844496c1c0a..656f63fb00c 100644 --- a/ACE/examples/APG/Misc_IPC/Makefile.am +++ b/ACE/examples/APG/Misc_IPC/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Naming/Makefile.am b/ACE/examples/APG/Naming/Makefile.am index 8614b352655..f73b1258348 100644 --- a/ACE/examples/APG/Naming/Makefile.am +++ b/ACE/examples/APG/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Proactor/Makefile.am b/ACE/examples/APG/Proactor/Makefile.am index 644145b9ebc..a7632af1d4f 100644 --- a/ACE/examples/APG/Proactor/Makefile.am +++ b/ACE/examples/APG/Proactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Processes/Makefile.am b/ACE/examples/APG/Processes/Makefile.am index 99ad3796b24..5c45a506304 100644 --- a/ACE/examples/APG/Processes/Makefile.am +++ b/ACE/examples/APG/Processes/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Reactor/Makefile.am b/ACE/examples/APG/Reactor/Makefile.am index 12b7d7ed68f..789c0ce7785 100644 --- a/ACE/examples/APG/Reactor/Makefile.am +++ b/ACE/examples/APG/Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Shared_Memory/Makefile.am b/ACE/examples/APG/Shared_Memory/Makefile.am index cf0b1907879..b114eb0153a 100644 --- a/ACE/examples/APG/Shared_Memory/Makefile.am +++ b/ACE/examples/APG/Shared_Memory/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Signals/Makefile.am b/ACE/examples/APG/Signals/Makefile.am index 2e11d4953bc..ffc67bdd0f0 100644 --- a/ACE/examples/APG/Signals/Makefile.am +++ b/ACE/examples/APG/Signals/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Sockets/Makefile.am b/ACE/examples/APG/Sockets/Makefile.am index 90ae3ae3411..3409703f567 100644 --- a/ACE/examples/APG/Sockets/Makefile.am +++ b/ACE/examples/APG/Sockets/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Streams/Makefile.am b/ACE/examples/APG/Streams/Makefile.am index 11c997ab542..e23f2f22143 100644 --- a/ACE/examples/APG/Streams/Makefile.am +++ b/ACE/examples/APG/Streams/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Svc_Config/Makefile.am b/ACE/examples/APG/Svc_Config/Makefile.am index db90efea3be..9fa3e2f18b6 100644 --- a/ACE/examples/APG/Svc_Config/Makefile.am +++ b/ACE/examples/APG/Svc_Config/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/ThreadManagement/Makefile.am b/ACE/examples/APG/ThreadManagement/Makefile.am index 1a28c357c55..0ed91996db2 100644 --- a/ACE/examples/APG/ThreadManagement/Makefile.am +++ b/ACE/examples/APG/ThreadManagement/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/ThreadPools/Makefile.am b/ACE/examples/APG/ThreadPools/Makefile.am index 4ed1843460c..f1167e857c5 100644 --- a/ACE/examples/APG/ThreadPools/Makefile.am +++ b/ACE/examples/APG/ThreadPools/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/ThreadSafety/Makefile.am b/ACE/examples/APG/ThreadSafety/Makefile.am index 9d5816f68ff..e7c52980171 100644 --- a/ACE/examples/APG/ThreadSafety/Makefile.am +++ b/ACE/examples/APG/ThreadSafety/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Threads/Makefile.am b/ACE/examples/APG/Threads/Makefile.am index a9fad02971b..a5a1b77d76a 100644 --- a/ACE/examples/APG/Threads/Makefile.am +++ b/ACE/examples/APG/Threads/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/APG/Timers/Makefile.am b/ACE/examples/APG/Timers/Makefile.am index 69277afec6e..33976800fec 100644 --- a/ACE/examples/APG/Timers/Makefile.am +++ b/ACE/examples/APG/Timers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/CCM_App/Makefile.am b/ACE/examples/ASX/CCM_App/Makefile.am index c02f0a5e29f..e4051c952ad 100644 --- a/ACE/examples/ASX/CCM_App/Makefile.am +++ b/ACE/examples/ASX/CCM_App/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am index 6a04bb26c4e..1664c15834f 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Makefile.am index f00f4c3dd09..b337a11860a 100644 --- a/ACE/examples/ASX/Event_Server/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Event_Server \ diff --git a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am index 56c1a1eafed..9407ab5873b 100644 --- a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/Makefile.am b/ACE/examples/ASX/Makefile.am index 22df464dcfc..ecfcb575851 100644 --- a/ACE/examples/ASX/Makefile.am +++ b/ACE/examples/ASX/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ CCM_App \ diff --git a/ACE/examples/ASX/Message_Queue/Makefile.am b/ACE/examples/ASX/Message_Queue/Makefile.am index 2bf910700f8..67e75b6c241 100644 --- a/ACE/examples/ASX/Message_Queue/Makefile.am +++ b/ACE/examples/ASX/Message_Queue/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am index f0aca33aa4b..094c82c0f1b 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am +++ b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Bounded_Packet_Relay/Makefile.am b/ACE/examples/Bounded_Packet_Relay/Makefile.am index 8751a3e3c02..5fb14ba2d05 100644 --- a/ACE/examples/Bounded_Packet_Relay/Makefile.am +++ b/ACE/examples/Bounded_Packet_Relay/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/C++NPv1/Makefile.am b/ACE/examples/C++NPv1/Makefile.am index 5da306a48dc..5c46ae7f00d 100644 --- a/ACE/examples/C++NPv1/Makefile.am +++ b/ACE/examples/C++NPv1/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/C++NPv2/Makefile.am b/ACE/examples/C++NPv2/Makefile.am index f3618a5940c..e15da126644 100644 --- a/ACE/examples/C++NPv2/Makefile.am +++ b/ACE/examples/C++NPv2/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.C++NPv2_AC_CLD.am if BUILD_SSL -if BUILD_THREADS +if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR noinst_LTLIBRARIES += libAC_CLD.la @@ -43,12 +43,13 @@ noinst_HEADERS += \ Reactor_Logging_Server_T.cpp endif !BUILD_USES_WCHAR -endif BUILD_THREADS +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.C++NPv2_AIO_CLD.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES += libAIO_CLD.la @@ -69,6 +70,7 @@ noinst_HEADERS += \ AIO_Client_Logging_Daemon.h \ Reactor_Logging_Server_T.cpp +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.C++NPv2_CLD.am @@ -301,6 +303,7 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.C++NPv2_TPCLS.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR noinst_LTLIBRARIES += libTPCLS.la @@ -325,6 +328,7 @@ noinst_HEADERS += \ TPC_Logging_Server.h endif !BUILD_USES_WCHAR +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.C++NPv2_TPLS.am diff --git a/ACE/examples/ConfigViewer/Makefile.am b/ACE/examples/ConfigViewer/Makefile.am deleted file mode 100644 index 6872c046025..00000000000 --- a/ACE/examples/ConfigViewer/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.ConfigViewer.am - -if BUILD_WXWINDOWS -noinst_LTLIBRARIES = libConfigViewer.la - -libConfigViewer_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_WX_CPPFLAGS) - -libConfigViewer_la_SOURCES = \ - ConfigTreeCtrl.cpp \ - ConfigurationViewer.cpp \ - MainFrame.cpp \ - ValueDlg.cpp \ - ValueListCtrl.cpp - -libConfigViewer_la_LDFLAGS = \ - $(ACE_WX_LDFLAGS) - -noinst_HEADERS = \ - ConfigTreeCtrl.h \ - MainFrame.h \ - ValueDlg.h \ - ValueListCtrl.h - -endif BUILD_WXWINDOWS - -EXTRA_DIST = \ - ConfigurationViewer.rc - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Connection/Makefile.am b/ACE/examples/Connection/Makefile.am index 36a9cc8383a..8aa21d598ff 100644 --- a/ACE/examples/Connection/Makefile.am +++ b/ACE/examples/Connection/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ blocking \ diff --git a/ACE/examples/Connection/blocking/Makefile.am b/ACE/examples/Connection/blocking/Makefile.am index 65247fcdb81..a12eab920b8 100644 --- a/ACE/examples/Connection/blocking/Makefile.am +++ b/ACE/examples/Connection/blocking/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Connection/misc/Makefile.am b/ACE/examples/Connection/misc/Makefile.am index 21cf30da4d7..ce3790d2851 100644 --- a/ACE/examples/Connection/misc/Makefile.am +++ b/ACE/examples/Connection/misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Connection/non_blocking/Makefile.am b/ACE/examples/Connection/non_blocking/Makefile.am index e5653968d98..8395e3a9fbb 100644 --- a/ACE/examples/Connection/non_blocking/Makefile.am +++ b/ACE/examples/Connection/non_blocking/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/DLL/Makefile.am b/ACE/examples/DLL/Makefile.am index b2e4825bcef..4973af35bf9 100644 --- a/ACE/examples/DLL/Makefile.am +++ b/ACE/examples/DLL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Export/Makefile.am b/ACE/examples/Export/Makefile.am index ed6989d5be1..74baf4baf66 100644 --- a/ACE/examples/Export/Makefile.am +++ b/ACE/examples/Export/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IOStream/Makefile.am b/ACE/examples/IOStream/Makefile.am index 3ad9fe59404..0a99932ce34 100644 --- a/ACE/examples/IOStream/Makefile.am +++ b/ACE/examples/IOStream/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ client \ diff --git a/ACE/examples/IOStream/client/Makefile.am b/ACE/examples/IOStream/client/Makefile.am index 0f6d5c219fd..e1225bbb6d5 100644 --- a/ACE/examples/IOStream/client/Makefile.am +++ b/ACE/examples/IOStream/client/Makefile.am @@ -6,24 +6,21 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.IOStream_Client.am -noinst_PROGRAMS = iostream_client +noinst_LTLIBRARIES = libIOStream_Client.la -iostream_client_CPPFLAGS = \ +libIOStream_Client_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -iostream_client_SOURCES = \ +libIOStream_Client_la_SOURCES = \ iostream_client.cpp -iostream_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/ACE/examples/IOStream/server/Makefile.am b/ACE/examples/IOStream/server/Makefile.am index fdf8aedaf6d..8b72a1adb62 100644 --- a/ACE/examples/IOStream/server/Makefile.am +++ b/ACE/examples/IOStream/server/Makefile.am @@ -6,24 +6,23 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.IOStream_Server.am -noinst_PROGRAMS = iostream_server +noinst_LTLIBRARIES = libIOStream_Server.la -iostream_server_CPPFLAGS = \ +libIOStream_Server_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -iostream_server_SOURCES = \ - iostream_server.cpp \ - iostream_server.h +libIOStream_Server_la_SOURCES = \ + iostream_server.cpp -iostream_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS = \ + iostream_server.h ## Clean up template repositories, etc. clean-local: diff --git a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am index b545d97b598..e3ee4011b05 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am index ecc65507d22..bb95a489da6 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ reader \ diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am index 8e1cf6f70af..bff70f43cd3 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am index f718cc5a379..613a8d08102 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am index d24d899508b..9a9cba4b837 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am index 14fef21b703..e39aa964edf 100644 --- a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/Makefile.am b/ACE/examples/IPC_SAP/Makefile.am index 31c046f885a..87f2a00844b 100644 --- a/ACE/examples/IPC_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ ATM_SAP \ diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am index 0cac261a76c..50260dc7343 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am index ddfd39b2aab..662c99fc452 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am index 5a0e4bc3dfb..3df4d11db5b 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am index 1e93d808e32..80b48222d22 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am index 3873d2397aa..60054e3c7c0 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Log_Msg/Makefile.am b/ACE/examples/Log_Msg/Makefile.am index 9621e005318..c5d038d332d 100644 --- a/ACE/examples/Log_Msg/Makefile.am +++ b/ACE/examples/Log_Msg/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Logger/Acceptor-server/Makefile.am b/ACE/examples/Logger/Acceptor-server/Makefile.am index bc28535f3b9..bf1824c86d3 100644 --- a/ACE/examples/Logger/Acceptor-server/Makefile.am +++ b/ACE/examples/Logger/Acceptor-server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Logger/Makefile.am b/ACE/examples/Logger/Makefile.am index 29e3225dcbe..3aa67282ba4 100644 --- a/ACE/examples/Logger/Makefile.am +++ b/ACE/examples/Logger/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Acceptor-server \ diff --git a/ACE/examples/Logger/client/Makefile.am b/ACE/examples/Logger/client/Makefile.am index 5254ec79076..d38d5699588 100644 --- a/ACE/examples/Logger/client/Makefile.am +++ b/ACE/examples/Logger/client/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Logger/simple-server/Makefile.am b/ACE/examples/Logger/simple-server/Makefile.am index 05ce9326c65..a018d587b98 100644 --- a/ACE/examples/Logger/simple-server/Makefile.am +++ b/ACE/examples/Logger/simple-server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Makefile.am b/ACE/examples/Makefile.am index 9582b2deca2..1e8ba6f626f 100644 --- a/ACE/examples/Makefile.am +++ b/ACE/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ APG \ @@ -14,7 +14,6 @@ SUBDIRS = \ Bounded_Packet_Relay \ C++NPv1 \ C++NPv2 \ - ConfigViewer \ Connection \ DLL \ Export \ @@ -28,6 +27,7 @@ SUBDIRS = \ NT_Service \ Naming \ OS \ + QOS \ Reactor \ Registry \ Service_Configurator \ @@ -36,6 +36,7 @@ SUBDIRS = \ Smart_Pointers \ Synch \ System_V_IPC \ + TMCast \ Threads \ Timer_Queue \ Web_Crawler diff --git a/ACE/examples/Map_Manager/Makefile.am b/ACE/examples/Map_Manager/Makefile.am index d6d74f539a4..d5f39e68514 100644 --- a/ACE/examples/Map_Manager/Makefile.am +++ b/ACE/examples/Map_Manager/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Mem_Map/IO-tests/Makefile.am b/ACE/examples/Mem_Map/IO-tests/Makefile.am index d0a440481cb..9a6e3638c29 100644 --- a/ACE/examples/Mem_Map/IO-tests/Makefile.am +++ b/ACE/examples/Mem_Map/IO-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Mem_Map/Makefile.am b/ACE/examples/Mem_Map/Makefile.am index 4dec1a54c74..9d8830d2147 100644 --- a/ACE/examples/Mem_Map/Makefile.am +++ b/ACE/examples/Mem_Map/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ IO-tests \ diff --git a/ACE/examples/Mem_Map/file-reverse/Makefile.am b/ACE/examples/Mem_Map/file-reverse/Makefile.am index 9dee643d8b2..02a081a6c88 100644 --- a/ACE/examples/Mem_Map/file-reverse/Makefile.am +++ b/ACE/examples/Mem_Map/file-reverse/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Misc/Makefile.am b/ACE/examples/Misc/Makefile.am index 905f4be7e5f..8bb0b8dc8d8 100644 --- a/ACE/examples/Misc/Makefile.am +++ b/ACE/examples/Misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -100,20 +100,6 @@ test_sstring_SOURCES = \ test_sstring_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Misc_Test_Timestamp.am -noinst_PROGRAMS += test_timestamp - -test_timestamp_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_timestamp_SOURCES = \ - test_timestamp.cpp \ - test_dump.h - -test_timestamp_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Misc_Test_Trace.am noinst_PROGRAMS += test_trace diff --git a/ACE/examples/Misc/test_XtReactor1.cpp b/ACE/examples/Misc/test_XtReactor1.cpp index 62137744cc3..f4bef54aeae 100644 --- a/ACE/examples/Misc/test_XtReactor1.cpp +++ b/ACE/examples/Misc/test_XtReactor1.cpp @@ -4,7 +4,7 @@ // <ecn@clark.net> XtReactor implementation. #include "ace/OS_main.h" -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/Reactor.h" #include "ace/Message_Block.h" #include "ace/Log_Msg.h" diff --git a/ACE/examples/Misc/test_XtReactor2.cpp b/ACE/examples/Misc/test_XtReactor2.cpp index 32bf1c9aa6a..2e2f4be0ba2 100644 --- a/ACE/examples/Misc/test_XtReactor2.cpp +++ b/ACE/examples/Misc/test_XtReactor2.cpp @@ -4,7 +4,7 @@ // XtReactor implementation. #include "ace/OS_main.h" -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/Reactor.h" #include "ace/Message_Block.h" #include "ace/Log_Msg.h" diff --git a/ACE/examples/NT_Service/Makefile.am b/ACE/examples/NT_Service/Makefile.am index 33899b5733e..fbc93c45f6d 100644 --- a/ACE/examples/NT_Service/Makefile.am +++ b/ACE/examples/NT_Service/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Naming/Makefile.am b/ACE/examples/Naming/Makefile.am index 7870f67da3a..de8e2353f18 100644 --- a/ACE/examples/Naming/Makefile.am +++ b/ACE/examples/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/OS/Makefile.am b/ACE/examples/OS/Makefile.am index 7547a62a438..73458dccc45 100644 --- a/ACE/examples/OS/Makefile.am +++ b/ACE/examples/OS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Process diff --git a/ACE/examples/OS/Process/Makefile.am b/ACE/examples/OS/Process/Makefile.am index a1947207928..88eac9e35bd 100644 --- a/ACE/examples/OS/Process/Makefile.am +++ b/ACE/examples/OS/Process/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am index 18d655299e0..c4d51897787 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am index 2968f73620a..980d5cf3422 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am +++ b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Diffserv/Makefile.am b/ACE/examples/QOS/Diffserv/Makefile.am index ae36afe7032..e94221278a2 100644 --- a/ACE/examples/QOS/Diffserv/Makefile.am +++ b/ACE/examples/QOS/Diffserv/Makefile.am @@ -28,8 +28,8 @@ client_SOURCES = \ diffserv_test.cpp client_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO endif BUILD_QOS @@ -48,8 +48,8 @@ server_SOURCES = \ server.cpp server_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Simple/Makefile.am b/ACE/examples/QOS/Simple/Makefile.am index 2bda6a145a3..d86d7cd43eb 100644 --- a/ACE/examples/QOS/Simple/Makefile.am +++ b/ACE/examples/QOS/Simple/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/Reactor/Dgram/Makefile.am b/ACE/examples/Reactor/Dgram/Makefile.am index 260b5fb4a4c..797f4b3d75e 100644 --- a/ACE/examples/Reactor/Dgram/Makefile.am +++ b/ACE/examples/Reactor/Dgram/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/FIFO/Makefile.am b/ACE/examples/Reactor/FIFO/Makefile.am index 664952a1e5c..5540e860968 100644 --- a/ACE/examples/Reactor/FIFO/Makefile.am +++ b/ACE/examples/Reactor/FIFO/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/Makefile.am b/ACE/examples/Reactor/Makefile.am index aced36e2c87..24d9217302d 100644 --- a/ACE/examples/Reactor/Makefile.am +++ b/ACE/examples/Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Dgram \ diff --git a/ACE/examples/Reactor/Misc/Makefile.am b/ACE/examples/Reactor/Misc/Makefile.am index 32b7a7ef89a..47111585f87 100644 --- a/ACE/examples/Reactor/Misc/Makefile.am +++ b/ACE/examples/Reactor/Misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/Multicast/Makefile.am b/ACE/examples/Reactor/Multicast/Makefile.am index 37f6436bcc1..60d65e7ebe8 100644 --- a/ACE/examples/Reactor/Multicast/Makefile.am +++ b/ACE/examples/Reactor/Multicast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/Ntalker/Makefile.am b/ACE/examples/Reactor/Ntalker/Makefile.am index 162cf34a4d8..6efc3521a32 100644 --- a/ACE/examples/Reactor/Ntalker/Makefile.am +++ b/ACE/examples/Reactor/Ntalker/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/Proactor/Makefile.am b/ACE/examples/Reactor/Proactor/Makefile.am index 299e2641042..7f1bc4b8a57 100644 --- a/ACE/examples/Reactor/Proactor/Makefile.am +++ b/ACE/examples/Reactor/Proactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/TP_Reactor/Makefile.am b/ACE/examples/Reactor/TP_Reactor/Makefile.am index 755a91b9624..5407cbb10e1 100644 --- a/ACE/examples/Reactor/TP_Reactor/Makefile.am +++ b/ACE/examples/Reactor/TP_Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am index f77fb8f3164..cfa1c687b6c 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am +++ b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Registry/Makefile.am b/ACE/examples/Registry/Makefile.am index fc72c526226..1e02e33abb2 100644 --- a/ACE/examples/Registry/Makefile.am +++ b/ACE/examples/Registry/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am index 3ad9fe59404..0a99932ce34 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ client \ diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am index 440e67db7b4..b6dd5a3d7b8 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am index 26192c73f1b..954697dfba3 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Service_Configurator/Makefile.am b/ACE/examples/Service_Configurator/Makefile.am index 8a3ecc74489..1b78bb27757 100644 --- a/ACE/examples/Service_Configurator/Makefile.am +++ b/ACE/examples/Service_Configurator/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ IPC-tests \ diff --git a/ACE/examples/Service_Configurator/Misc/Makefile.am b/ACE/examples/Service_Configurator/Misc/Makefile.am index 29a625cf764..f0de4232add 100644 --- a/ACE/examples/Service_Configurator/Misc/Makefile.am +++ b/ACE/examples/Service_Configurator/Misc/Makefile.am @@ -6,21 +6,21 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Service_Configurator_Misc_Timer.am -noinst_LTLIBRARIES = libTimer.la +noinst_LTLIBRARIES = libtimer.la -libTimer_la_CPPFLAGS = \ +libtimer_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -DACE_BUILD_SVC_DLL -libTimer_la_SOURCES = \ +libtimer_la_SOURCES = \ Timer_Service.cpp noinst_HEADERS = \ @@ -38,7 +38,7 @@ main_SOURCES = \ Timer_Service.h main_LDADD = \ - libTimer.la \ + libtimer.la \ $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. diff --git a/ACE/examples/Shared_Malloc/Makefile.am b/ACE/examples/Shared_Malloc/Makefile.am index 99ff0b3ab9a..baccb0359e0 100644 --- a/ACE/examples/Shared_Malloc/Makefile.am +++ b/ACE/examples/Shared_Malloc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Shared_Memory/Makefile.am b/ACE/examples/Shared_Memory/Makefile.am index 8b11509cc63..864c7a5b071 100644 --- a/ACE/examples/Shared_Memory/Makefile.am +++ b/ACE/examples/Shared_Memory/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Smart_Pointers/Makefile.am b/ACE/examples/Smart_Pointers/Makefile.am index f4a565a22d6..4595d7dafaa 100644 --- a/ACE/examples/Smart_Pointers/Makefile.am +++ b/ACE/examples/Smart_Pointers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Synch/Makefile.am b/ACE/examples/Synch/Makefile.am index 32db117ef20..09319f393b3 100644 --- a/ACE/examples/Synch/Makefile.am +++ b/ACE/examples/Synch/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/System_V_IPC/Makefile.am b/ACE/examples/System_V_IPC/Makefile.am index a505dc9b737..23b52ee8b29 100644 --- a/ACE/examples/System_V_IPC/Makefile.am +++ b/ACE/examples/System_V_IPC/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ SV_Message_Queues \ diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am index 6689900c0fe..eadb6b8df53 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am index 26f0d5d5642..de9a88952a6 100644 --- a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am +++ b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/examples/TMCast/Makefile.am b/ACE/examples/TMCast/Makefile.am index 358fc18ef31..ad8cc650602 100644 --- a/ACE/protocols/examples/TMCast/Makefile.am +++ b/ACE/examples/TMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Member diff --git a/ACE/protocols/examples/TMCast/Member/.cvsignore b/ACE/examples/TMCast/Member/.cvsignore index fa6ecc72251..fa6ecc72251 100644 --- a/ACE/protocols/examples/TMCast/Member/.cvsignore +++ b/ACE/examples/TMCast/Member/.cvsignore diff --git a/ACE/protocols/examples/TMCast/Member/Makefile.am b/ACE/examples/TMCast/Member/Makefile.am index c5c5c31c34f..fe970a85ef5 100644 --- a/ACE/protocols/examples/TMCast/Member/Makefile.am +++ b/ACE/examples/TMCast/Member/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/examples/TMCast/Member/Member.mpc b/ACE/examples/TMCast/Member/Member.mpc index 29f274f51f3..29f274f51f3 100644 --- a/ACE/protocols/examples/TMCast/Member/Member.mpc +++ b/ACE/examples/TMCast/Member/Member.mpc diff --git a/ACE/protocols/examples/TMCast/Member/README b/ACE/examples/TMCast/Member/README index 6a62a107a77..6a62a107a77 100644 --- a/ACE/protocols/examples/TMCast/Member/README +++ b/ACE/examples/TMCast/Member/README diff --git a/ACE/protocols/examples/TMCast/Member/member.cpp b/ACE/examples/TMCast/Member/member.cpp index f89c68564ea..f89c68564ea 100644 --- a/ACE/protocols/examples/TMCast/Member/member.cpp +++ b/ACE/examples/TMCast/Member/member.cpp diff --git a/ACE/examples/Threads/Makefile.am b/ACE/examples/Threads/Makefile.am index f7e3bb56415..edd80b72542 100644 --- a/ACE/examples/Threads/Makefile.am +++ b/ACE/examples/Threads/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp index f8b3f9793ab..18d12b8017a 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp @@ -206,14 +206,12 @@ signal_handler (int signum) break; /* NOTREACHED */ -#if !defined (ACE_LACKS_UNIX_SIGNALS) case SIGQUIT: ACE_ERROR ((LM_ERROR, "shutting down on SIGQUIT%a\n", 1)); /* NOTREACHED */ break; -#endif } } @@ -224,12 +222,10 @@ signal_handler (int signum) static void register_signal_handlers (void) { -#if !defined (ACE_LACKS_UNIX_SIGNALS) // Register SIGQUIT (never blocked). ACE_Sig_Action sigquit ((ACE_SignalHandler) signal_handler, SIGQUIT); ACE_UNUSED_ARG (sigquit); -#endif // Don't let the SIGALRM interrupt the SIGINT handler! ACE_Sig_Set ss; diff --git a/ACE/examples/Timer_Queue/Makefile.am b/ACE/examples/Timer_Queue/Makefile.am index 0c504a1723d..e2109fde6d6 100644 --- a/ACE/examples/Timer_Queue/Makefile.am +++ b/ACE/examples/Timer_Queue/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/Web_Crawler/Makefile.am b/ACE/examples/Web_Crawler/Makefile.am index 028235b984e..00a30a4d2e1 100644 --- a/ACE/examples/Web_Crawler/Makefile.am +++ b/ACE/examples/Web_Crawler/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU index 83dce0bb58a..a32d995bd36 100644 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU @@ -135,6 +135,14 @@ ifneq ($(exceptions),1) CCFLAGS += +noeh endif +# Additionally, on HP-UX 10.20, suppress 495 to shut up the warnings from +# the system header files. 667 is also suppressed, but the compiler still +# tells you there was a future error, but at least you can pick out any real +# errors by quickly scanning the output. 829 is suppressed because the +# system headers have offending string literals assigned to char *. +ifeq ($(word 2,$(HPVERS_WORDS)), 10) +CCFLAGS += +W495,667,829,908 +endif DCCFLAGS += -g DLD = $(CXX) $(CCFLAGS) LD = $(CXX) @@ -150,6 +158,9 @@ SOFLAGS += -b ifeq ($(distrib),1) +ifeq ($(word 2,$(HPVERS_WORDS)), 10) +SOFLAGS += -Wl,-x -Wl,+h/usr/lib/$(@F) +else ifeq ($(buildbits),32) SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib endif @@ -160,6 +171,7 @@ ifeq ($(buildbits),64) SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 endif endif +endif endif @@ -202,13 +214,29 @@ else endif endif -#11.x: -ifeq ($(threads),1) - # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it. - ifeq ($(findstring -mt,$(CCFLAGS)),) - ## -L./ must directly preceed the system libraries for 64-bit builds - ## with aCC 3.27. Without this change, libpthread.sl can not be found. - LIBS += -L./ -lpthread +# +# Grab the appropriate libraries based on the version of HP-UX we're building +# on and whether or not thread support is being used. +# +ifeq ($(word 2,$(HPVERS_WORDS)), 11) + + #11.x: + ifeq ($(threads),1) + # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it. + ifeq ($(findstring -mt,$(CCFLAGS)),) + ## -L./ must directly preceed the system libraries for 64-bit builds + ## with aCC 3.27. Without this change, libpthread.sl can not be found. + LIBS += -L./ -lpthread + endif + endif + LIBS += -lxti -lrt -ldld + +else + + # 10.x: + LIBS += -lxti -ldld + ifeq ($(threads),1) + LIBS += -lcma endif + endif -LIBS += -lxti -lrt -ldld diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU index 47ac90b5f32..4e8ca06a59f 100644 --- a/ACE/include/makeinclude/platform_lynxos.GNU +++ b/ACE/include/makeinclude/platform_lynxos.GNU @@ -1,7 +1,7 @@ # $Id$ # -# LynxOS with g++. Defaults to LynxOS Version 4.0.0. For Version 4.2.0, -# for example, add "VERSION=4.2.0" to your make invocation. +# LynxOS with g++. Defaults to LynxOS Version 4.0.0. For Version 3.1.0, +# for example, add "VERSION=3.1.0" to your make invocation. #### NOTE: It's best to create a file that includes this one, instead #### of symlinking it. That way, you can easily override the default @@ -109,6 +109,7 @@ endif ifeq ($(shared_libs),1) CFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING + CFLAGS += -DACE_HAS_BROKEN_THREAD_KEYFREE SOFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING LIBS += -ldl else @@ -132,7 +133,7 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \ $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o PRELIB = @true -# Test for template instantiation, add to SOFLAGS if SONAME set, +# Test for template instantiation, add to SOFLAGS if SONAME set, # add -E to LDFLAGS if using GNU ld # include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU index ecbfab3947b..0110c5805a3 100644 --- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU +++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU @@ -12,7 +12,6 @@ threads ?= 1 shared_libs = static_libs = 1 -rwho = 0 ifeq (,$(RTEMS_MAKEFILE_PATH)) default: diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index 2b0ded6127f..766e8921373 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -79,12 +79,12 @@ else # VLIBS endif # IDL_SRC endif # !VLIBS -VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir $(var)),$(var)))) +VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(if $(findstring ../,$(var)),$(notdir $(var)),$(var)))) ifdef LSRC2 LSRC += $(LSRC2) endif -VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir $(var)),$(var)))) +VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(if $(findstring ../,$(var)),$(notdir $(var)),$(var)))) ifneq ($(IDL_SRC),) $(VLOBJS) $(VSHOBJS): $(IDL_SRC) diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index e1c8bfea36f..71e37f61733 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -90,46 +90,28 @@ endif # static_link = 1 OS ?= -# Define a canned command set to create the output object directory if needed. -ifeq ($(vxworks_ntbuild),1) -define mk_obj_out_dir -@if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) -@echo > $(dir $@).creation_stamp -endef -else -define mk_obj_out_dir -@-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) -endef -endif - -$(VDIR)%.o: %.c - $(mk_obj_out_dir) +$(VDIR)%.o: %.c $(VDIR)%.creation_stamp $(COMPILE.c) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} -$(VDIR)%.o: %.cpp - $(mk_obj_out_dir) +$(VDIR)%.o: %.cpp $(VDIR)%.creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} -$(VDIR)%.o: %.C - $(mk_obj_out_dir) +$(VDIR)%.o: %.C $(VDIR)%.creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} -$(VDIR)%.o: %.cc - $(mk_obj_out_dir) +$(VDIR)%.o: %.cc $(VDIR)%.creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} -$(VDIR)%.o: %.cxx - $(mk_obj_out_dir) +$(VDIR)%.o: %.cxx $(VDIR)%.creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} ifneq (,$(COMPILE.rc)) -$(VDIR)%.rc.o: %.rc - $(mk_obj_out_dir) +$(VDIR)%.rc.o: %.rc $(VDIR)%.creation_stamp $(COMPILE.rc) $< $@ ${MVCMD} endif # COMPILE.rc @@ -144,55 +126,67 @@ ifndef SOLINK # that the service configurator needs to be able to function). # 970104 Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> ifdef (ESOBUILD) -$(VSHDIR)%.$(SOEXT): %.cpp - $(mk_obj_out_dir) +$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR)%.creation_stamp $(ESOBUILD) else # ! ESOBUILD -$(VSHDIR)%.$(SOEXT): %.cpp - $(mk_obj_out_dir) +$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR)%.creation_stamp $(SOBUILD) endif # ESOBUILD ifeq ($(split), 1) -$(VSHDIR)%.$(OBJEXT): %.cpp - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) SPLIT/`echo $< | sed "s/.cpp/_S\*/"` mv *.$(OBJEXT) $(VSHDIR) else # ! split -$(VSHDIR)%.$(OBJEXT): %.cpp - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< endif # split -$(VSHDIR)%.$(OBJEXT): %.cc - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.cc $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< -$(VSHDIR)%.$(OBJEXT): %.C - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.C $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< -$(VSHDIR)%.$(OBJEXT): %.cxx - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.cxx $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< -$(VSHDIR)%.$(OBJEXT): %.c - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.c $(VSHDIR)%.creation_stamp $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $< ifneq (,$(COMPILE.rc)) -$(VSHDIR)%.rc.$(OBJEXT): %.rc - $(mk_obj_out_dir) +$(VSHDIR)%.rc.$(OBJEXT): %.rc $(VSHDIR)%.creation_stamp $(COMPILE.rc) $< $@ endif # COMPILE.rc -$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT) - $(mk_obj_out_dir) +$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT) $(VSHDIR)%.creation_stamp $(SOLINK) endif # SOLINK +ifeq ($(vxworks_ntbuild),1) +$(VDIR)%.creation_stamp: + @if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) + @echo > $@ +else +.PHONY: $(VDIR)%.creation_stamp +$(VDIR)%.creation_stamp: + @-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) +endif + +ifneq ($(VDIR),$(VSHDIR)) + ifeq ($(vxworks_ntbuild),1) +$(VSHDIR)%.creation_stamp: + @if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) + @echo > $@ + else +.PHONY: $(VSHDIR)%.creation_stamp +$(VSHDIR)%.creation_stamp: + @-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) + endif +endif + #---------------------------------------------------------------------------- # Library generation targets #---------------------------------------------------------------------------- diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index da3d833a1cd..77b1aed4442 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -589,12 +589,14 @@ endif ec_typed_events ?= 1 ifeq ($(exceptions),0) + ifeq ($(ACE_HAS_GNUG_PRE_2_8),0) #### Disable the default exception handling of g++ >= 2.8.0. ifneq ($(ACE_GNUG_ON_UNIXWARE),) CCFLAGS += -fcheck-new else CCFLAGS += -fno-exceptions -fcheck-new endif # ! ACE_GNUG_ON_UNIXWARE + endif # ! ACE_HAS_GNUG_PRE_2_8 else # exceptions CPPFLAGS += -DACE_HAS_EXCEPTIONS ifndef include_env @@ -603,6 +605,17 @@ else # exceptions ifeq ($(include_env),1) CPPFLAGS += -DACE_ENV_BKWD_COMPAT endif + ifeq ($(ACE_HAS_GNUG_PRE_2_8),1) + #### Enable exception handling with g++ < 2.8.0. Not recommended, + #### but provided here for completeness. + CCFLAGS += -fhandle-exceptions +# else # ! ACE_HAS_GNUG_PRE_2_8 +# ifeq ($(ACE_HAS_GNUG_PRE_2_8),0) +# #### Disable this warning on g++ >= 2.8.0 if exceptions are enabled, +# #### it gets confused and reports too many bogus warnings. +# CCFLAGS += -Wno-uninitialized +# endif # g++ > 2.8.0 + endif # ! ACE_HAS_GNUG_PRE_2_8 ACE_MAKE_OPTIONS += exceptions endif # exceptions diff --git a/ACE/m4/ace.m4 b/ACE/m4/ace.m4 index 1c854152de2..96b7d334767 100644 --- a/ACE/m4/ace.m4 +++ b/ACE/m4/ace.m4 @@ -487,9 +487,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS], ACE_ENABLE_TK_REACTOR ACE_ENABLE_XT_REACTOR - # placeholder for WxWindows/wxWidgets support - AM_CONDITIONAL([BUILD_WXWINDOWS], false) - AC_ARG_ENABLE([gperf], AS_HELP_STRING(--enable-gperf,compile the gperf program [[[yes]]]), [ @@ -1420,5 +1417,3 @@ AM_CONDITIONAL([BUILD_ACE_XTREACTOR], AM_CONDITIONAL([BUILD_TAO_XTRESOURCE], [test X$ace_user_enable_xt_reactor = Xyes]) ]) - - diff --git a/ACE/netsvcs/Makefile.am b/ACE/netsvcs/Makefile.am index d4bf0e1c092..422221e4029 100644 --- a/ACE/netsvcs/Makefile.am +++ b/ACE/netsvcs/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ lib \ diff --git a/ACE/netsvcs/clients/Logger/Makefile.am b/ACE/netsvcs/clients/Logger/Makefile.am index af2c7cb74a8..8c3ae8decb3 100644 --- a/ACE/netsvcs/clients/Logger/Makefile.am +++ b/ACE/netsvcs/clients/Logger/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/clients/Makefile.am b/ACE/netsvcs/clients/Makefile.am index 5d7b4bd7e99..c959505ff73 100644 --- a/ACE/netsvcs/clients/Makefile.am +++ b/ACE/netsvcs/clients/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Logger \ diff --git a/ACE/netsvcs/clients/Naming/Client/Makefile.am b/ACE/netsvcs/clients/Naming/Client/Makefile.am index f7b6d2ec5fd..548b9be4a8e 100644 --- a/ACE/netsvcs/clients/Naming/Client/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Client/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am index 1e427bfd1be..38ed1977b42 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/clients/Naming/Makefile.am b/ACE/netsvcs/clients/Naming/Makefile.am index ad4d7a0b8af..883b9bab54d 100644 --- a/ACE/netsvcs/clients/Naming/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Client \ diff --git a/ACE/netsvcs/clients/Tokens/collection/Makefile.am b/ACE/netsvcs/clients/Tokens/collection/Makefile.am index d2aa7bf8c1b..9d3fbcc5ddd 100644 --- a/ACE/netsvcs/clients/Tokens/collection/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/collection/Makefile.am @@ -15,4 +15,4 @@ noinst_PROGRAMS = \ collection_SOURCES = collection.cpp collection_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am index 5e25ccd0fb3..d995e71620b 100644 --- a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am @@ -16,4 +16,4 @@ noinst_PROGRAMS = \ deadlock_detection_test_SOURCES = deadlock_detection_test.cpp deadlock_detection_test_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am index 83b621b5a42..37817911015 100644 --- a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am @@ -16,5 +16,5 @@ noinst_PROGRAMS = \ invariant_SOURCES = invariant.cpp invariant_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/manual/Makefile.am b/ACE/netsvcs/clients/Tokens/manual/Makefile.am index 4a2cbf60788..b2945a96bd3 100644 --- a/ACE/netsvcs/clients/Tokens/manual/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/manual/Makefile.am @@ -16,7 +16,7 @@ noinst_PROGRAMS = \ manual_SOURCES = manual.cpp manual_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am index 56dd1efccf2..63d02af7d97 100644 --- a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am @@ -16,6 +16,6 @@ noinst_PROGRAMS = \ test_mutex_SOURCES = test_mutex.cpp test_mutex_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am index 972d8a64faa..265a3a09558 100644 --- a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am @@ -16,5 +16,5 @@ noinst_PROGRAMS = \ rw_locks_SOURCES = rw_locks.cpp rw_locks_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/lib/Makefile.am b/ACE/netsvcs/lib/Makefile.am index 54b8ed75617..7614800dc4e 100644 --- a/ACE/netsvcs/lib/Makefile.am +++ b/ACE/netsvcs/lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/servers/Makefile.am b/ACE/netsvcs/servers/Makefile.am index a01f7f89c56..ded1ad91998 100644 --- a/ACE/netsvcs/servers/Makefile.am +++ b/ACE/netsvcs/servers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/Makefile.am b/ACE/performance-tests/Makefile.am index 8893d7354cb..1aac8a5c388 100644 --- a/ACE/performance-tests/Makefile.am +++ b/ACE/performance-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Misc \ diff --git a/ACE/performance-tests/Misc/Makefile.am b/ACE/performance-tests/Misc/Makefile.am index 965fc6cfb41..d6b7af67f43 100644 --- a/ACE/performance-tests/Misc/Makefile.am +++ b/ACE/performance-tests/Misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/SCTP/Makefile.am b/ACE/performance-tests/SCTP/Makefile.am index 6d5d23cac4f..8532440e3f6 100644 --- a/ACE/performance-tests/SCTP/Makefile.am +++ b/ACE/performance-tests/SCTP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am index e2fabc53e18..38021abd626 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/Server_Concurrency/Makefile.am b/ACE/performance-tests/Server_Concurrency/Makefile.am index 5d8482ab96d..9a5b0c57e66 100644 --- a/ACE/performance-tests/Server_Concurrency/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Leader_Follower \ diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am index 00d31705dcd..feb7783689d 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am index f5f4158d270..b050480b9bc 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,27 +16,18 @@ ACE_ROOT = $(top_srcdir) if !BUILD_ACE_FOR_TAO -noinst_LTLIBRARIES = libBase_Test.la +noinst_LTLIBRARIES = libSynch_Benchmarks_Base_Test.la -libBase_Test_la_CPPFLAGS = \ +libSynch_Benchmarks_Base_Test_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(srcdir)/.. -libBase_Test_la_SOURCES = \ +libSynch_Benchmarks_Base_Test_la_SOURCES = \ Baseline_Test.cpp \ base_test.cpp \ mutex_test.cpp -../Synch_Lib: - mkdir -p ../Synch_Lib - -libBase_Test_la_DEPENDENCIES = \ - ../Synch_Lib - -libBase_Test_la_LDFLAGS = \ - -L../Synch_Lib - noinst_HEADERS = \ Baseline_Test.h \ Baseline_Test.inl diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc index 47d16a47bb3..7b0de88e4c9 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc @@ -7,10 +7,5 @@ project : acelib { after += Synch_Lib libs += Synch_Lib libpaths += ../Synch_Lib - - specific (automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } + includes += .. } diff --git a/ACE/performance-tests/Synch-Benchmarks/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Makefile.am index 6464aa9c07c..f0272750af1 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -27,9 +27,6 @@ synch_driver_CPPFLAGS = \ synch_driver_SOURCES = \ synch_driver.cpp -synch_driver_LDFLAGS = \ - -LSynch_Lib - synch_driver_LDADD = \ $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am index ac4f8fc9a00..99d37c3aa72 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,14 +16,14 @@ ACE_ROOT = $(top_srcdir) if !BUILD_ACE_FOR_TAO -noinst_LTLIBRARIES = libPerf_Test.la +noinst_LTLIBRARIES = libSynch_Benchmarks_Perf_Test.la -libPerf_Test_la_CPPFLAGS = \ +libSynch_Benchmarks_Perf_Test_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(srcdir)/.. -libPerf_Test_la_SOURCES = \ +libSynch_Benchmarks_Perf_Test_la_SOURCES = \ Adaptive_Lock_Performance_Test_Base.cpp \ Benchmark_Performance.cpp \ Performance_Test.cpp \ @@ -46,15 +46,6 @@ libPerf_Test_la_SOURCES = \ sysvsema_test.cpp \ token_test.cpp -../Synch_Lib: - mkdir -p ../Synch_Lib - -libPerf_Test_la_DEPENDENCIES = \ - ../Synch_Lib - -libPerf_Test_la_LDFLAGS = \ - -L../Synch_Lib - noinst_HEADERS = \ Adaptive_Lock_Performance_Test_Base.h \ Benchmark_Performance.h \ diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc index 751d29dc1c1..f6a879deacd 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc @@ -7,10 +7,5 @@ project : acelib { after += Synch_Lib libs += Synch_Lib libpaths += ../Synch_Lib - - specific (automake) { - includes += $(srcdirs)/.. - } else { - includes += .. - } + includes += .. } diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am index 673ec4a0155..05c71adde0c 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/TCP/Makefile.am b/ACE/performance-tests/TCP/Makefile.am index d048881aeda..3ebae23da8e 100644 --- a/ACE/performance-tests/TCP/Makefile.am +++ b/ACE/performance-tests/TCP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/UDP/Makefile.am b/ACE/performance-tests/UDP/Makefile.am index 6aea010518d..e9dc7db03f2 100644 --- a/ACE/performance-tests/UDP/Makefile.am +++ b/ACE/performance-tests/UDP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/ace/HTBP/Makefile.am b/ACE/protocols/ace/HTBP/Makefile.am index bd824576b86..9119681ffca 100644 --- a/ACE/protocols/ace/HTBP/Makefile.am +++ b/ACE/protocols/ace/HTBP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ace/HTBP pkgconfigdir = @libdir@/pkgconfig @@ -72,7 +72,7 @@ CLEANFILES = \ ACE_HTBP.pc ACE_HTBP.pc: ${top_builddir}/config.status ${srcdir}/ACE_HTBP.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_HTBP.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_HTBP.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/protocols/ace/Makefile.am b/ACE/protocols/ace/Makefile.am index c476b3583bc..d62d1164dcc 100644 --- a/ACE/protocols/ace/Makefile.am +++ b/ACE/protocols/ace/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ HTBP \ diff --git a/ACE/protocols/ace/RMCast/Makefile.am b/ACE/protocols/ace/RMCast/Makefile.am index 51e73d4041e..ac4adeea41e 100644 --- a/ACE/protocols/ace/RMCast/Makefile.am +++ b/ACE/protocols/ace/RMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ace/RMCast pkgconfigdir = @libdir@/pkgconfig @@ -67,7 +67,7 @@ CLEANFILES = \ ACE_RMCast.pc ACE_RMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_RMCast.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_RMCast.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_RMCast.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS diff --git a/ACE/protocols/ace/TMCast/Makefile.am b/ACE/protocols/ace/TMCast/Makefile.am index c524083fd92..c4873787693 100644 --- a/ACE/protocols/ace/TMCast/Makefile.am +++ b/ACE/protocols/ace/TMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ace/TMCast pkgconfigdir = @libdir@/pkgconfig @@ -57,7 +57,7 @@ CLEANFILES = \ ACE_TMCast.pc ACE_TMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_TMCast.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_TMCast.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_TMCast.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS diff --git a/ACE/protocols/examples/Makefile.am b/ACE/protocols/examples/Makefile.am index b435d1c3fe2..fd0f6f9494d 100644 --- a/ACE/protocols/examples/Makefile.am +++ b/ACE/protocols/examples/Makefile.am @@ -6,9 +6,8 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ - RMCast \ - TMCast + RMCast diff --git a/ACE/protocols/examples/RMCast/Makefile.am b/ACE/protocols/examples/RMCast/Makefile.am index ef4f29c4f65..784d3215def 100644 --- a/ACE/protocols/examples/RMCast/Makefile.am +++ b/ACE/protocols/examples/RMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Send_Msg diff --git a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am index eb9a09d771f..a49d0afa6c7 100644 --- a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am +++ b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/Makefile.am b/ACE/protocols/tests/Makefile.am index 7bb6fdd829e..fd0f6f9494d 100644 --- a/ACE/protocols/tests/Makefile.am +++ b/ACE/protocols/tests/Makefile.am @@ -6,9 +6,8 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ - HTBP \ RMCast diff --git a/ACE/protocols/tests/RMCast/Makefile.am b/ACE/protocols/tests/RMCast/Makefile.am index dadabcac905..3c832d00c1c 100644 --- a/ACE/protocols/tests/RMCast/Makefile.am +++ b/ACE/protocols/tests/RMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp index 7e476287853..0b34751da3c 100644 --- a/ACE/tests/FlReactor_Test.cpp +++ b/ACE/tests/FlReactor_Test.cpp @@ -27,7 +27,7 @@ ACE_RCSID(tests, FlReactor_Test, "$Id$") -#include "ace/FlReactor/FlReactor.h" +#include "ace/FlReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" diff --git a/ACE/protocols/tests/HTBP/HTBP_Config.conf b/ACE/tests/HTBP/HTBP_Config.conf index 49dfd238ec3..49dfd238ec3 100644 --- a/ACE/protocols/tests/HTBP/HTBP_Config.conf +++ b/ACE/tests/HTBP/HTBP_Config.conf diff --git a/ACE/protocols/tests/HTBP/Makefile.am b/ACE/tests/HTBP/Makefile.am index d38309ca6a4..7fd964b7c84 100644 --- a/ACE/protocols/tests/HTBP/Makefile.am +++ b/ACE/tests/HTBP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Reactor_Tests \ diff --git a/ACE/protocols/tests/HTBP/README b/ACE/tests/HTBP/README index 65a2bde0320..65a2bde0320 100644 --- a/ACE/protocols/tests/HTBP/README +++ b/ACE/tests/HTBP/README diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/.cvsignore b/ACE/tests/HTBP/Reactor_Tests/.cvsignore index 955ffdc75d5..955ffdc75d5 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/.cvsignore +++ b/ACE/tests/HTBP/Reactor_Tests/.cvsignore diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am b/ACE/tests/HTBP/Reactor_Tests/Makefile.am index 153e1206bb1..813229103d5 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am +++ b/ACE/tests/HTBP/Reactor_Tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc b/ACE/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc index 61e59146a93..61e59146a93 100755 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc +++ b/ACE/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/tests/HTBP/Reactor_Tests/client.cpp index 2813d9116f3..2813d9116f3 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp +++ b/ACE/tests/HTBP/Reactor_Tests/client.cpp diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/inside.conf b/ACE/tests/HTBP/Reactor_Tests/inside.conf index a5bcbc14420..a5bcbc14420 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/inside.conf +++ b/ACE/tests/HTBP/Reactor_Tests/inside.conf diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/run_test.pl b/ACE/tests/HTBP/Reactor_Tests/run_test.pl index ae4c56c7fb2..ae4c56c7fb2 100755 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/run_test.pl +++ b/ACE/tests/HTBP/Reactor_Tests/run_test.pl diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/tests/HTBP/Reactor_Tests/server.cpp index 87a914163c2..87a914163c2 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp +++ b/ACE/tests/HTBP/Reactor_Tests/server.cpp diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/tests/HTBP/Reactor_Tests/test_config.h index efd4eb7bcc6..efd4eb7bcc6 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/tests/HTBP/Reactor_Tests/test_config.h diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/.cvsignore b/ACE/tests/HTBP/Send_Large_Msg/.cvsignore index 955ffdc75d5..955ffdc75d5 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/.cvsignore +++ b/ACE/tests/HTBP/Send_Large_Msg/.cvsignore diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am b/ACE/tests/HTBP/Send_Large_Msg/Makefile.am index 870836f47f4..2773356439b 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am +++ b/ACE/tests/HTBP/Send_Large_Msg/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc b/ACE/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc index d973b59748f..d973b59748f 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc +++ b/ACE/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp b/ACE/tests/HTBP/Send_Large_Msg/client.cpp index 62cd9140da8..62cd9140da8 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp +++ b/ACE/tests/HTBP/Send_Large_Msg/client.cpp diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/run_test.pl b/ACE/tests/HTBP/Send_Large_Msg/run_test.pl index 6b295afbf17..6b295afbf17 100755 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/run_test.pl +++ b/ACE/tests/HTBP/Send_Large_Msg/run_test.pl diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/tests/HTBP/Send_Large_Msg/server.cpp index 7b7f51cf1b9..7b7f51cf1b9 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp +++ b/ACE/tests/HTBP/Send_Large_Msg/server.cpp diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/.cvsignore b/ACE/tests/HTBP/Send_Recv_Tests/.cvsignore index b82dc859445..b82dc859445 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/.cvsignore +++ b/ACE/tests/HTBP/Send_Recv_Tests/.cvsignore diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am b/ACE/tests/HTBP/Send_Recv_Tests/Makefile.am index c9628903cf1..03775f077a4 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am +++ b/ACE/tests/HTBP/Send_Recv_Tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp index d462a11c3d3..d462a11c3d3 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp +++ b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc index 64a40f688d1..64a40f688d1 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc +++ b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc diff --git a/ACE/protocols/tests/HTBP/htbptest.mpb b/ACE/tests/HTBP/htbptest.mpb index c12f33ef7ba..c12f33ef7ba 100644 --- a/ACE/protocols/tests/HTBP/htbptest.mpb +++ b/ACE/tests/HTBP/htbptest.mpb diff --git a/ACE/protocols/tests/HTBP/ping/.cvsignore b/ACE/tests/HTBP/ping/.cvsignore index 955ffdc75d5..955ffdc75d5 100644 --- a/ACE/protocols/tests/HTBP/ping/.cvsignore +++ b/ACE/tests/HTBP/ping/.cvsignore diff --git a/ACE/protocols/tests/HTBP/ping/Makefile.am b/ACE/tests/HTBP/ping/Makefile.am index b59b297e535..279d82a03c0 100644 --- a/ACE/protocols/tests/HTBP/ping/Makefile.am +++ b/ACE/tests/HTBP/ping/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/ping/client.cpp b/ACE/tests/HTBP/ping/client.cpp index e7753faab6d..e7753faab6d 100644 --- a/ACE/protocols/tests/HTBP/ping/client.cpp +++ b/ACE/tests/HTBP/ping/client.cpp diff --git a/ACE/protocols/tests/HTBP/ping/ping.mpc b/ACE/tests/HTBP/ping/ping.mpc index 61e59146a93..61e59146a93 100755 --- a/ACE/protocols/tests/HTBP/ping/ping.mpc +++ b/ACE/tests/HTBP/ping/ping.mpc diff --git a/ACE/protocols/tests/HTBP/ping/run_test.pl b/ACE/tests/HTBP/ping/run_test.pl index ae4c56c7fb2..ae4c56c7fb2 100755 --- a/ACE/protocols/tests/HTBP/ping/run_test.pl +++ b/ACE/tests/HTBP/ping/run_test.pl diff --git a/ACE/protocols/tests/HTBP/ping/server.cpp b/ACE/tests/HTBP/ping/server.cpp index d20d46b8b09..d20d46b8b09 100644 --- a/ACE/protocols/tests/HTBP/ping/server.cpp +++ b/ACE/tests/HTBP/ping/server.cpp diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp index f9c60764bca..f9c60764bca 100644..100755 --- a/ACE/tests/Integer_Truncate_Test.cpp +++ b/ACE/tests/Integer_Truncate_Test.cpp diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index d7a836b59cd..4436a90b26c 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -503,14 +503,14 @@ Log_Spec_Verify::log (ACE_Log_Record &log_record) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Log_Spec_Verify, unrecognized test: %s\n"), b)); - ++this->fail_; + this->fail_++; } if (b != log_record.msg_data () && ACE_OS::strcmp (b, expect) != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Test %s failed; expected %s\n"), log_record.msg_data (), expect)); - ++this->fail_; + this->fail_++; } return; @@ -557,9 +557,6 @@ test_format_specs (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%ITWO\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%IONE\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%IENDINDENTING\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%W\n"), ACE_TEXT_WIDE ("My string test\n"))); - ACE_TCHAR* nill_string = 0; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%W\n"), nill_string)); errno = ENOENT; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%m %p\n"), ACE_TEXT("perror"))); return 0; diff --git a/ACE/tests/Makefile.am b/ACE/tests/Makefile.am index f494e8ead55..0de38407ea0 100644 --- a/ACE/tests/Makefile.am +++ b/ACE/tests/Makefile.am @@ -6,13 +6,14 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) SUBDIRS = \ . \ + HTBP \ SSL @@ -339,21 +340,6 @@ Bug_1576_Regression_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Bug_1890_Regression_Test.am -noinst_PROGRAMS += Bug_1890_Regression_Test - -Bug_1890_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_1890_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_1890_Regression_Test.cpp - -Bug_1890_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Bug_2368_Regression_Test.am noinst_PROGRAMS += Bug_2368_Regression_Test @@ -384,36 +370,6 @@ Bug_2497_Regression_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Bug_2540_Regression_Test.am -noinst_PROGRAMS += Bug_2540_Regression_Test - -Bug_2540_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2540_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2540_Regression_Test.cpp - -Bug_2540_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_2653_Regression_Test.am -noinst_PROGRAMS += Bug_2653_Regression_Test - -Bug_2653_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2653_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2653_Regression_Test.cpp - -Bug_2653_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.CDR_Array_Test.am if !BUILD_ACE_FOR_TAO @@ -1068,21 +1024,6 @@ IOStream_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Integer_Truncate_Test.am -noinst_PROGRAMS += Integer_Truncate_Test - -Integer_Truncate_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Integer_Truncate_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Integer_Truncate_Test.cpp - -Integer_Truncate_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Lazy_Map_Manager_Test.am noinst_PROGRAMS += Lazy_Map_Manager_Test @@ -1099,8 +1040,6 @@ Lazy_Map_Manager_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Library_Unload.am - -if !BUILD_WINCE noinst_PROGRAMS += UnloadLibACE UnloadLibACE_SOURCES = \ @@ -1150,8 +1089,6 @@ UnloadLibACE_SOURCES = \ Upgradable_RW_Test.h \ test_config.h -endif !BUILD_WINCE - ## Makefile.Log_Msg_Test.am if !BUILD_ACE_FOR_TAO @@ -1978,7 +1915,7 @@ CLEANFILES = \ QtReactor_Test_moc.cpp QtReactor_Test_moc.cpp: $(srcdir)/QtReactor_Test.h - $(QTDIR)/bin/moc $(srcdir)/QtReactor_Test.h -o QtReactor_Test_moc.cpp + $(QTDIR)/bin/moc -o QtReactor_Test_moc.cpp $(srcdir)/QtReactor_Test.h noinst_PROGRAMS += QtReactor_Test @@ -2313,25 +2250,6 @@ SOCK_Dgram_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.SOCK_Netlink_Test.am - -if !BUILD_ACE_FOR_TAO -noinst_PROGRAMS += SOCK_Netlink_Test - -SOCK_Netlink_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Netlink_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Netlink_Test.cpp - -SOCK_Netlink_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - ## Makefile.SOCK_SEQPACK_SCTP_Test.am if !BUILD_ACE_FOR_TAO diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index 5d108bafc4f..fa7b058e4e4 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -524,74 +524,6 @@ string_emulation_test (void) return 0; } -// Test ACE_OS::snprintf -int -snprintf_test (void) -{ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing snprintf\n"))); - - int error_count = 0; - const int BUFSIZE = 4; - char buf[2*BUFSIZE]; - int retval; - - ACE_OS::memset(buf, 0xab, 2*BUFSIZE); - retval = ACE_OS::snprintf (buf, BUFSIZE, "%d", 123); - if (retval != 3) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[1] ACE_OS::snprintf() returns %d, should be 3\n"), - retval)); - ++error_count; - } - - ACE_OS::memset(buf, 0xab, 2*BUFSIZE); - retval = ACE_OS::snprintf (buf, BUFSIZE, "%d", 1234); - if (retval != 4) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[2] ACE_OS::snprintf() returns %d, should be 4\n"), - retval)); - ++error_count; - } - - if (buf[3] != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[3] ACE_OS::snprintf() doesn't terminate string correctly\n"))); - ++error_count; - } - else if (ACE_OS::strcmp(buf, "123") != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[4] ACE_OS::snprintf() incorrect output\n"))); - ++error_count; - } - - ACE_OS::memset(buf, 0xab, 2*BUFSIZE); - retval = ACE_OS::snprintf (buf, BUFSIZE, "%d", 12345); - if (retval != 5) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[5] ACE_OS::snprintf() returns %d, should be 5\n"), - retval)); - ++error_count; - } - else if (buf[3] != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[6] ACE_OS::snprintf() doesn't terminate string correctly\n"))); - ++error_count; - } - else if (ACE_OS::strcmp(buf, "123") != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[6] ACE_OS::snprintf() incorrect output\n"))); - ++error_count; - } - - return error_count; -} static int ctime_r_test (void) @@ -907,9 +839,6 @@ run_main (int, ACE_TCHAR *[]) if ((result = string_emulation_test ()) != 0) status = result; - if ((result = snprintf_test ()) != 0) - status = result; - if ((result = ctime_r_test ()) != 0) status = result; diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index 1bbb2d43c74..c228802988b 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -51,7 +51,7 @@ ACE_RCSID (tests, #include "ace/OS_NS_time.h" #include "ace/Time_Value.h" -#include "ace/QtReactor/QtReactor.h" +#include "ace/QtReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" #include "ace/Connector.h" diff --git a/ACE/tests/RB_Tree_Test.cpp b/ACE/tests/RB_Tree_Test.cpp index 1b3658d72b1..c276a96cafd 100644 --- a/ACE/tests/RB_Tree_Test.cpp +++ b/ACE/tests/RB_Tree_Test.cpp @@ -97,413 +97,279 @@ run_main (int, ACE_TCHAR *[]) str_int_test.run_test (); str_str_test.run_test (); -// ======= Stress Test contributed by Klaus H. Wolf <hw@cyland.com> ========= +// ======= Stress Test contributed by Klaus H. Wolf <hw@cyland.com> ================== ACE_RB_Tree<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex> tree; tree.bind (ACE_CString ("51"), 1); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("13"), 2); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("36"), 3); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("15"), 4); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("22"), 5); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("25"), 6); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("42"), 7); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("48"), 8); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("03"), 9); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("56"), 10); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("28"), 11); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("55"), 12); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("21"), 13); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("62"), 14); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("18"), 15); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("20"), 16); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("26"), 17); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("29"), 18); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("50"), 19); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("05"), 20); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("59"), 21); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("65"), 22); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("66"), 23); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("45"), 24); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("34"), 25); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("27"), 26); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("40"), 27); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("30"), 28); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("64"), 29); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("11"), 30); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("16"), 31); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("47"), 32); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("10"), 33); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("37"), 34); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("09"), 35); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("54"), 36); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("23"), 37); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("44"), 38); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("19"), 39); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("00"), 40); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("04"), 41); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("63"), 42); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("08"), 43); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("39"), 44); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("31"), 45); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("02"), 46); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("33"), 47); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("60"), 48); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("61"), 49); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("57"), 50); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("43"), 51); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("46"), 52); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("38"), 53); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("01"), 54); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("12"), 55); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("24"), 56); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("52"), 57); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("07"), 58); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("14"), 59); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("06"), 60); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("58"), 61); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("49"), 62); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("17"), 63); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("53"), 64); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("32"), 65); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("35"), 66); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("41"), 67); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("51")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("13")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("36")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("15")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("22")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("25")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("42")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("48")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("03")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("56")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("28")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("55")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("21")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("62")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("18")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("20")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("26")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("29")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("50")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("05")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("59")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("65")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("66")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("45")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("34")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("27")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("40")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("30")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("64")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("11")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("16")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("47")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("10")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("37")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("09")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("54")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("23")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("44")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("19")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("00")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("04")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("63")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("08")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("39")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("31")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("02")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("33")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("60")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("61")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("57")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("43")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("46")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("38")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("01")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("12")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("24")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("52")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("07")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("14")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("06")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("58")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("49")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("17")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("53")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("32")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("35")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("41")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); // ======== End Stress Test =================== @@ -566,32 +432,20 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (v { INT_ID item; int k = order_index_ [i]; - if (!(k >= 0 && k < entry_count_)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Assert failure at line %l\n"))); + ACE_ASSERT (k >= 0 && k < entry_count_); // Test the new stable ACE_Hash_Map_Manager_Ex compliant interface. - if (0 != stable_tree_.bind (key_array_ [k], item_array_ [k])) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable bind %p\n"), - ACE_TEXT ("failure"))); - - if (0 != stable_tree_.find (key_array_ [k], item) || - item != item_array_ [k]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable find %p\n"), - ACE_TEXT ("failure"))); + ACE_ASSERT (stable_tree_.bind (key_array_ [k], + item_array_ [k]) == 0); + ACE_ASSERT (stable_tree_.find (key_array_ [k], item) == 0 + && item == item_array_ [k]); // Test the deprecated interface. - if (0 == deprecated_tree_.insert (key_array_ [k], item_array_ [k])) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated insert %p\n"), - ACE_TEXT ("failure"))); - - if (0 == deprecated_tree_.find (key_array_ [k]) || - *deprecated_tree_.find (key_array_ [k]) != item_array_ [k]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated find %p\n"), - ACE_TEXT ("failure"))); + ACE_ASSERT (deprecated_tree_.insert (key_array_ [k], + item_array_ [k]) != 0); + ACE_ASSERT (deprecated_tree_.find (key_array_ [k]) != 0 + && *deprecated_tree_.find (key_array_ [k]) == + item_array_ [k]); } } @@ -615,32 +469,16 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it INT_ID item; item = (*stable_fwd_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); item = (*stable_rev_iter_).item (); - if (item != item_array_ [entry_count_ - i - 1]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [entry_count_ - i - 1]); item = (*deprecated_fwd_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated fwd iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); item = (*deprecated_rev_iter_).item (); - if (item != item_array_ [entry_count_ - i - 1]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [entry_count_ - i - 1]); // Advance each iterator. ++stable_fwd_iter_; @@ -657,18 +495,11 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it // Make sure each item in each tree has been visited - if (stable_fwd_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); - if (stable_rev_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); - if (deprecated_fwd_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); - if (deprecated_rev_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); + ACE_ASSERT (stable_fwd_iter_.done () == 1); + ACE_ASSERT (stable_rev_iter_.done () == 1); + ACE_ASSERT (deprecated_fwd_iter_.done () == 1); + ACE_ASSERT (deprecated_rev_iter_.done () == 1); + } template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void @@ -683,11 +514,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration INT_ID item; item = (*part_rev_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Partial rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); part_rev_iter_++; } @@ -697,11 +524,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration INT_ID item; item = (*part_fwd_iter_).item (); - if (item != item_array_ [k]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Partial fwd iter, pass %d %p\n"), - k, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [k]); part_fwd_iter_++; } } @@ -717,18 +540,10 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (vo { // Test the new stable ACE_Hash_Map_Manager_Ex compliant // interface. - if (stable_tree_.unbind (key_array_ [i]) != 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable tree, failure pass %d %p\n"), - i, - ACE_TEXT ("unbind"))); + ACE_ASSERT (stable_tree_.unbind (key_array_ [i]) == 0); // Test the deprecated interface. - if (deprecated_tree_.remove (key_array_ [i]) != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated tree, failure pass %d %p\n"), - i, - ACE_TEXT ("remove"))); + ACE_ASSERT (deprecated_tree_.remove (key_array_ [i]) == 1); } } @@ -753,32 +568,17 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_ite INT_ID item; item = (*stable_fwd_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); + item = (*stable_rev_iter_).item (); - if (item != item_array_ [entry_count_ - i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [entry_count_ - i]); item = (*deprecated_fwd_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated fwd iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); item = (*deprecated_rev_iter_).item (); - if (item != item_array_ [entry_count_ - i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [entry_count_ - i]); // Advance each iterator via postfix increment. stable_fwd_iter_++; @@ -788,18 +588,10 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_ite } // Make sure each item in each tree has been visited a second time. - if (stable_fwd_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); - if (stable_rev_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable rev iter not done but should be\n"))); - if (deprecated_fwd_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated fwd iter not done but should be\n"))); - if (deprecated_rev_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated rev iter not done but should be\n"))); + ACE_ASSERT (stable_fwd_iter_.done () == 1); + ACE_ASSERT (stable_rev_iter_.done () == 1); + ACE_ASSERT (deprecated_fwd_iter_.done () == 1); + ACE_ASSERT (deprecated_rev_iter_.done () == 1); } diff --git a/ACE/tests/SSL/Makefile.am b/ACE/tests/SSL/Makefile.am index ee10293e8ca..c3ae6261b1b 100644 --- a/ACE/tests/SSL/Makefile.am +++ b/ACE/tests/SSL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -45,6 +45,7 @@ endif BUILD_SSL ## Makefile.Thread_Pool_Reactor_SSL_Test.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test @@ -68,6 +69,7 @@ Thread_Pool_Reactor_SSL_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Clean up template repositories, etc. diff --git a/ACE/tests/TkReactor_Test.cpp b/ACE/tests/TkReactor_Test.cpp index 7987d44dcce..cee329ef5b2 100644 --- a/ACE/tests/TkReactor_Test.cpp +++ b/ACE/tests/TkReactor_Test.cpp @@ -34,7 +34,7 @@ ACE_RCSID (tests, #include "ace/SOCK_Connector.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" -#include "ace/TkReactor/TkReactor.h" +#include "ace/TkReactor.h" #include "ace/OS_NS_unistd.h" #include <tcl.h> diff --git a/ACE/tests/XtAthenaReactor_Test.cpp b/ACE/tests/XtAthenaReactor_Test.cpp index cf0530ee552..d5abb90c4e0 100644 --- a/ACE/tests/XtAthenaReactor_Test.cpp +++ b/ACE/tests/XtAthenaReactor_Test.cpp @@ -32,7 +32,7 @@ ACE_RCSID (tests, XtAthenaReactor_Test, "$Id$") -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" diff --git a/ACE/tests/XtMotifReactor_Test.cpp b/ACE/tests/XtMotifReactor_Test.cpp index 7aabc230fbb..643b1e9dfbd 100644 --- a/ACE/tests/XtMotifReactor_Test.cpp +++ b/ACE/tests/XtMotifReactor_Test.cpp @@ -31,7 +31,7 @@ ACE_RCSID (tests, XtMotifReactor_Test, "$Id$") -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" diff --git a/ACE/websvcs/Makefile.am b/ACE/websvcs/Makefile.am index 038bf2ff84f..be02feea0e1 100644 --- a/ACE/websvcs/Makefile.am +++ b/ACE/websvcs/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ lib \ diff --git a/ACE/websvcs/lib/Makefile.am b/ACE/websvcs/lib/Makefile.am index 689c2933594..0536fecbb66 100644 --- a/ACE/websvcs/lib/Makefile.am +++ b/ACE/websvcs/lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/websvcs/tests/Makefile.am b/ACE/websvcs/tests/Makefile.am index 88395996658..868befa72a0 100644 --- a/ACE/websvcs/tests/Makefile.am +++ b/ACE/websvcs/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) |