Modified to refer to translators

3 files changed, 33 insertions, 274 deletions

diff --git a/cpp/install/icee/ICE_LICENSE b/cpp/install/icee/ICE_LICENSE
index 84a16e8ff33..eadabb1d161 100644
--- a/cpp/install/icee/ICE_LICENSE
+++ b/cpp/install/icee/ICE_LICENSE
@@ -1,8 +1,8 @@
 Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
 
-This copy of Ice is free software; you can redistribute it and/or modify 
-it under the terms of the GNU General Public License version 2 as 
-published by the Free Software Foundation.
+This copy of the Ice-E translators is free software; you can redistribute
+it and/or modify it under the terms of the GNU General Public License version
+2 as published by the Free Software Foundation.
 
 Ice is distributed in the hope that it will be useful, but WITHOUT ANY 
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -13,12 +13,3 @@ The GNU General Public License is often shipped with GNU software, and is
 generally kept in a file called COPYING or LICENSE. If you do not have a 
 copy of the license, write to the Free Software Foundation, 59 Temple 
 Place, Suite 330, Boston, MA 02111 USA.
-
-In addition, as a special exception, ZeroC, Inc. gives permission to link 
-Ice with the OpenSSL library (or with modified versions of OpenSSL
-that use the same license as OpenSSL), and distribute linked
-combinations including the two. You must obey the GNU General Public 
-License version 2 in all respects for all of the code used other than 
-OpenSSL. If you modify this copy of Ice, you may extend this exception 
-to your version of Ice, but you are not obligated to do so. If you do 
-not wish to do so, delete this exception statement from your version.
diff --git a/cpp/install/icee/INSTALL.LINUX b/cpp/install/icee/INSTALL.LINUX
index 5d73e83a9f5..cb9e1b8d271 100644
--- a/cpp/install/icee/INSTALL.LINUX
+++ b/cpp/install/icee/INSTALL.LINUX
@@ -17,131 +17,59 @@ C++ compiler
 - Intel C++ 8.1
 
 
-Third-party libraries
----------------------
-
-Ice has dependencies on a number of third-party libraries:
-
-- Berkeley DB 4.2.52 or 4.3.27 configured with --enable-cxx.
-
-  You can download the Berkeley DB source distribution from
-  http://www.sleepycat.com/download
-
-  Note that Ice for Java is not compatible with version 4.3, therefore
-  if you intend to use Ice for Java with Berkeley DB, you must use
-  version 4.2.52 and the option --enable-java.
-
-  If you are using RedHat 9 and do not want to use NPTL (New Posix
-  Thread Library), set LD_ASSUME_KERNEL=2.4.1 before running
-  configure.
-
-- expat 1.9x
-
-- OpenSSL 0.96 or 0.97
-
-- bzip2 1.0
-
-- readline and ncurses (optional, but used unless you set USE_READLINE
-  to no in config/Make.rules)
-
-expat, OpenSSL, bzip2, readline and ncurses are usually included with
-your Linux distribution, or you can download them from the following
-locations:
-
-expat          http://sourceforge.net/projects/expat/
-OpenSSL        http://www.openssl.org
-bzip2          http://sources.redhat.com/bzip2
-readline       http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
-ncurses        http://www.gnu.org/software/ncurses/ncurses.html
-
-
-Python
-------
-
-To run the automated test suite, you will need Python 2.2 or a newer
-version. If you have no interest in running the test scripts, Python
-is not required.
-
-
 ======================================================================
 Compilation and Testing
 ======================================================================
 
-Extract the Ice archive in any directory you like (for example, in
-your home directory):
+Extract the Ice-E translator archive in any directory you like (for
+example, in your home directory):
 
-$ tar xvfz Ice-@ver@.tar.gz
+$ tar xvfz IceE-trans-@ver@.tar.gz
 
-Change the working directory to Ice-@ver@:
+Change the working directory to IceE-trans-@ver@:
 
-$ cd Ice-@ver@
+$ cd IceE-trans-@ver@
 
 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.
+comments in the file provide more information. 
 
-If you want to build Ice with the Intel C++ compiler, first set the
-following environment variables:
+If you want to build the translators with the Intel C++ compiler, first 
+set the following environment variables:
 
 $ export CC=icc
 $ export CXX=icpc
 
-Now you're ready to build Ice:
+Now you're ready to build the Ice-E translators:
 
 $ make
 
-This will build the Ice core libraries, services, tests and examples.
-After a successful build, you can run the test suite, provided that
-you have installed Python:
-
-$ make test
-
-This is equivalent to:
-
-$ 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, and your
-LD_LIBRARY_PATH environment variable to add the "lib" directory:
-
-$ export PATH=`pwd`/bin:$PATH
-$ export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
+This will build both the C++ and Java slice translator for Ice-E.
 
 
 ======================================================================
 64 bit builds on x86-64
 ======================================================================
 
