diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-02-28 21:56:13 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-02-28 21:56:13 +0000 |
| commit | c588e228575b4660d0dc68b1793fce1236a5504f (patch) | |
| tree | 734c2c74035763b8e9acb3f0bd153d92b236588c /cpp | |
| parent | moved IceGridAdmin help to help (diff) | |
| download | ice-c588e228575b4660d0dc68b1793fce1236a5504f.tar.bz2 ice-c588e228575b4660d0dc68b1793fce1236a5504f.tar.xz ice-c588e228575b4660d0dc68b1793fce1236a5504f.zip | |
removed doc/index.html and moved IceGridAdmin online help to help dir
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/doc/index.html | 20 | ||||
| -rw-r--r-- | cpp/install/rpm/ice.spec | 5 | ||||
| -rwxr-xr-x | cpp/makebindist.py | 7 |
3 files changed, 7 insertions, 25 deletions
diff --git a/cpp/doc/index.html b/cpp/doc/index.html deleted file mode 100644 index e35da528cfb..00000000000 --- a/cpp/doc/index.html +++ /dev/null @@ -1,20 +0,0 @@ -<html> -<head> -<title> -Ice Documentation -</title> -<body> -<h1>Ice Documentation</h1> -<p>The Ice documentation consists of the Ice manual, available -in PDF and HTML format, the Slice API documentation (HTML only) and the IceGrid Admin Online Help. -</p> -<ul> -<li>Browse the <a href="reference/index.html">Slice API Documentation</a> included in this distribution.</li> -<li>Browse the <a href="http://www.zeroc.com/doc/Ice-@ver@/manual/index.html">Ice manual </a> on ZeroC's web server.</li> -<li>Download the <a href="http://www.zeroc.com/download.html#doc"> Ice -manual in PDF format</a> from ZeroC's Web server.</li> -<li>Browse the <a href="http://www.zeroc.com/doc/Ice-@ver@/IceGridAdmin/index.html">IceGrid Admin Online Help</a> on ZeroC's web server.</li> - -</ul> -</body> -</html> diff --git a/cpp/install/rpm/ice.spec b/cpp/install/rpm/ice.spec index 95af4b86946..b865be5e19c 100644 --- a/cpp/install/rpm/ice.spec +++ b/cpp/install/rpm/ice.spec @@ -164,7 +164,8 @@ make ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} prefix=$RPM_BUILD_ROOT install cp -p $RPM_BUILD_DIR/IceJ-%{version}-java2/lib/IceGridGUI.jar $RPM_BUILD_ROOT/lib/IceGridGUI.jar cp -pR $RPM_BUILD_DIR/IceJ-%{version}-java2/ant $RPM_BUILD_ROOT -cp -pR $RPM_BUILD_DIR/IceJ-%{version}-java2/resources/IceGridAdmin $RPM_BUILD_ROOT/doc +mkdir -p $RPM_BUILD_ROOT/help +cp -pR $RPM_BUILD_DIR/IceJ-%{version}-java2/resources/IceGridAdmin $RPM_BUILD_ROOT/help # # .NET spec files (for csharp-devel) @@ -265,7 +266,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/Ice-%{version} mv $RPM_BUILD_ROOT/python ${RPM_BUILD_ROOT}%{_libdir}/Ice-%{version}/python mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir} -mv $RPM_BUILD_ROOT/doc ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version} +mv $RPM_BUILD_ROOT/help ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version} mv $RPM_BUILD_ROOT/README ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/README mv $RPM_BUILD_ROOT/ICE_LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/ICE_LICENSE mv $RPM_BUILD_ROOT/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/LICENSE diff --git a/cpp/makebindist.py b/cpp/makebindist.py index 2f5bb1d47e1..88d3177a8e8 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -657,7 +657,8 @@ def makeInstall(sources, buildDir, installDir, distro, clean, version, mmVersion # runprog('cp -pR ' + buildDir + '/' + distro + '/ant ' + installDir) runprog('find ' + installDir + '/ant -name "*.java" | xargs rm') - runprog('cp -pR ' + buildDir + '/' + distro + '/resources/IceGridAdmin ' + installDir + '/doc') + initDirectory(os.path.join(installDir, 'help')) + runprog('cp -pR ' + buildDir + '/' + distro + '/resources/IceGridAdmin ' + installDir + '/help') destDir = os.path.join(installDir, 'config') if not os.path.exists(destDir): os.mkdir(destDir) @@ -1124,7 +1125,8 @@ def main(): shutil.copy('lib/Ice.jar', installDir +'/Ice-' + version + '/lib') shutil.copy('lib/IceGridGUI.jar', installDir +'/Ice-' + version + '/lib') runprog('cp -pR ant ' + installDir + '/Ice-' + version) - runprog('cp -pR resources/IceGridAdmin ' + installDir + '/Ice-' + version + 'doc') + initDirectory(os.path.join(installDir, 'help')) + runprog('cp -pR resources/IceGridAdmin ' + installDir + '/Ice-' + version + '/help') runprog('find ' + installDir + '/Ice-' + version + ' -name "*.java" | xargs rm') else: runprog('gmake prefix=' + installDir + '/Ice-' + version + ' install') @@ -1186,7 +1188,6 @@ def main(): # # Remove html reference files from binary distribution. # - runprog("rm -f Ice-%s/doc/index.html" % (version)) runprog("rm -rf Ice-%s/doc/reference" % (version)) runprog('tar cf Ice-' + version + '-bin-' + getPlatformString() + '.tar Ice-' + version) |