ChangeLogTag:Tue Nov 15 15:41:19 2005 Steve Huston <shuston@riverace.com>

4 files changed, 52 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index bc653a93d9b..7a12d2182a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Nov 15 15:41:19 2005  Steve Huston  <shuston@riverace.com>
+
+	* NEWS: Added WinCE, VC8, ACE_Dev_Poll_Reactor, and ACE_RB_Tree notes.
+
+	* bin/make_release: Generate VC8 files for both Win32 and WinCE.
+	  Since VC8 uses the same suffixes as VC71, the Win32 files have
+	  _vc8 appended, and WinCE files have _WinCE appended. WinCE files
+	  are generated with feature uses_wchar=1, vc8 uses defaults.
+
+	* docs/CE-status.txt: Added some info on CE support under VC8.
+
 Tue Nov 15 12:44:37 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* bin/MakeProjectCreator/config/cidlc.mpb
diff --git a/NEWS b/NEWS
index f03b76a1ce8..3a646b92dac 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,17 @@ USER VISIBLE CHANGES BETWEEN ACE-5.4.7 and ACE-5.4.8
 
 . Support for Intel C++ 9.0 on Windows and Linux
 
+. Support for Microsoft Visual Studio 2005 (aka VC8) for Win32 as well as the
+  Windows CE platforms Pocket PC 2003 and Windows Mobile 5. Solution/project
+  files are generated with an appended "_vc8" for Win32 and "_WinCE" for
+  the CE platforms. See ACE_wrappers/docs/CE-status.txt for more information.
+
+. Completed implementation of ACE_Dev_Poll_Reactor using the Linux epoll
+  facility; tested on Red Hat Enterprise Linux 4.
+
+. The in-memory size of an ACE_RB_Tree will be smaller due to rearranged
+  placement of pointers.
+
 USER VISIBLE CHANGES BETWEEN ACE-5.4.6 and ACE-5.4.7
 ====================================================
 
diff --git a/bin/make_release b/bin/make_release
index fed8b8bb27f..749129a2698 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -778,10 +778,6 @@ sub diff () {
 ########
 sub generate_makefiles () {
 
-    # At this point, the only mwc/mpc files are in ace and tests. When more
-    # are available, this needs to be updated, maybe by cycling through
-    # all non-TAO directories looking for mwc (or mpc?) files.
-    #
     # The current ACE_ROOT setting is where this script started from, not
     # the staging area we want to generate files in. So, we need to
     # specifically set the -relative option on mwc to replace ACE_ROOT
@@ -802,11 +798,27 @@ sub generate_makefiles () {
 
     my $static_option = $tmp_static_option.$mpc_option;
 
+    # Visual Studio 2005 (aka VC8) uses the same file suffixes as VC7.1, so
+    # append _vc8 to the names.
+    my $vc8_option = '-name_modifier *_vc8';
+
+    # Additionally, VC8 can do Windows CE builds and these can be
+    # configured in. However, the CE builds have uses_wchar turned on,
+    # so we don't mix them with the Win32 VC8 files. The complete list of
+    # available platforms known at this point is in
+    # $MPC_ROOT/template/vc8_platforms.mpt - since the default is Win32
+    # and we're generating only CE builds, replace it instead of adding to it.
+    my $tmp_ce = '-value_template platforms=\'"Pocket PC 2003 (ARMV4)"\' ';
+    $tmp_ce = $tmp_ce.'-value_template platforms+=\'"Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"\'';
+    my $ce_option = '-name_modifier *_WinCE -features uses_wchar=1 '.$tmp_ce;
+
     &ex ("cd ACE_wrappers; \
           bin/mwc.pl $exclude_option $mpc_option; \
           find ./ -name 'GNUmake*' | /usr/bin/xargs chmod 0644");
 
     &ex ("cd ACE_wrappers; \
+          bin/mwc.pl -type vc8 $mpc_option $exclude_option $vc8_option; \
+          bin/mwc.pl -type vc8 $mpc_option $exclude_option $ce_option; \
           bin/mwc.pl -type vc71 $mpc_option $exclude_option; \
           bin/mwc.pl -type vc6  $mpc_option $exclude_option; \
           bin/mwc.pl -type borland  $mpc_option $exclude_option; \
diff --git a/docs/CE-status.txt b/docs/CE-status.txt
index f3f77f1c32c..3b618df0980 100644
--- a/docs/CE-status.txt
+++ b/docs/CE-status.txt
@@ -1,12 +1,12 @@
 /**
 @page wince ACE on Windows CE status
 
-Last updated Tuesday 04-March-2003 by Steve Huston <shuston@riverace.com>
+Last updated Tuesday 15-November-2005 by Steve Huston <shuston@riverace.com>
 
 @subsection ce_status Status
 
-As of ACE 5.3, Riverace supports ACE on Windows CE 3 with the
-PocketPC 2002 SDK and on Windows CE 4 with the Standard SDK.
+As of ACE 5.5, Riverace supports ACE on Windows CE building with Microsoft
+Visual Studio 2005 and targeting the Pocket PC 2003 SDK and Windows Mobile 5.
 OCI supports TAO 1.3 on at least Windows CE 3 with the PocketPC 2002 SDK.
 Contact the individual support provider for complete information regarding
 these platforms as well as the supported hardware targets.
@@ -23,6 +23,16 @@ Developers working with sources checked out from CVS must generate the
 project and workspace files locally using MPC. The autobuild system's
 generate_makefile and generate_workspace commands can be used for this.
 
+@subsection ce_vc8 Visual Studio 2005 Projects
+
+The ACE release process generates the needed Visual Studio 2005 solution and
+project files with "_WinCE" appended to the name (e.g. ACE_WinCE.vcproj) to
+distinguish them from both Win32-targeted VC8 projects (ACE_vc8.vcproj) and
+Visual Studio 2003 projects (ACE.vcproj). The files are generated with
+the "Pocket PC 2003 SDK (ARMV4)" and "Windows Mobile 5.0 Pocket PC SDK
+(ARMV4I)" platforms defined. To add additional platforms, the files must be
+regenerated using MPC.
+
 @subsection ce_wchar Unicode/WChar
 
 ACE on WindowsCE automatically has ACE_HAS_WCHAR and ACE_USES_WCHAR turned
@@ -38,4 +48,4 @@ copy the test files to a PocketPC device, run the test, and copy the log
 files back to the build machine for analysis and reporting to the
 scoreboard.
 
-*/
\ No newline at end of file
+*/