-To build Ice in 64 bit mode, you need to do the following:
-
-- Obtain or build all the third-party dependencies, and put the 64 bit
-  libraries in the "lib64" directories. For example, put Berkeley DB
-  64 bit libraries in $DB_HOME/lib64.
+To build the Ice-E translators in 64 bit mode, you need to do the
+following:
 
 - Set the environment variable LP64 to yes, as shown below:
 
   $ export LP64=yes
 
-- Build and test as described above (with gcc).
+- Build as described above (with gcc).
 
 
 ======================================================================
 Installation
 ======================================================================
 
-Simply run "make install". This will install Ice in the directory
-specified by the "prefix" variable in config/Make.rules.
+Simply run "make install". This will install the Ice-E translators in 
+the directory specified by the "prefix" variable in config/Make.rules.
 
 After installation, make sure that the <prefix>/bin directory is in
 your PATH, and the <prefix>/lib directory is in your
-LD_LIBRARY_PATH. When compiling Ice programs, you must also make sure
-to pass the location of the <prefix>/include directory to the compiler
-with the -I option, and the location of the <prefix>/lib directory
-with the -L option.
+LD_LIBRARY_PATH. 
 
 If LP64 is set to yes, the libraries are installed in <prefix>/lib64
 and the programs are installed in <prefix>/bin64. No other changes are
diff --git a/cpp/install/icee/INSTALL.WINDOWS b/cpp/install/icee/INSTALL.WINDOWS
index 23946a77391..92ecc551de4 100644
--- a/cpp/install/icee/INSTALL.WINDOWS
+++ b/cpp/install/icee/INSTALL.WINDOWS
@@ -6,16 +6,7 @@ Requirements
 Windows version
 ---------------
 
-Ice has been extensively tested with Windows XP, Windows 2000 and
-Windows 98 SE. Ice is also expected to work on Windows 98, Windows ME,
-Windows NT 3.51, Windows NT 4.0 and Windows Server 2003.
-
-Ice binary distributions for Visual Studio 6.0 and .NET 2003 are
-available from http://www.zeroc.com/download.html. These binary
-distributions include everything necessary to build Ice applications
-and require Windows NT 4.0, Windows 2000, Windows XP or Windows Server
-2003.
-
+The Ice-E translators have been extensively tested with Windows XP.
 
 C++ compiler
 ------------
@@ -33,51 +24,18 @@ C++ 6.0.
 For Visual C++ .NET 2003, you can use the included STL library.
 
 
-Third-party libraries
+STLport
 ---------------------
 
-Ice has dependencies on a number of third-party libraries:
-
-- STLport 4.5 or later (required for Visual C++ 6.0)
-- Berkeley DB 4.2.52
-- expat 1.9x
-- OpenSSL 0.96 or 0.97
-- bzip2 1.0
-
-If you have downloaded an Ice binary installer, you already have all
-of the required third-party libraries and do not need to download any
-additional packages, nor do you need to compile the Ice source code.
-
-If you wish to compile the Ice source code, you can download an
-installer containing binaries for all of the required third-party
-libraries from the ZeroC web site at
-
-http://www.zeroc.com/download.html
+Ice-E translators require STLport 4.5 or later for Visual C++ 6.0. You
+can download STLport at the following location:
 
-Finally, if you prefer to download and install the third-party
-dependencies yourself, you can find them at the following locations:
-
-STLport         http://www.stlport.org/download.html
-Berkeley DB     http://www.sleepycat.com/download
-expat           http://sourceforge.net/projects/expat/
-OpenSSL         http://www.openssl.org
-bzip2           http://sources.redhat.com/bzip2
+http://www.stlport.org/download.html
 
 For STLport installation instructions, please refer to
-http://www.stlport.org/doc/install.html
-
-Note: For a regular build of bzip2, both the debug and the release
-library are named "libbz2.lib". In order to be able to have both a
-debug and a release version on your system, please rename the debug
-library to "libbz2d.lib". This is also what the Ice project files
-expect if you build a debug version of Ice.
-
-If you compile the third-party libraries from source code, we
-recommend that you use the same Visual C++ version to build all of
-the third-party libraries.
+http://www.stlport.org/doc/install.html. 
 
-Users of Visual C++ 6.0 must configure Visual Studio to use STLPort
-before building Berkeley DB:
+Users must configure Visual Studio to use STLPort:
 
 - In the Visual C++ 6.0 IDE, choose Tools->Options->Directories
 
@@ -86,142 +44,24 @@ before building Berkeley DB:
 - Add the include directory for STLport first in the list. (Note that
   you must add the "include\stlport" directory, not just "include".)
 
