* Replace "SUNW" with "OMPI" in contrib/dist/solaris.

* Add a description for `examples/connectivity_c.c` in 
   `examples/README`.

This commit was SVN r15797.

contrib/dist/solaris/bld_solaris_pkgs

@@ -62,7 +62,7 @@ PATH=/usr/bin:/usr/sbin:${PATH}
 #
 ARCH=`uname -p`
 DATE=`date +'%Y.%m.%d'`
-PKGNAMES="SUNWompi SUNWompimn SUNWomsc"
+PKGNAMES="OMPIompi OMPIompimn OMPIomsc"
 PLATFORM=`uname -s`
 PROTO=
 SED_PKGINFO_PROTO=sed_pkginfo_proto
@@ -120,21 +120,20 @@ function build_prototype
 i pkginfo=pkginfo.${1}
 i copyright
 
-d none SUNWhpc 0755 root bin
 _EOF
 
-    if [ "$1" = "SUNWompimn" ] ; then
+    if [ "$1" = "OMPIompimn" ] ; then
-        echo "d none SUNWhpc/\$SUNW_PRODVERS 0755 root bin" >> ${f_proto_name}.tmp 2>&1
+        echo "d none \$SUNW_PRODVERS 0755 root bin" >> ${f_proto_name}.tmp 2>&1
-        pkgproto ${PROTO}/man=SUNWhpc/\$SUNW_PRODVERS/man >> ${f_proto_name}.tmp 2>&1
+        pkgproto ${PROTO}/man=\$SUNW_PRODVERS/man >> ${f_proto_name}.tmp 2>&1
     fi
 
-    if [ "$1" = "SUNWomsc" ] ; then
+    if [ "$1" = "OMPIomsc" ] ; then
-        echo "d none SUNWhpc/\$SUNW_PRODVERS 0755 root bin" >> ${f_proto_name}.tmp 2>&1
+        echo "d none \$SUNW_PRODVERS 0755 root bin" >> ${f_proto_name}.tmp 2>&1
-        pkgproto ${PROTO}/examples=SUNWhpc/\$SUNW_PRODVERS/examples >> ${f_proto_name}.tmp 2>&1
+        pkgproto ${PROTO}/examples=\$SUNW_PRODVERS/examples >> ${f_proto_name}.tmp 2>&1
     fi
 
-    if [ "$1" = "SUNWompi" ] ; then
+    if [ "$1" = "OMPIompi" ] ; then
-        pkgproto ${PROTO}=SUNWhpc/\$SUNW_PRODVERS | egrep -v "man|examples|\.la" >> ${f_proto_name}.tmp 2>&1
+        pkgproto ${PROTO}=\$SUNW_PRODVERS | egrep -v "man|examples|\.la" >> ${f_proto_name}.tmp 2>&1
     fi
 
 	sed -f ${SED_PKGINFO_PROTO} ${f_proto_name}.tmp > ${f_proto_name}

contrib/dist/solaris/pkginfo.OMPIompi.tmpl

@@ -1,16 +1,19 @@
-# Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 #                         Use is subject to license terms.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
 
-PKG="SUNWompi"
+PKG="OMPIompi"
 NAME="Open MPI Message Passing Interface"
 VERSION="1.0"
 BASEDIR="/opt"
 ARCH="ISA"
-SUNW_PRODVERS="HPC7.0"
+SUNW_PRODVERS="ompi"
-SUNW_PRODNAME="Sun HPC ClusterTools 7"
+SUNW_PRODNAME="Open MPI"
 SUNW_PKGVERS="1.0"
 DESC="Open MPI Message Passing Interface"
-VENDOR="Sun Microsystems, Inc."
+VENDOR="Open MPI"
 CATEGORY="system"
 CLASSES="none"
 MAXINST="1000"

contrib/dist/solaris/pkginfo.OMPIompimn.tmpl

@@ -1,16 +1,19 @@
-# Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 #                         Use is subject to license terms.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
 
-PKG="SUNWompimn"
+PKG="OMPIompimn"
 NAME="Open MPI Message Passing Interface Man Page"
 VERSION="1.0"
 BASEDIR="/opt"
 ARCH="ISA"
-SUNW_PRODVERS="HPC7.0"
+SUNW_PRODVERS="ompi"
-SUNW_PRODNAME="Sun HPC ClusterTools 7"
+SUNW_PRODNAME="Open MPI"
 SUNW_PKGVERS="1.0"
 DESC="Open MPI Message Passing Interface Man Page"
-VENDOR="Sun Microsystems, Inc."
+VENDOR="Open MPI"
 CATEGORY="system"
 CLASSES="none"
 MAXINST="1000"

contrib/dist/solaris/pkginfo.OMPIomsc.tmpl

@@ -1,16 +1,19 @@
-# Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 #                         Use is subject to license terms.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
 
-PKG="SUNWomsc"
+PKG="OMPIomsc"
 NAME="Open MPI Miscellaneous Files"
 VERSION="1.0"
 BASEDIR="/opt"
 ARCH="ISA"
-SUNW_PRODVERS="HPC7.0"
+SUNW_PRODVERS="ompi"
-SUNW_PRODNAME="Sun HPC ClusterTools 7"
+SUNW_PRODNAME="Open MPI"
 SUNW_PKGVERS="1.0"
 DESC="Open MPI Miscellaneous Files"
-VENDOR="Sun Microsystems, Inc."
+VENDOR="Open MPI"
 CATEGORY="system"
 CLASSES="none"
 MAXINST="1000"

examples/README

@@ -2,6 +2,7 @@ Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
                         University Research and Technology
                         Corporation.  All rights reserved.
 Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 
 The files in this directory are sample MPI applications provided both
 as a trivial primer to MPI as well as simple tests to ensure that your
@@ -26,6 +27,9 @@ There are 2 MPI examples in this directory, each in four languages:
   F77: ring_f77.f
   F90: ring_f90.f90
 
+- Test the connectivity between all processes
+  C:   connectivity_c.c
+
 The Makefile in this directory will build as many of the examples as
 you have language support (e.g., if you do not have F90 bindings
 compiled as part of Open MPI, the F90 examples will be skipped).