* tests/Param_Test/run_test: Allowed specification of the

invocation style (sii vs. dii) using a shaell variable.

* release.pl: Updated this script so that it can update different
levels of the release version number based on the setting of the
RELEASE_TYPE environment variable.

* Makefile: Added release.chk to the list of files going into the
release.  This file is our checklist for things that have been
tested and work leading up to a release.  Check in here for
details on how a test has worked on a platform.

6 files changed, 89 insertions, 34 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 2fd0ee1faae..b5d6e7390e3 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,5 +1,22 @@
 Thu Jan 29 15:58:01 1998  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
 
+	* tests/Param_Test/run_test: Allowed specification of the
+ 	invocation style (sii vs. dii) using a shaell variable.
+
+	* docs/releasenotes/{index,orbcore}.html: Updated to include some
+ 	details regarding this release.  These files are behind the
+ 	release, but I'm opting to get the release out and update these
+ 	files ex post facto.
+
+	* release.pl: Updated this script so that it can update different
+ 	levels of the release version number based on the setting of the
+ 	RELEASE_TYPE environment variable.
+
+	* Makefile: Added release.chk to the list of files going into the
+ 	release.  This file is our checklist for things that have been
+ 	tested and work leading up to a release.  Check in here for
+ 	details on how a test has worked on a platform.
+
 	* tests/POA/FindPOA/FindPOA.cpp (main): Added missing double-quote
  	in ACE_DEBUG().
 	
diff --git a/TAO/Makefile b/TAO/Makefile
index f27aadd1d66..f393ff205eb 100644
--- a/TAO/Makefile
+++ b/TAO/Makefile
@@ -48,6 +48,7 @@ RELEASE_FILES = TAO/ChangeLog \
 		TAO/TAO-INSTALL.html \
 		TAO/COPYING \
 		TAO/COPYING.sun \
+		TAO/release.chk \
 		TAO/docs \
 		TAO/LICENSE.sun \
 		TAO/Makefile \
@@ -74,15 +75,15 @@ INSTALL:	TAO-INSTALL.html
 ####       that final releases are not.  So, if the version number is, e.g.,
 ####       4.2, it will not be modified because it is assumed to be for a
 ####       final release.
-ifeq ($(shell pwd),/project/adaptive/ACE_wrappers/TAO)
+#ifeq ($(shell pwd),/project/adaptive/ACE_wrappers/TAO)
   TIMESTAMP = (CHANGELOG='ChangeLog'; export CHANGELOG; \
               if [ -z "$$CHANGELOG" ]; then echo unable to find latest ChangeLog file; exit 1; fi; \
               cd ..; UPTODATE=`cvs -nq update $(RELEASE_FILES) | egrep -v '/tests/log/' | perl -pi -e 's%/TAO%%g; s/$$/\\\n  /g'`; cd TAO; \
               if [ "$$UPTODATE" ]; then /pkg/gnu/bin/echo -e ERROR: workspace must be updated, and/or non-controlled files must be removed or added/committed: $$UPTODATE; exit 1; fi; \
 	      perl release.pl) &&
-else
-  TIMESTAMP =
-endif
+#else
+#  TIMESTAMP =
+#endif
 
 #### The following tar creation commands assume that cpio supports -H tar.
 #### Old versions of cpio might not, but the version that's shipped with
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 00cdd569490..d3ed4846be9 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -136,10 +136,11 @@ HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/VERSION">current release
 
   <P> Known bugs/unimplemented constructs:
   <UL>