-- Select "Library files"
-
-- Add the lib directory for STLport.
-
-
-Python
-------
-
-To run the automated test suite, you will need Python 2.2 or a newer
-version. If you have no interest in running the test scripts, Python
-is not required.
-
-You can download a Python distribution for Windows from
-http://www.python.org/download
-
-Important note for Windows 98, Windows 98 SE and Windows ME users:
-
-The Windows 9x shell is too limited to run the Ice test suite. For
-these versions of Windows, you need Cygwin and the python interpreter
-that comes with Cygwin in order to run the test suite. Cygwin can be
-downloaded from:
-
-http://www.cygwin.com
-
-
 ======================================================================
-Compilation and Testing
+Compilation
 ======================================================================
 
-Using your favorite Zip tool, unzip the Ice archive anywhere you like,
-then start the Microsoft Visual C++ IDE.
-
-First, you must make sure that your compiler finds all of the required
-third-party packages (include files, libraries, and DLLs):
-
-- In Visual Studio, choose:
-
-  * Visual C++ 6.0: Tools->Options->Directories
-
-  * Visual C++ .NET: Tools->Options->Projects->VC++ Directories
+Using your favorite Zip tool, unzip the Ice-E translator archive anywhere
+you like, then start the Microsoft Visual C++ IDE.
 
-- Select "Include files".
-
-- Add the include directories for Berkeley DB, expat, OpenSSL, and
-  bzip2.
-
-  If you used the binary installer for expat, then the proper include
-  directory is C:\Expat-1.95.8\Source\lib.
-
-  For Visual C++ 6.0, also add the include directory for STLport. Note
-  that you must add the "include\stlport" directory, not just
-  "include", and that this directory must precede any of the Visual
-  C++ include directories.
-
-- Select "Library files".
-
-- Add the library directories for Berkeley DB, expat, OpenSSL, and
-  bzip2 (and STLport, if required).
-
-  If you used the binary installer for expat, then the proper library
-  directory is C:\Expat-1.95.8\Libs.
-
-- Select "Executable files".
-
-- Add the directories that contain DLLs for Berkeley DB, expat,
-  OpenSSL and bzip2 (and STLport, if required).
-
-Now you are ready to compile Ice, so open the "all.dsw" workspace. If
-you are using Visual C++ .NET, then the project files must first be
-converted from Visual C++ 6.0 to .NET format.
-
-Set your active project to either "all" or "minimal". "all" will
-compile everything including the tests and demos. "minimal" will not
-compile the tests or demos. To set your active project with Visual C++
-6.0, use Project->Set Active Project. For Visual C++ .NET, click on
-"all" or "minimal" in the class view, then use Project->Set as StartUp
-Project.
+Open the "icee.dsw" workspace. If you are using Visual C++ .NET, then
+the project files must first be converted from Visual C++ 6.0 to .NET
+format.
 
 To start the compilation, use Build->Build for Visual C++ 6.0, or
 Build->Build all/minimal for Visual C++ .NET, respectively.
 
-If you built the tests you can run the test suite, provided that you
-have installed Python. Open a command prompt and change to the top-
-level Ice directory. At the command prompt, execute:
-
-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, which contains the
-Ice DLLs and executables.
-
-
-======================================================================
-Windows 98, Windows 98 SE, Windows ME, Windows NT 3.51 
-======================================================================
-
-By default, IceUtil::Mutex and related classes are implemented using
-Windows' CriticalSection, and in particular they use the function
-TryEnterCriticalSection. This function is either not present or
-implemented as a "no-op" call on Windows 98, Windows 98 SE, Windows ME
-and Windows NT 3.51, so default Ice builds cannot be used on these
-versions of Windows.
-
-IceUtil::Mutex and related classes can also use "heavier" mutex
-objects that allow Ice to work on all Windows versions (>= 98). If you
-wish to build Ice in this configuration, you must first edit the file
-include\IceUtil\Config.h and remove the following lines:
-
-#   ifndef _WIN32_WINNT
-        //
-        // Necessary for TryEnterCriticalSection.
-        //
-#       define _WIN32_WINNT 0x0400
-#   endif
-
-On Windows 98, Windows 98 SE and Windows ME, we also recommend that
-you increase the number of connections supported by TCP/IP (to 500 for
-example). See MaxConnections at
-http://support.microsoft.com/default.aspx?scid=kb;EN-US;158474
-
 
 ======================================================================
 Installation
 ======================================================================
 
 No automatic installation support is provided: you need to copy the
-contents of the bin, include, and lib directories to your preferred
-location. The include directory contains all Ice include files, the
-lib directory contains all Ice libraries, and the bin directory
-contains all Ice executables and DLLs.
-
-After installation, make sure to add the include directory to the
-Visual C++ "Include files", the lib directory to the "Library files",
-and the bin directory to the "Executable files". In Visual C++ 6.0,
-choose Tools->Options->Directories. In Visual C++ .NET, choose
-Tools->Options->Projects->VC++ Directories.
+contents of the bin directory to your preferred location.