ChangeLogTag:Fri Dec 20 20:02:41 2002 Steve Huston <shuston@riverace.com>

3 files changed, 65 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index dbcb1981d57..4c020c2b93f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Dec 20 20:02:41 2002  Steve Huston  <shuston@riverace.com>
+
+        * bin/make_release: When updating version files, also update
+          bin/MakeProjectCreator/config/aceversion.mpb and taoversion.mpb.
+          Added a new subroutine, generate_makefiles() that's called just
+          before create_kit. It generates the workspace and project files
+          for ACE_wrappers/ace and ACE_wrappers/tests. If any of these are
+          desired for TAO, someone knowledgeable on TAO should add to the
+          place in generate_makefiles() for the TAO stuff.
+
 Fri Dec 20 16:12:33 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ACE.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index dbcb1981d57..4c020c2b93f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Fri Dec 20 20:02:41 2002  Steve Huston  <shuston@riverace.com>
+
+        * bin/make_release: When updating version files, also update
+          bin/MakeProjectCreator/config/aceversion.mpb and taoversion.mpb.
+          Added a new subroutine, generate_makefiles() that's called just
+          before create_kit. It generates the workspace and project files
+          for ACE_wrappers/ace and ACE_wrappers/tests. If any of these are
+          desired for TAO, someone knowledgeable on TAO should add to the
+          place in generate_makefiles() for the TAO stuff.
+
 Fri Dec 20 16:12:33 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ACE.h:
diff --git a/bin/make_release b/bin/make_release
index 4757ab49e0c..ff0e09a563c 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -318,6 +318,11 @@ if ($update_versions  &&  "$kit" ne 'ace+tao') {
     }
   }
 
+  $status = &generate_makefiles ();
+  if ($status != 0) {
+    die "$0: failed to generate makefiles\n";
+  }
+
   $status = &create_kit ();
 
   if (! $status  &&  $install) {
@@ -526,6 +531,10 @@ sub update_version_files () {
     if ("$exec_prefix") {
       print "TAO version ${major_version}.${minor_version}.${beta_version}\n";
     } else {
+      &ex ("perl -pi -e 's/version =.*/version = $version/' " .
+           "../bin/MakeProjectCreator/config/taoversion.mpb");
+      return 1 if $? >> 8;
+
       open (TAO_VERSION_H, "> tao/Version.h")  ||
         die "$0: unable to open tao/Version.h\n";
 
@@ -545,6 +554,9 @@ sub update_version_files () {
     if ("$exec_prefix") {
       print "ACE version ${major_version}.${minor_version}.${beta_version}\n";
     } else {
+      &ex ("perl -pi -e 's/version =.*/version = $version/' " .
+           "bin/MakeProjectCreator/config/aceversion.mpb");
+      return 1 if $? >> 8;
 
       open (ACE_VERSION_H, "> ace/Version.h")  ||
         die "$0: unable to open ace/Version.h\n";
@@ -598,11 +610,12 @@ sub update_changelog () {
     || return 1;
 
   my $version_h = $kit =~ /^ace/  ?  'ace/Version.h'  :  'tao/Version.h';
+  my $version_mpb = $kit =~ /^ace/  ?  'bin/MakeProjectCreator/config/aceversion.mpb'  :  '../bin/MakeProjectCreator/config/taoversion.mpb';
 
   &ex ("$cvs commit -m'$version' " .
-       "VERSION PROBLEM-REPORT-FORM ChangeLog $version_h  &&  " .
-       "chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h; " .
-       "chgrp doc VERSION PROBLEM-REPORT-FORM ChangeLog $version_h");
+    "VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb &&  " .
+    "chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb; " .
+    "chgrp doc VERSION PROBLEM-REPORT-FORM ChangeLog $version_h $version_mpb");
   return 1 if $? >> 8;
 
   0;
@@ -658,6 +671,35 @@ sub diff () {
 
 
 ########
+######## Generate Makefiles and workspace/project files.
+########
+sub generate_makefiles () {
+  if ($kit =~ /^ace/) {
+    # At this point, the only mwc/mpc files are in ace and tests. When more
+    # are available, this needs to be updated, maybe by cycling through
+    # all non-TAO directories looking for mwc (or mpc?) files.
+    if ("$exec_prefix") {
+      print "chdir ace\n";
+    } else {
+      chdir "ace"  ||  die "$0: unable to chdir ace\n";
+    }
+    &ex ("../bin/mwc.pl -type vc7 ace.mwc; ../bin/mwc.pl -type em3 ace.mwc");
+    if ("$exec_prefix") {
+      print "chdir ../tests\n";
+    } else {
+      chdir "../tests"  ||  die "$0: unable to chdir ../tests\n";
+    }
+    &ex ("../bin/mwc.pl -type vc7 tests.mwc; ../bin/mwc.pl -type em3 tests.mwc");
+  }
+  if ($kit =~ /^tao/) {
+    # A TAO-knowledgable person needs to decide what, if anything, is to be
+    # done here.
+    0;
+  }
+}
+
+
+########
 ######## Create the tar file(s) and move to their proper location.
 ########
 sub create_kit () {