ChangeLogTag: Thu Jun 13 19:05:57 2002 Krishnakumar B <kitty@cs.wustl.edu>

5 files changed, 68 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index d42ca1d36ed..89d38296d3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Thu Jun 13 19:05:57 2002  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * include/makeinclude/rules.local.GNU:
+
+          Added a rule to install a symlink to libfoo.so.3 under
+          $(ACE_ROOT)/ace. This should fix all the build errors. ld.so
+          needs libfoo.so.3 to be in LD_LIBRARY_PATH. libfoo.so doesn't
+          do. Thanks to Marvin Wolfthal <maw@weichi.com> for reporting the
+          problem.
+
+        * bin/make_release:
+
+          Changes to ensure that all major releases are named
+          ACE-[0-9]+.0.0 and all minor releases are named
+          ACE-[0-9]+.[0-9]+.0. PLEASE TAG THE REPOSITORY AS ACE_5_3_0 and
+          TAO_1_3_0 or ACE_6_0_0 and TAO_2_0_0 WHEN MAKING A MINOR OR A
+          MAJOR RELEASE. Pointers to add this to somewhere more prominent
+          are welcome.
+
 Thu Jun 13 14:45:13 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/SOCK_Dgram_Mcast_T.cpp: Added wchar support - remove
@@ -18,7 +37,7 @@ Wed Jun 12 18:29:11 2002  Krishnakumar B  <kitty@cs.wustl.edu>
         * include/makeinclude/platform_g++_common.GNU:
 
           Added support for shared library versioning. Libraries built
-          with GNU ld with be versioned by default.
+          with GNU ld will be versioned by default.
 
         * include/makeinclude/platform_aix4_cset++.GNU:
         * include/makeinclude/platform_aix4_g++.GNU:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index d42ca1d36ed..89d38296d3d 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,22 @@
+Thu Jun 13 19:05:57 2002  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * include/makeinclude/rules.local.GNU:
+
+          Added a rule to install a symlink to libfoo.so.3 under
+          $(ACE_ROOT)/ace. This should fix all the build errors. ld.so
+          needs libfoo.so.3 to be in LD_LIBRARY_PATH. libfoo.so doesn't
+          do. Thanks to Marvin Wolfthal <maw@weichi.com> for reporting the
+          problem.
+
+        * bin/make_release:
+
+          Changes to ensure that all major releases are named
+          ACE-[0-9]+.0.0 and all minor releases are named
+          ACE-[0-9]+.[0-9]+.0. PLEASE TAG THE REPOSITORY AS ACE_5_3_0 and
+          TAO_1_3_0 or ACE_6_0_0 and TAO_2_0_0 WHEN MAKING A MINOR OR A
+          MAJOR RELEASE. Pointers to add this to somewhere more prominent
+          are welcome.
+
 Thu Jun 13 14:45:13 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/SOCK_Dgram_Mcast_T.cpp: Added wchar support - remove
@@ -18,7 +37,7 @@ Wed Jun 12 18:29:11 2002  Krishnakumar B  <kitty@cs.wustl.edu>
         * include/makeinclude/platform_g++_common.GNU:
 
           Added support for shared library versioning. Libraries built
-          with GNU ld with be versioned by default.
+          with GNU ld will be versioned by default.
 
         * include/makeinclude/platform_aix4_cset++.GNU:
         * include/makeinclude/platform_aix4_g++.GNU:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index d42ca1d36ed..89d38296d3d 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,22 @@
+Thu Jun 13 19:05:57 2002  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * include/makeinclude/rules.local.GNU:
+
+          Added a rule to install a symlink to libfoo.so.3 under
+          $(ACE_ROOT)/ace. This should fix all the build errors. ld.so
+          needs libfoo.so.3 to be in LD_LIBRARY_PATH. libfoo.so doesn't
+          do. Thanks to Marvin Wolfthal <maw@weichi.com> for reporting the
+          problem.
+
+        * bin/make_release:
+
+          Changes to ensure that all major releases are named
+          ACE-[0-9]+.0.0 and all minor releases are named
+          ACE-[0-9]+.[0-9]+.0. PLEASE TAG THE REPOSITORY AS ACE_5_3_0 and
+          TAO_1_3_0 or ACE_6_0_0 and TAO_2_0_0 WHEN MAKING A MINOR OR A
+          MAJOR RELEASE. Pointers to add this to somewhere more prominent
+          are welcome.
+
 Thu Jun 13 14:45:13 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/SOCK_Dgram_Mcast_T.cpp: Added wchar support - remove
