diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-02-05 16:04:24 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-02-05 16:04:24 +0000 |
| commit | e2472fec1c01ad3bfa41e2edcc528e7a83048c51 (patch) | |
| tree | 5ed44f3b5bf512bf9c03150d07e2f653d54b9f90 | |
| parent | removed space (diff) | |
| download | ice-e2472fec1c01ad3bfa41e2edcc528e7a83048c51.tar.bz2 ice-e2472fec1c01ad3bfa41e2edcc528e7a83048c51.tar.xz ice-e2472fec1c01ad3bfa41e2edcc528e7a83048c51.zip | |
Fixed bug #1746
| -rw-r--r-- | cpp/doc/README.html | 19 | ||||
| -rwxr-xr-x | cpp/makedist.py | 1 | ||||
| -rwxr-xr-x | cs/makedist.py | 3 | ||||
| -rwxr-xr-x | java/makedist.py | 3 | ||||
| -rwxr-xr-x | py/makedist.py | 3 | ||||
| -rwxr-xr-x | rb/makedist.py | 3 | ||||
| -rwxr-xr-x | vb/makedist.py | 3 |
7 files changed, 11 insertions, 24 deletions
diff --git a/cpp/doc/README.html b/cpp/doc/README.html deleted file mode 100644 index 43e9892baf8..00000000000 --- a/cpp/doc/README.html +++ /dev/null @@ -1,19 +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="IceGridAdmin/index.html">IceGrid Admin Online Help</a> included in this distribution.</li> -<li>Browse the <a href="http://www.zeroc.com/doc/@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">full Ice manual</a> in PDF format from ZeroC's Web server.</li> - -</ul> -</body> -</html> diff --git a/cpp/makedist.py b/cpp/makedist.py index 9e34c5dd30a..d60183594d2 100755 --- a/cpp/makedist.py +++ b/cpp/makedist.py @@ -244,6 +244,7 @@ mmversion = re.search("([0-9]+\.[0-9b]+)[\.0-9]*", version).group(1) print "Fixing version in various files..." fixVersion(find("ice", "README*"), version, mmversion) fixVersion(find("ice", "INSTALL*"), version, mmversion) +fixVersion(find("ice/doc", "index.html"), version, mmversion) fixVersion(find("ice/install/rpm", "*.conf"), version, mmversion) print "Creating Ice-rpmbuild..." diff --git a/cs/makedist.py b/cs/makedist.py index faf8498051e..2be20049cac 100755 --- a/cs/makedist.py +++ b/cs/makedist.py @@ -151,7 +151,7 @@ if not skipDocs: os.chdir(cwd) os.mkdir(os.path.join("icecs", "doc")) os.rename(os.path.join("ice", "doc", "reference"), os.path.join("icecs", "doc", "reference")) - os.rename(os.path.join("ice", "doc", "README.html"), os.path.join("icecs", "doc", "README.html")) + os.rename(os.path.join("ice", "doc", "index.html"), os.path.join("icecs", "doc", "index.html")) os.rename(os.path.join("ice", "doc", "images"), os.path.join("icecs", "doc", "images")) shutil.rmtree("ice") @@ -177,6 +177,7 @@ version = re.search("VERSION[= \t]*([0-9\.b]+)", config.read()).group(1) print "Fixing version in README and INSTALL files..." fixVersion(find("icecs", "README*"), version) fixVersion(find("icecs", "INSTALL*"), version) +fixVersion(find("icecs/doc", "index.html"), version) # # Create source archives. diff --git a/java/makedist.py b/java/makedist.py index abdcac32c4b..7d99fbe0b34 100755 --- a/java/makedist.py +++ b/java/makedist.py @@ -255,7 +255,7 @@ if not skipDocs: os.chdir(cwd) os.mkdir(os.path.join("icej", "doc")) os.rename(os.path.join("ice", "doc", "reference"), os.path.join("icej", "doc", "reference")) - os.rename(os.path.join("ice", "doc", "README.html"), os.path.join("icej", "doc", "README.html")) + os.rename(os.path.join("ice", "doc", "index.html"), os.path.join("icej", "doc", "index.html")) os.rename(os.path.join("ice", "doc", "images"), os.path.join("icej", "doc", "images")) @@ -329,6 +329,7 @@ version = re.search("ICE_STRING_VERSION = \"([0-9\.b]*)\"", config.read()).group print "Fixing version in README and INSTALL files..." fixVersion(find("icej", "README*"), version) fixVersion(find("icej", "INSTALL*"), version) +fixVersion(find("icej/doc", "index.html"), version) # # Create source archives. diff --git a/py/makedist.py b/py/makedist.py index 9f45835dbbf..2e325c8dff3 100755 --- a/py/makedist.py +++ b/py/makedist.py @@ -160,7 +160,7 @@ if not skipDocs: os.chdir(cwd) os.mkdir(os.path.join("icepy", "doc")) os.rename(os.path.join("ice", "doc", "reference"), os.path.join("icepy", "doc", "reference")) - os.rename(os.path.join("ice", "doc", "README.html"), os.path.join("icepy", "doc", "README.html")) + os.rename(os.path.join("ice", "doc", "index.html"), os.path.join("icepy", "doc", "index.html")) os.rename(os.path.join("ice", "doc", "images"), os.path.join("icepy", "doc", "images")) # @@ -257,6 +257,7 @@ config.close() print "Fixing version in README and INSTALL files..." fixVersion(find("icepy", "README*"), version) fixVersion(find("icepy", "INSTALL*"), version) +fixVersion(find("icepy/doc", "index.html"), version) # # Create source archives. diff --git a/rb/makedist.py b/rb/makedist.py index 565e94f7b98..dd999f9b453 100755 --- a/rb/makedist.py +++ b/rb/makedist.py @@ -170,7 +170,7 @@ if not skipDocs: os.environ["ICE_HOME"] = os.path.join(cwd, "ice") os.mkdir(os.path.join("icerb", "doc")) os.rename(os.path.join("ice", "doc", "reference"), os.path.join("icerb", "doc", "reference")) - os.rename(os.path.join("ice", "doc", "README.html"), os.path.join("icerb", "doc", "README.html")) + os.rename(os.path.join("ice", "doc", "index.html"), os.path.join("icerb", "doc", "index.html")) os.rename(os.path.join("ice", "doc", "images"), os.path.join("icerb", "doc", "images")) # @@ -230,6 +230,7 @@ version = re.search("VERSION[= \t]*([0-9\.b]+)", config.read()).group(1) print "Fixing version in README and INSTALL files..." fixVersion(find("icerb", "README*"), version) fixVersion(find("icerb", "INSTALL*"), version) +fixVersion(find("icerb/doc", "index.html"), version) # # Create source archives. diff --git a/vb/makedist.py b/vb/makedist.py index 81ba4925ccb..4a5982bbad0 100755 --- a/vb/makedist.py +++ b/vb/makedist.py @@ -162,7 +162,7 @@ if not skipDocs: os.chdir(cwd) os.mkdir(os.path.join("icevb", "doc")) os.rename(os.path.join("ice", "doc", "reference"), os.path.join("icevb", "doc", "reference")) - os.rename(os.path.join("ice", "doc", "README.html"), os.path.join("icevb", "doc", "README.html")) + os.rename(os.path.join("ice", "doc", "index.html"), os.path.join("icevb", "doc", "index.html")) os.rename(os.path.join("ice", "doc", "images"), os.path.join("icevb", "doc", "images")) shutil.rmtree("ice") @@ -192,6 +192,7 @@ if int(checkBeta[2]) > 50: print "Fixing version in README and INSTALL files..." fixVersion(find("icevb", "README*"), version) fixVersion(find("icevb", "INSTALL*"), version) +fixVersion(find("icevb/doc", "index.html"), version) # # Fix source dist demo project files. |