diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/INSTALL.LINUX | 12 | ||||
| -rw-r--r-- | cpp/INSTALL.SOLARIS | 2 | ||||
| -rw-r--r-- | cpp/WINDOWS_SERVICE.txt | 9 | ||||
| -rw-r--r-- | cpp/config/Make.rules.mak | 7 | ||||
| -rwxr-xr-x | cpp/fixCopyright.py | 2 | ||||
| -rw-r--r-- | cpp/install/common/README.DEMOS | 40 | ||||
| -rwxr-xr-x | cpp/makebindist.py | 4 |
7 files changed, 45 insertions, 31 deletions
diff --git a/cpp/INSTALL.LINUX b/cpp/INSTALL.LINUX index 41fa33136cf..ad4b5c732af 100644 --- a/cpp/INSTALL.LINUX +++ b/cpp/INSTALL.LINUX @@ -10,10 +10,12 @@ Ice is expected to build and run properly on any recent Linux distribution for x86 and x86_64. However, Ice is officially supported only on: - - Red Hat Enterprise Linux Advanced Server 4 Update 4 for x86 or + - Red Hat Enterprise Linux Advanced Server 4 Update 4 for i386 or x86_64 (RHEL 4.4) - - Novell SuSE Linux Enterprise Server 10 for x86 or x86_64 (SLES 10) + - Red Hat Enterprise Linux 5 for i386 or x86_64 (RHEL 5) + + - Novell SuSE Linux Enterprise Server 10 for i586 or x86_64 (SLES 10) C++ compiler @@ -23,6 +25,7 @@ Ice 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.1 on RHEL 5 - GCC 4.1.x on SLES 10 @@ -31,7 +34,7 @@ Third-party libraries Ice has dependencies on a number of third-party libraries: -- Berkeley DB 4.3.29 or 4.5.20 configured with --enable-cxx. +- Berkeley DB 4.5.20 configured with --enable-cxx. If you intend to use Ice for Java with Berkeley DB, you must also include the option --enable-java. @@ -51,7 +54,8 @@ expat http://sourceforge.net/projects/expat/ OpenSSL http://www.openssl.org bzip2 http://sources.redhat.com/bzip2 -RHEL 4.4 RPMs for Berkeley DB 4.5.20 are available from: +RPMs for Berkeley DB 4.5.20 on RHEL 4.4, RHEL 5 and SLES 10 are +available from: http://www.zeroc.com/download.html diff --git a/cpp/INSTALL.SOLARIS b/cpp/INSTALL.SOLARIS index a9ae22edde7..e709de7d708 100644 --- a/cpp/INSTALL.SOLARIS +++ b/cpp/INSTALL.SOLARIS @@ -41,7 +41,7 @@ Ice has dependencies on a number of third-party libraries: If you intend to use Ice for Java with Berkeley DB, you must also include the option --enable-java. -- expat 1.9x +- expat 1.95.7 or later - OpenSSL 0.9.7 or later (OpenSSL 0.9.8 or later recommended) diff --git a/cpp/WINDOWS_SERVICE.txt b/cpp/WINDOWS_SERVICE.txt index 83400d5183a..0aa9a8b20f0 100644 --- a/cpp/WINDOWS_SERVICE.txt +++ b/cpp/WINDOWS_SERVICE.txt @@ -65,8 +65,7 @@ Follow these steps to install a Glacier2 router as a service: 1. In a command window, execute the following line:
- > glacier2router --install Glacier2Router \
- --Ice.Config=<ice-home>\config\glacier2router.cfg
+ > glacier2router --install Glacier2Router --Ice.Config=<ice-home>\config\glacier2router.cfg
Installing the service on Windows Vista with UAC enabled requires
administrator privileges. In this case, run the command shell as
@@ -114,11 +113,9 @@ services: 1. In a command window, execute the following lines:
- > icegridnode --install IceGridNode \
- --Ice.Config=<ice-home>\config\icegridnode.cfg
+ > icegridnode --install IceGridNode --Ice.Config=<ice-home>\config\icegridnode.cfg
- > icegridregistry --install IceGridRegistry \
- --Ice.Config=<ice-home>\config\icegridregistry.cfg
+ > icegridregistry --install IceGridRegistry --Ice.Config=<ice-home>\config\icegridregistry.cfg
Installing a service on Windows Vista with UAC enabled requires
administrator privileges. In this case, run the command shell as
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 60f8acfedc6..e4be229751e 100644 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -104,8 +104,11 @@ SETARGV = setargv.obj !if "$(CPP_COMPILER)" == "BCC2006" !include $(top_srcdir)/config/Make.rules.bcc -!else -!include $(top_srcdir)/config/Make.rules.msvc +!elseif "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71" || \ + "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS" +!include $(top_srcdir)/config/Make.rules.msvc +! else +!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) !endif install_libdir = $(prefix)\lib diff --git a/cpp/fixCopyright.py b/cpp/fixCopyright.py index 4feb798c8a4..0399e937a29 100755 --- a/cpp/fixCopyright.py +++ b/cpp/fixCopyright.py @@ -215,7 +215,7 @@ for x in sys.argv[1:]: sys.exit(0) elif x == "-e": patchIceE = True - path = "../icee" + path = "../cppe" elif x.startswith("-"): print sys.argv[0] + ": unknown option `" + x + "'" print diff --git a/cpp/install/common/README.DEMOS b/cpp/install/common/README.DEMOS index 0b26c086a4e..3c91059a85c 100644 --- a/cpp/install/common/README.DEMOS +++ b/cpp/install/common/README.DEMOS @@ -11,8 +11,8 @@ distributions. Distributions for specific platform/tool combinations may not support every Ice language mapping. The build systems included in the demo distribution are either -'makefile' based or 'ant' based. The C++ and C# demos use makefiles and -the Java demos use the Apache Foundation's ant build tool. +'makefile' based or 'ant' based. The C++ and C# demos use makefiles +and the Java demos use the Apache Foundation's ant build tool. NOTE: The Ruby, Python and PHP demos do not need to be built. @@ -134,11 +134,10 @@ on this to start a console window with your development environment already configured. -Building the demos on Windows using Mono, Cygwin, etc. ------------------------------------------------------- +Mono on Windows +--------------- -Building the demos with Mono using the NMAKE makefiles or using -Cygwin and the gmake makefiles is not currently supported. +We do not currently support the use of Mono on Windows. Running the Ice Demos @@ -156,12 +155,12 @@ Running the C++ demos To run a demo, open a terminal terminal window, change to the desired demo directory, and enter the following command to run the server: -$ ./server +$ server To run the client, open another terminal window, also change to the desired demo directory, and run: -$ ./client +$ client Running the Java demos @@ -198,12 +197,23 @@ distributions. To run a demo, open a terminal window, change to the desired demo directory, and enter the following command to run the server: -$ ./server.exe +$ server.exe To run the client, open another terminal window, also change to the desired demo directory, and run: -$ ./client.exe +$ client.exe + +When using Mono on Linux, the compiled programs may not be directly +executable unless you have configured Linux as described in the +installation instructions included with the Ice distribution. As a +result, you will need to start Mono executables as shown below: + +$ mono server.exe + +In another window: + +$ mono client.exe Running the Python demos @@ -228,13 +238,13 @@ support server-side activities. In order to run a sample client, you must first start its corresponding server from another Ice language mapping, such as C++: -# for example in the /tmp/Ice-@ver@/demo/Ice/hello directory +# for example in $HOME/testing/Ice-@ver@-demos/demo/Ice/hello $ server To run the client, open another terminal window, change to the corresponding demo directory, and run: -# for example in the /tmp/Ice-@ver@/demorb/Ice/hello directory +# for example in $HOME/testing/Ice-@ver@-demos/demorb/Ice/hello $ ruby Client.rb @@ -256,6 +266,6 @@ examples require that an Ice server be available; a matching server from any of the other language mappings can be used. A README file is provided in each of the example directories. -Note that you must modify the php.ini files in each demo directory to -match your PHP installation and ensure that the Ice extension is -loaded properly. +Note that you may need to modify the php.ini files in each demo +directory to match your PHP installation and ensure that the Ice +extension is loaded properly. diff --git a/cpp/makebindist.py b/cpp/makebindist.py index a205eb4f9e4..bbd9a4fa817 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -356,14 +356,14 @@ endif ifeq ($(ICE_HOME),) ICE_DIR = /usr ifneq ($(shell test -f $(ICE_DIR)/bin/icestormadmin && echo 0),0) - NEXTDIR = /opt/Ice-$(VERSION) + NEXTDIR = /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) ifneq ($(shell test -f $(NEXTDIR)/bin/icestormadmin && echo 0),0) $(error Unable to locate Ice distribution, please set ICE_HOME!) else ICE_DIR = $(NEXTDIR) endif else - NEXTDIR = /opt/Ice-$(VERSION) + NEXTDIR = /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)) ifeq ($(shell test -f $(NEXTDIR)/bin/icestormadmin && echo 0),0) $(warning Ice distribution found in /usr and $(NEXTDIR)! Installation in "/usr" will be used by default. Use ICE_HOME to specify alternate Ice installation.) endif |