@@ -18,7 +37,7 @@ Wed Jun 12 18:29:11 2002  Krishnakumar B  <kitty@cs.wustl.edu>
         * include/makeinclude/platform_g++_common.GNU:
 
           Added support for shared library versioning. Libraries built
-          with GNU ld with be versioned by default.
+          with GNU ld will be versioned by default.
 
         * include/makeinclude/platform_aix4_cset++.GNU:
         * include/makeinclude/platform_aix4_g++.GNU:
diff --git a/bin/make_release b/bin/make_release
index dd48751b58c..29e19425943 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -42,7 +42,7 @@ my $which_host = $ENV{'OSTYPE'};
 
 my $release_host = substr ($which_host, 0, 5);
 
-## We are not going to use any Sun boxes for the release anymore.. 
+## We are not going to use any Sun boxes for the release anymore..
 
 if (! ($release_host eq 'linux')){
     die "$0: You are on the wrong OS, please move to linux box\n";
@@ -91,7 +91,7 @@ my $gnu = '/bin';
 $ENV{'PATH'} = "$gnu" . ':' . $ENV{'PATH'};
 
 ### Any tools in /usr/local/bin can also be added. We dont need that
-### for deuce.doc 
+### for deuce.doc
 my $gnu2 = '/usr/bin';
 
 ####### Add the path to /usr/bin unconditionally..
@@ -295,7 +295,7 @@ if ($update_versions  &&  "$kit" ne 'ace+tao') {
       &ex ("cd ACE_wrappers && bin/generate_doxygen.pl -is_release -exclude_tao -perl_path $perl_path -dot_path $dot_path")
 	&& die "$0: failed to generate ACE man pages in $stage_dir\n";
 
-##      DONT generate the windex database on Linux. Things get screwed. 
+##      DONT generate the windex database on Linux. Things get screwed.
 ##      &ex ("cd ACE_wrappers/man && catman -w -M .")
 ##	&& die "$0: failed to generate man page index in $stage_dir\n";
     }
@@ -460,17 +460,16 @@ sub get_versions () {
 
   if ($release_type eq 'beta') {
     ++$beta_version;
-    $version = "$major_version.$minor_version.$beta_version";
   } elsif ($release_type eq 'minor' ) {
     $beta_version = 0;
     ++$minor_version;
-    $version = "$major_version.$minor_version";
   } elsif ($release_type eq 'major' ) {
     $minor_version = $beta_version = 0;
     ++$major_version;
-    $version = "$major_version.$minor_version";
   }
 
+  $version = "$major_version.$minor_version.$beta_version";
+
   print "new $KIT version: $version\n";
 
   if ($kit =~ /tao/) {
@@ -496,11 +495,7 @@ sub get_versions () {
     }
     close ACE_VERSION;
 
-    if ($ace_beta_version == 0) {
-      $ace_version = "$ace_major_version.$ace_minor_version";
-    } else {
-      $ace_version = "$ace_major_version.$ace_minor_version.$ace_beta_version";
-    }
+    $ace_version = "$ace_major_version.$ace_minor_version.$ace_beta_version";
   }
 
   0;
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index 8a882644bf7..8def9282221 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -180,6 +180,8 @@ $(INSMAN)/mann/% :
 			echo "Installing $(@F) -> $(@D)" ; \
 			$(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \
 			$(LN_S) $(shell pwd)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \
+			$(RM) $@; \
+			$(LN_S) $(shell pwd)/$(@F) $@; \
 		fi ; \
 	fi
 ifdef MVSLIB