Bug 2170, 2171

3 files changed, 30 insertions, 25 deletions

diff --git a/cppe/INSTALL.LINUX b/cppe/INSTALL.LINUX
index 99108ae8ffd..8631d13fe37 100644
--- a/cppe/INSTALL.LINUX
+++ b/cppe/INSTALL.LINUX
@@ -6,13 +6,24 @@ Requirements
 Operating System
 ----------------
 
-A recent Linux distribution for x86 or x86_64.
+Ice-E is expected to build and run properly on any recent Linux
+distribution for x86 and x86_64. However, Ice-E is officially supported
+only on:
+
+ - Red Hat Enterprise Linux Advanced Server 4 Update 4 for x86 or
+   x86_64 (RHEL 4.4)
+
+ - Novell SuSE Linux Enterprise Server 10 for x86 or x86_64 (SLES 10)
 
 
 C++ compiler
 ------------
 
-- GCC 3.2, 3.3, 3.4, or 4.0.1 or later
+Ice-E is expected to build properly with GCC 3.3 or later. However, only
+the following compilers are officially supported:
+
+ - GCC 3.4.6 on RHEL 4.4
+ - GCC 4.1.x on SLES 10
 
 
 Slice-to-Embedded-C++ translator
@@ -52,15 +63,7 @@ $ cd IceE-@ver@
 Review the README file to determine whether you want to modify the
 default set of features provided by the run time libraries. Next,
 edit config/Make.rules to establish your build configuration. The
-comments in the file provide more information. Pay particular
-attention to the variables that define the locations of the third-
-party libraries.
-
-If you want to build Ice-E with the Intel C++ compiler, first set the
-following environment variables:
-
-$ export CC=icc
-$ export CXX=icpc
+comments in the file provide more information. 
 
 Now you're ready to build Ice-E:
 
@@ -80,8 +83,9 @@ $ python allTests.py
 If everything worked out, you should see lots of "ok" messages. In
 case of a failure, the tests abort with "failed".
 
-If you want to try out any of the demos, make sure to update your
-LD_LIBRARY_PATH environment variable to add the "lib" directory:
+If you want to try out any of the demos and you did not build Ice-E
+statically, make sure to update your LD_LIBRARY_PATH environment
+variable to add the "lib" directory:
 
 $ export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
 
diff --git a/cppe/INSTALL.WINCE b/cppe/INSTALL.WINCE
index cae78c5e669..081fe2b2ee1 100644
--- a/cppe/INSTALL.WINCE
+++ b/cppe/INSTALL.WINCE
@@ -81,6 +81,6 @@ Simply run "nmake /f Makefile.mak install". This will install Ice-E in
 the directory specified by the "prefix" variable in config\Make.rules.mak.
 
 After installation, make sure to add the include directory to the
-Visual C++ "Include files" and the lib directory to the "Library
-files" (Tools->Options->Projects and Solutions->VC++ Directories).
+Visual C++ "Include files" and the lib directory to the "Library files"
+in the IDE (Tools->Options->Projects and Solutions->VC++ Directories).
 
diff --git a/cppe/INSTALL.WINDOWS b/cppe/INSTALL.WINDOWS
index b541382cc9c..93d46f7082c 100644
--- a/cppe/INSTALL.WINDOWS
+++ b/cppe/INSTALL.WINDOWS
@@ -6,7 +6,10 @@ Requirements
 Windows version
 ---------------
 
-Ice-E has been extensively tested with Windows XP.
+Ice-E has been extensively tested on:
+
+- Windows XP x86
+- Windows Vista x86
 
 
 C++ compiler
@@ -62,8 +65,8 @@ For example:
 > cd C:\IceE-@ver@
 
 Edit config\Make.rules.mak to establish your build configuration. The
-comments in the file provide more information. In particular, you
-must set CPP_COMPILER to the appropriate compiler.
+comments in the file provide more information. In particular, you must
+ensure that CPP_COMPILER is set appropriately for your environment.
 
 Now you're ready to build Ice-E:
 
@@ -82,9 +85,9 @@ python allTests.py
 If everything worked out, you should see lots of "ok" messages. In
 case of a failure, the tests abort with "failed".
 
-If you want to try out any of the demos, make sure to update your PATH
-environment variable to add the "bin" directory that contains the
-Ice-E DLLs.
+If you want to try out any of the demos and you did not build Ice-E
+statically, make sure to update your PATH environment variable to add 
+the "bin" directory that contains the Ice-E DLLs.
 
 
 ======================================================================
@@ -95,7 +98,5 @@ Simply run "nmake /f Makefile.mak install". This will install Ice-E in
 the directory specified by the "prefix" variable in config\Make.rules.mak.
 
 After installation, make sure to add the include directory to the
-Visual C++ "Include files" and the lib directory to the "Library
-files" in the Visual C++ IDE:
-
-  * Tools->Options->Projects and Solutions->VC++ Directories
+Visual C++ "Include files" and the lib directory to the "Library files"
+in the IDE (Tools->Options->Projects and Solutions->VC++ Directories).