merged from trunk.

7 files changed, 47 insertions, 11 deletions

diff --git a/modules/ACE/ChangeLog b/modules/ACE/ChangeLog
index 8d5adef84ef..ac5389bd4b1 100644
--- a/modules/ACE/ChangeLog
+++ b/modules/ACE/ChangeLog
@@ -1,10 +1,38 @@
-Tue Jul 14 14:52:48 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+Wed Jul 15 14:43:33 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/gperf/src/gperf.mpc:
+          Made the library name different to resolve problems with vxtest
+
+Wed Jul 15 14:41:33 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/gperf/src/gperf_export.h:
+          Fixed problem with static builds
+
+Tue Jul 14 20:59:33 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao-ciao.spec:
+          Fixed problem with created MPC package
+
+        * rpmbuild/ace-tao-rpmlintrc.txt:
+          Removed txt mapping
+
+Tue Jul 14 15:16:33 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * apps/gperf/src/gperf_export.h:
 
           Missing file from earlier merge, thanks to Phil Mesnier for
-          pointing this out. 
-        
+          pointing this out.
+
+Tue Jul 14 14:24:20 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/bczar/bczar.html:
+          No need to update the spec file manually anymore
+
+Tue Jul 14 14:13:20 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          ace/OS.h is now illegal to be used in CIAO
+
 Tue Jul 14 13:31:20 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
          * include/makeinclude/platform_linux.GNU:
diff --git a/modules/ACE/NEWS b/modules/ACE/NEWS
index a05e0e51b30..1a0e342fd9d 100644
--- a/modules/ACE/NEWS
+++ b/modules/ACE/NEWS
@@ -6,11 +6,21 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 USER VISIBLE CHANGES BETWEEN ACE-5.7.1 and ACE-5.7.2
 ====================================================
 
+. Borland C++ makefiles aren't shipped anymore as part of the release
+  but have to be generated by the user
+
+. Refactored gperf to have its own shared library so that we can reuse
+  that in TAO
+
 USER VISIBLE CHANGES BETWEEN ACE-5.7.0 and ACE-5.7.1
 ====================================================
 
 . Added support for Sun Studio 12 Update Pack 1
 
+. Fixed compile problems when using Windows CE x86 release mode
+
+. Fixed compile problems for FreeBSD
+
 USER VISIBLE CHANGES BETWEEN ACE-5.6.9 and ACE-5.7.0
 ====================================================
 
diff --git a/modules/ACE/apps/gperf/src/gperf.mpc b/modules/ACE/apps/gperf/src/gperf.mpc
index a9052e52ed5..5b1e56cae32 100644
--- a/modules/ACE/apps/gperf/src/gperf.mpc
+++ b/modules/ACE/apps/gperf/src/gperf.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project(ACE_gperf) : acelib, install, crosscompile, ace_output {
-  sharedname   = ACE_gperf
+  sharedname   = ACE_gperf_lib
   dynamicflags = ACE_GPERF_BUILD_DLL
   Source_Files {
     Options.cpp
@@ -20,7 +20,7 @@ project(ACE_gperf) : acelib, install, crosscompile, ace_output {
 project(gperf) : aceexe, install, crosscompile {
   install = $(ACE_ROOT)/bin
   after += ACE_gperf
-  libs += ACE_gperf
+  libs += ACE_gperf_lib
   exename = ace_gperf
   Source_Files {
     gperf.cpp
diff --git a/modules/ACE/bin/fuzz.pl b/modules/ACE/bin/fuzz.pl
index e8d84ec2a3e..7c55953c7e5 100755
--- a/modules/ACE/bin/fuzz.pl
+++ b/modules/ACE/bin/fuzz.pl
@@ -955,7 +955,7 @@ sub check_for_OS_h_include ()
                 if (/FUZZ\: enable check_for_OS_h_include/) {
                     $disable = 0;
                 }
-                if ($disable == 0
+                if ($disable == 0 and ($file =~ /.*CIAO.*/)
                     and /^\s*#\s*include\s*\"ace\/OS\.h\"/) {
                     print_error ("$file:$.: expensive ace/OS.h included; consider an OS_NS_*.h file");
                     print " OS.h is very expensive in both ";
@@ -2054,7 +2054,7 @@ check_for_NULL () if ($opt_l >= 1);
 check_for_inline () if ($opt_l >= 2);
 check_for_math_include () if ($opt_l >= 3);
 check_for_synch_include () if ($opt_l >= 6);
-check_for_OS_h_include () if ($opt_l >= 6);
+check_for_OS_h_include () if ($opt_l >= 5);
 check_for_line_length () if ($opt_l >= 8);
 check_for_preprocessor_comments () if ($opt_l >= 7);
 check_for_tchar () if ($opt_l >= 4);
diff --git a/modules/ACE/docs/bczar/bczar.html b/modules/ACE/docs/bczar/bczar.html
index 81081bf1d13..e355bdd6696 100644
--- a/modules/ACE/docs/bczar/bczar.html
+++ b/modules/ACE/docs/bczar/bczar.html
@@ -391,8 +391,6 @@
       <li>
         Update the NEWS, TAO/NEWS, and TAO/CIAO/NEWS files to have a new section for the next release.</li>
       <li>
-        Update the rpmbuild/*.spec files to have a new version for the next release.</li>
-      <li>
         Validate the packages on the webserver whether they are really containing the new release. Make at least
         one builid where you run the TAO Hello world test and check if the libraries are having the
         correct version number.</li>
diff --git a/modules/ACE/rpmbuild/ace-tao-ciao.spec b/modules/ACE/rpmbuild/ace-tao-ciao.spec
index d65d0f8ef89..0445981d270 100644
--- a/modules/ACE/rpmbuild/ace-tao-ciao.spec
+++ b/modules/ACE/rpmbuild/ace-tao-ciao.spec
@@ -498,7 +498,7 @@ Summary:      Make Project Creator
 Version:      %{ACEVER}
 Group:        Development/Tools/Building
 %if !0%{?suse_version}
-Provides:     perl(Driver) perl(MakeProjectBase) perl(ObjectGenerator) perl(ProjectCreator) perl(WorkspaceCreator) perl(WorkspaceHelper) perl(DependencyWriter)
+Provides:     perl(Driver) perl(MakeProjectBase) perl(ObjectGenerator) perl(ProjectCreator) perl(WorkspaceCreator) perl(WorkspaceHelper) perl(DependencyWriter) perl (WIXProjectCreator)
 %endif
 
 %description -n mpc
@@ -2043,7 +2043,7 @@ fi
 %files -n ace-gperf
 %defattr(-,root,root,-)
 %{_bindir}/ace_gperf
-%{_libdir}/ACE_gperfd.so.%{ACEVERSO}
+%{_libdir}/ACE_gperfd_lib.so.%{ACEVERSO}
 %attr(0644,root,root) %{_mandir}/man1/ace_gperf.1%{_extension}
 %attr(0644,root,root) %{_infodir}/ace_gperf.info%{_extension}
 
diff --git a/modules/ACE/rpmbuild/ace-tao-rpmlintrc.txt b/modules/ACE/rpmbuild/ace-tao-rpmlintrc
index 0c4de34e6c5..0c4de34e6c5 100644
--- a/modules/ACE/rpmbuild/ace-tao-rpmlintrc.txt
+++ b/modules/ACE/rpmbuild/ace-tao-rpmlintrc