-	<LI> Some of the known bugs/incomplete tasks are:
-            <UL>
-              <LI> Generation of Managed types must somehow be moved
-                  to the ORB Core </LI>
+      <li>Support dynamic libraries on NT, i.e., marking classes for
+      DLL export.</li>
+
+      <LI> Generation of Managed types must somehow be moved
+	to the ORB Core </LI>
 
               <LI>
                   We need support for ``TIEs'' (i.e., the object form
@@ -349,30 +350,37 @@ Point of contact: <A HREF="mailto:irfan@cs.wustl.edu">Irfan Pyarali</A>
 <P>Current Status:
 <UL>
 <LI>
-The POA implementation is almost complete.  The next step is the ORB
-Core / POA / IDL compiler integration.  Estimated deadline for this is
-December 22, 1997.
+The POA mostly complete.  There are remaining pieces to be
+implemented, but much of the POA framework exists.  This section will
+carry updates as available.
 </UL>
-Critical work:
 
-<UL>
-<LI>
-Re-generate win32 project files with new file names.</LI>
+    <p>Known issues:
+    <dl>
+      <dt><em>Support for collocation is not complete.</em></dt>
+      <dd>If an object which should be collocated is created via
+      <code>string_to_object</code>, it is created as a remote object
+      rather than collocated.</dd>
+    </dl>
 
-<LI>
-Add resolve_initial_references() to resolve the "RootPOA" entry.</LI>
-</UL>
+Critical work:
+    <UL>
+      <LI>None.</li>
+    </ul>
 
-Future work:
-<UL>
-<LI>
-Mostly compliant with the <A HREF="http://siesta.cs.wustl.edu/~cleeland/tao/POA.pdf">ORB
-Portability Specifications [orbos/97-05-15]</A> published by OMG.</LI>
+    Future work:
+    <UL>
+      <LI>Determine the degree to which we will support the full
+      semantics of remote objects on a colocated object.  The spec
+      mandates that collocated object should behave <em>exactly</em>
+      like remote objects, but that means that request will have to be
+      queued rather than calling a method directly, and this could be
+      hazardous to our quest for real-time ORB status.</li>
 
-<LI>
-Provide extensions of the specification to ensure real-time delivery of
-messages.</LI>
-</UL>
+      <LI>
+	Provide extensions of the specification to ensure real-time delivery of
+	messages.</LI>
+    </UL>
 
 <HR>
 <H3>
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
index f091e7fb876..dd67c359954 100644
--- a/TAO/docs/releasenotes/orbcore.html
+++ b/TAO/docs/releasenotes/orbcore.html
@@ -30,8 +30,25 @@
       support for multicast.</LI>
     </UL>
 
-    <p>Known problems:
+    <p>Known issues:
     <dl>
+      <dt><em>Servers cannot properly report OS-chosen port.</em></dt>
+
+      <dd>It is often desireable for a server to start up and not have
+      to specify the TCP port number on which the ORB will listen,
+      i.e., let the OS decide.  While this works properly (by
+      providing an argument <code>-ORBport 0</code>), it is very
+      difficult for the server to publish the IOR for clients' use.
+      This is because the port is not assigned until
+      <code>ORB::run</code> is called.</dd>
+
+      <dt><em>Demarshalling problems with complex types</em></dt>
+
+      <dd>The current demarshalling scheme may not work in cases of
+      complex types such as sequences of unions or anys or object
+      references.  The engine has difficulty determining the dynamic
+      type of the objects.</dd>
+
       <dt><em>Object references for objects dynamically created within
       a server may not have proper host.</em> (See also <a
       href="#hostfix">recent fix</a>.)</dt>
diff --git a/TAO/release.pl b/TAO/release.pl
index 1acd18ff859..555dec1a682 100755
--- a/TAO/release.pl
+++ b/TAO/release.pl
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 $date = `/usr/bin/date +"%a %b %d %T %Y"`;
 chop $date;
 $VERSION = "VERSION";
@@ -8,6 +5,10 @@ $CHANGELOG = "ChangeLog";
 $TAO_VERSION = '';
 $MODNAME = 'TAO';
 
+# Range of values on this is "alpha", "beta", or "major",
+# in which case the 3rd, 2nd, or 1st digit.
+$BUMP_WHICH = $ENV{'RELEASE_TYPE'};
+
 sub inplace {
     my($ext, @files) = @_;
     my(@nfiles) = ();
@@ -34,7 +35,17 @@ open (VERSIONOUT, ">$VERSION")
 
 undef $version_number;
 while (<VERSION>) {
-    s/(TAO version \d+\.\d+\.)(\d+)/sprintf("$1%d",$2+1)/e;
+    if ($BUMP_WHICH =~ m/major/i) {
+	$bump_expr = 'sprintf("$1%d.0.0", $2+1)';
+    }
+    elsif ($BUMP_WHICH =~ m/beta/i) {
+	$bump_expr = 'sprintf("$1$2.%d.0", $3+1)';
+    }
+    else {
+	$bump_expr = 'sprintf("$1$2.$3.%d", $4+1)';
+    }
+    $subst = 's/(TAO version )(\d+)\.(\d+)\.(\d+)/' . $bump_expr . '/e';
+    eval $subst;
     ($version_number = $_) =~ s/.*(\d+\.\d+\.\d+).*/$1/ if (!defined($version_number));
     if (s/(, released ).*/$1$date./) {
 	($TAO_VERSION = $_) =~ s/^This is //;
diff --git a/TAO/tests/Param_Test/run_test b/TAO/tests/Param_Test/run_test
index 4823bf29711..7041785971a 100755
--- a/TAO/tests/Param_Test/run_test
+++ b/TAO/tests/Param_Test/run_test
@@ -2,6 +2,7 @@
 
 PORT=20001
 IORFILE=theior
+INVOCATION=sii
 start_server()
 {
   ./server -ORBport $PORT -o $IORFILE 2>&1 | sed -e 's/^/SERVER: /' &
@@ -12,11 +13,11 @@ trap "start_server" 17
 trap "rm -f $IORFILE" 0
 start_server
 
-TYPES="short ubstring fixed_struct var_struct nested_struct struct_seq objref"
+TYPES="short ubstring fixed_struct strseq var_struct nested_struct struct_seq objref"
 for type in $TYPES
 do
   echo "BEGIN Testing type $type"
   sleep 2	# Give the server a chance to start up
-  ./client -f `cat $IORFILE` -t $type 2>&1 | sed -e "s/^/CLIENT($type): /"
+  ./client -f `cat $IORFILE` -i $INVOCATION -t $type 2>&1 | sed -e "s/^/CLIENT($type): /"
   echo "END   Testing type $type"
 done