Merge pull request #153 from ops/master

Removed references to CIAO and DAnCE.

5 files changed, 11 insertions, 25 deletions

diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index 4437c8daec1..0df8863ad15 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -292,10 +292,6 @@ def update_spec_file ():
                 line = "%define ACEVER  " + comp_versions["ACE_version"] + "\n"
             if line.find ("define TAOVER ") is not -1:
                 line = "%define TAOVER  " + comp_versions["TAO_version"] + "\n"
-            if line.find ("define CIAOVER ") is not -1:
-                line = "%define CIAOVER " + comp_versions["CIAO_version"] + "\n"
-            if line.find ("define DANCEVER ") is not -1:
-                line = "%define DANCEVER " + comp_versions["DAnCE_version"] + "\n"
             if line.find ("define is_major_ver") is not -1:
                 if opts.release_type == "beta":
                     line = "%define is_major_ver 0\n"
@@ -392,14 +388,14 @@ def update_debianbuild ():
 
     # rewrite debian/dsc
     dsc_lines = """Format: 1.0
-Source: ACE+TAO+CIAO-src-%s
+Source: ACE+TAO-src-%s
 Version: %s
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
 Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev
 Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-%s.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO-src-%s.tar.gz
 
 """ % (comp_versions["ACE_version"], comp_versions["TAO_version"], comp_versions["ACE_version"])
     if opts.take_action:
diff --git a/ACE/debian/README.source b/ACE/debian/README.source
index 33734bbdb11..714c67204eb 100644
--- a/ACE/debian/README.source
+++ b/ACE/debian/README.source
@@ -1,6 +1,6 @@
 = Compiling ACE+TAO Debian packages =
 
- * ACE+TAO-src-<version>.tar.bz2 is retrieved from:
+ * ACE+TAO-src-<version>.tar.gz is retrieved from:
      http://download.dre.vanderbilt.edu/previous_versions/
    The -src version does not contain pre-generated Makefiles. They are
    regenerated in the buid process.
diff --git a/ACE/debian/watch b/ACE/debian/watch
index 7065705bb08..1562dd3145f 100644
--- a/ACE/debian/watch
+++ b/ACE/debian/watch
@@ -1,3 +1,3 @@
 version=3
 
-ftp://download.dre.vanderbilt.edu/previous_versions/ACE\+TAO-src-(.*)\.tar\.bz2
+ftp://download.dre.vanderbilt.edu/previous_versions/ACE\+TAO-src-(.*)\.tar\.gz
diff --git a/ACE/rpmbuild/README b/ACE/rpmbuild/README
index 4cbe254906f..af6684ecc3b 100644
--- a/ACE/rpmbuild/README
+++ b/ACE/rpmbuild/README
@@ -1,5 +1,3 @@
-
-
 Building RPM from source tarball
 ================================================================
 
@@ -54,22 +52,20 @@ There are some important details:
 
 * The tarball name must have the ACE version in the name, for example:
 
-    ACE+TAO+CIAO-src-5.6.6.tar.bz2
+    ACE+TAO-src-6.3.3.tar.gz
 
 * The spec file inside the tarball
  (ACE_wrappers/rpmbuild/ace-tao.spec) must have the correct version
-  numbers for ACE, TAO and CIAO at the top:
+  numbers for ACE and TAO at the top:
 
-    %define ACEVER  5.6.6
-    %define TAOVER  1.6.6
-    %define CIAOVER 0.6.6
+    %define ACEVER  6.3.3
+    %define TAOVER  2.3.3
 
 * The following files in the source distribution must have the correct
   version numbers:
 
     ACE_wrappers/ace/Version.h
     ACE_wrappers/TAO/tao/Version.h
-    ACE_wrappers/TAO/CIAO/ciao/Version.h
 
 
 Building the RPM
@@ -79,7 +75,7 @@ You can kick off the rpmbuild anywhere; the tarball will be unpacked
 and built in your rpmbuild directory described in the previous
 section.
 
-    rpmbuild -tb your-tarball.tar.bz2
+    rpmbuild -tb your-tarball.tar.gz
 
 Some packages take quite a while to build.
 
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 1b6b25f55b5..3cd905c3585 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,7 +1,6 @@
 # Set the version number here.
 %define ACEVER  6.3.3
 %define TAOVER  2.3.3
-%define CIAOVER 1.3.3
 
 # Conditional build
 # Default values are
@@ -9,7 +8,7 @@
 #                    --with opt          (Optimized build)
 #                    --with zlib         (Zlib compressor)
 #                    --with bzip2        (Bzip2 compressor)
-#                    --with tao          (TAO/CIAO)
+#                    --with tao          (TAO)
 #                    --without fltk      (No ftlk support)
 #                    --without tk        (No tk support)
 #                    --without xt        (No xt support)
@@ -75,7 +74,7 @@ Group:        Development/Libraries/C and C++
 URL:          http://www.dre.vanderbilt.edu/~schmidt/ACE.html
 License:      DOC License
 %if 0%{?_with_tao:1}%{?_without_tao:0}
-Source0:      http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-%{ACEVER}.tar.gz
+Source0:      http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-%{ACEVER}.tar.gz
 %else
 Source0:      http://download.dre.vanderbilt.edu/previous_versions/ACE-src-%{ACEVER}.tar.gz
 %endif
@@ -823,8 +822,6 @@ export MPC_ROOT=$ACE_ROOT/MPC
 export LD_LIBRARY_PATH=$ACE_ROOT/lib
 %if 0%{?_with_tao:1}%{?_without_tao:0}
 export TAO_ROOT=$ACE_ROOT/TAO
-export CIAO_ROOT=$TAO_ROOT/CIAO
-export DANCE_ROOT=$TAO_ROOT/DAnCE
 %endif
 
 # Dump the g++ versions, in case the g++ version is broken we can
@@ -1003,15 +1000,12 @@ make %{?_smp_mflags} -C $ACE_ROOT
 
 %define ACEVERSO %{ACEVER}
 %define TAOVERSO %{TAOVER}
-%define CIAOVERSO %{CIAOVER}
 
 %install
 
 export ACE_ROOT=$(pwd)
 %if 0%{?_with_tao:1}%{?_without_tao:0}
 export TAO_ROOT=$ACE_ROOT/TAO
-export CIAO_ROOT=$TAO_ROOT/CIAO
-export DANCE_ROOT=$TAO_ROOT/DAnCE
 %endif
 
 # ---------------- Runtime Components ----------------