diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/RPMTools.py | 11 | ||||
| -rw-r--r-- | cpp/install/unix/README.Darwin | 2 | ||||
| -rw-r--r-- | cpp/install/unix/README.HP-UX | 2 | ||||
| -rw-r--r-- | cpp/install/unix/README.Linux | 2 | ||||
| -rw-r--r-- | cpp/install/unix/README.Linux-RPM | 2 | ||||
| -rw-r--r-- | cpp/install/unix/README.SunOS | 2 | ||||
| -rwxr-xr-x | cpp/install/vc71/doc/README.txt | 2 | ||||
| -rwxr-xr-x | cpp/makebindist.py | 9 |
8 files changed, 16 insertions, 16 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index f0aee221045..fa4441cf2b8 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -248,10 +248,6 @@ transforms = [ ('file', 'ice.ini', 'etc/php.d/ice.ini'), ('dir', 'bin', 'usr/bin'), ('dir', 'include', 'usr/include'), ('dir', 'python', 'usr/lib/Ice-%version%/python'), - ('file', 'usr/lib/IcePy.so.%version%', 'usr/lib/Ice-%version%/python/IcePy.so.%version%'), - ('file', 'usr/lib/IcePy.so', 'usr/lib/Ice-%version%/python/IcePy.so'), - # XXX The IcePy.so.n needs to be made variable. - ('file', 'usr/lib/IcePy.so.30', 'usr/lib/Ice-%version%/python/IcePy.so.30'), ('dir', 'doc', 'usr/share/doc/Ice-%version%/doc'), ('file', 'README', 'usr/share/doc/Ice-%version%/README'), ('file', 'ICE_LICENSE', 'usr/share/doc/Ice-%version%/ICE_LICENSE'), @@ -431,12 +427,7 @@ fileLists = [ noarchFileList = [ Package('ice-java', - # - # FC-4 doesn't have a current db4-java. - # 'ice = %version%, db4-java >= 4.3.27', - # - # 'ice = %version%, db4 >= 4.3.27, ice-third-party >= %version%', - 'ice = %version%, db4 >= 4.3.27', + 'ice = %version%, db4-java >= 4.3.27, ice-third-party >= %version%', 'The Ice runtime for Java', 'System Environment/Libraries', iceDescription, diff --git a/cpp/install/unix/README.Darwin b/cpp/install/unix/README.Darwin index 89b70a14e2c..6a0e83d92ea 100644 --- a/cpp/install/unix/README.Darwin +++ b/cpp/install/unix/README.Darwin @@ -131,7 +131,7 @@ To use Ice for Python, the PYTHONPATH environment variable must be updated so that the interpreter can load the Ice extension and supporting Python files: -$ export PYTHONPATH=$ICE_HOME/python:$ICE_HOME/lib:$PYTHONPATH +$ export PYTHONPATH=$ICE_HOME/python:$PYTHONPATH ====================================================================== diff --git a/cpp/install/unix/README.HP-UX b/cpp/install/unix/README.HP-UX index 12c942bdc5a..147e84600af 100644 --- a/cpp/install/unix/README.HP-UX +++ b/cpp/install/unix/README.HP-UX @@ -149,7 +149,7 @@ To use Ice for Python, the PYTHONPATH environment variable must be updated so that the interpreter can load the Ice extension and supporting Python files: -$ export PYTHONPATH=$ICE_HOME/python:$ICE_HOME/lib:$PYTHONPATH +$ export PYTHONPATH=$ICE_HOME/python:$PYTHONPATH ====================================================================== diff --git a/cpp/install/unix/README.Linux b/cpp/install/unix/README.Linux index cb38547a890..b52f5acc4b1 100644 --- a/cpp/install/unix/README.Linux +++ b/cpp/install/unix/README.Linux @@ -197,7 +197,7 @@ To use Ice for Python, the PYTHONPATH environment variable must be updated so that the interpreter can load the Ice extension and supporting Python files: -$ export PYTHONPATH=$ICE_HOME/python:$ICE_HOME/lib:$PYTHONPATH +$ export PYTHONPATH=$ICE_HOME/python:$PYTHONPATH C#/Mono diff --git a/cpp/install/unix/README.Linux-RPM b/cpp/install/unix/README.Linux-RPM index 8b78a935c0f..48dd1577950 100644 --- a/cpp/install/unix/README.Linux-RPM +++ b/cpp/install/unix/README.Linux-RPM @@ -115,7 +115,7 @@ To use Ice for Python, the PYTHONPATH environment variable must be updated so that the interpreter can load the Ice extension and supporting Python files: -$ export PYTHONPATH=/usr/lib/Ice-@ver@/python:/usr/lib:$PYTHONPATH +$ export PYTHONPATH=/usr/lib/Ice-@ver@/python:$PYTHONPATH C#/Mono diff --git a/cpp/install/unix/README.SunOS b/cpp/install/unix/README.SunOS index b5cd07f6e7f..26638a63123 100644 --- a/cpp/install/unix/README.SunOS +++ b/cpp/install/unix/README.SunOS @@ -154,7 +154,7 @@ To use Ice for Python, the PYTHONPATH environment variable must be updated so that the interpreter can load the Ice extension and supporting Python files: -$ export PYTHONPATH=$ICE_HOME/python:$ICE_HOME/lib:$PYTHONPATH +$ export PYTHONPATH=$ICE_HOME/python:$PYTHONPATH ====================================================================== diff --git a/cpp/install/vc71/doc/README.txt b/cpp/install/vc71/doc/README.txt index fbe7ddbc5d9..3e2f02c707c 100755 --- a/cpp/install/vc71/doc/README.txt +++ b/cpp/install/vc71/doc/README.txt @@ -192,7 +192,7 @@ set PATH=%ICE_HOME%\bin;%PATH% Finally, set PYTHONPATH so that the Python interpreter is able to load
the Ice extension:
-set PYTHONPATH=%ICE_HOME%\bin;%ICE_HOME%\python
+set PYTHONPATH=%ICE_HOME%\python
To run a demo, open a Command Prompt, change to the desired demo
directory, and type 'python Server.py' to start the server. In a
diff --git a/cpp/makebindist.py b/cpp/makebindist.py index 796781a22e1..ee41a2e9d12 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -962,9 +962,18 @@ def main(): # distributions doesn't build. # if collectSources: + toCollect = sourceTarBalls + toCollect.append(('icevb', 'IceVB-' + version, 'vb')) for cvs, tarball, demoDir in sourceTarBalls: collectSourceDistributions(cvsTag, sources, cvs, tarball) + print ''' +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +>> << +>> Sources have been collected! << +>> << +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<''' + # # Package up demo distribution. # |