No need for a separate tarball script - add -no-ompi support to the main tarball script and get rid of the orte_tarball ones

This commit was SVN r22385.

contrib/Makefile.am

@@ -26,7 +26,6 @@ endif
 
 EXTRA_DIST = \
 	dist/make_dist_tarball \
-	dist/make_orte_dist_tarball \
 	dist/linux/openmpi.spec \
 	dist/macosx-pkg/buildpackage.sh \
 	dist/macosx-pkg/ReadMe.rtf \

contrib/dist/make_dist_tarball

@@ -43,12 +43,15 @@ else
 fi
 
 greekonly=0
+want_ompi=1
 while test "$1" != ""; do
     case $1 in
         -greekonly) greekonly=1 ;;
         --greekonly) greekonly=1 ;;
         -highok) highok=1 ;;
         --highok) highok=1 ;;
+        -no-ompi) want_ompi=0 ;;
+        --no-ompi) want_ompi=0 ;;
     esac
     shift
 done
@@ -197,7 +200,11 @@ make_tarball() {
     #
     echo "*** Running autogen.sh..."
     rm -f success
-    (./autogen.sh 2>&1 && touch success) | tee auto.out
+    if test "$want_ompi" = "1" ; then
+        (./autogen.sh 2>&1 && touch success) | tee auto.out
+    else
+        (./autogen.sh -no-ompi 2>&1 && touch success) | tee auto.out
+    fi
     if test ! -f success; then
         echo "Autogen failed.  Aborting"
         exit 1

contrib/dist/make_orte_dist_tarball

@@ -1,338 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The University of Tennessee and The University
-#                         of Tennessee Research Foundation.  All rights
-#                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
-#                         University of Stuttgart.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2008-2010 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# Version of auto tools that we want
-#
-
-M4_TARGET_VERSION=1.4.13
-AM_TARGET_VERSION=1.11
-AC_TARGET_VERSION=2.65
-LT_TARGET_VERSION=2.2.6b
-
-#
-# Check command line flags
-#
-
-# Default to requiring *exact* versions if we're making distribution
-# tarballs; but higher-than-expected versions are ok for
-# non-distribution tarballs.
-dist_target=distcheck
-if test "`basename $0`" = "make_orte_tarball"; then
-    dist_target=dist
-    highok=1
-else
-    highok=0
-fi
-
-greekonly=0
-while test "$1" != ""; do
-    case $1 in
-        -greekonly) greekonly=1 ;;
-        --greekonly) greekonly=1 ;;
-        -highok) highok=1 ;;
-        --highok) highok=1 ;;
-    esac
-    shift
-done
-
-#
-# First things first -- check that the auto versions that we have are
-# the ones that we want.
-#
-
-check_gnu_version() {
-    prog="$1"
-    target="$2"
-
-    ver="`$prog --version | head -n 1 | sed -e's/([^)]*)//g' -e's/[^0-9 .][^ ]* / /g' -e's/ //g'`"
-
-    ver_major=`echo $ver | cut -d. -f1`
-    ver_minor=`echo $ver | cut -d. -f2`
-    ver_release=`echo $ver | cut -d. -f3`
-    if test "$ver_release" = ""; then
-        ver_release=0
-    fi
-
-    target_major=`echo $target | cut -d. -f1`
-    target_minor=`echo $target | cut -d. -f2`
-    target_release=`echo $target | cut -d. -f3`
-    if test "$target_release" = ""; then
-        target_release=0
-    fi
-
-    # Gah -- Libtool released version 2.2.6b, the "b" of which totally
-    # screws up the -lt and -gt comparisons, below.  So strip out any
-    # trailing letters in the target_release and ver_release variables
-    # -- if they don't match, we'll just get a "they don't match
-    # somehow" kind of message (because I'm not going to code up a
-    # complex/clever alphanumeric lower/higher comparison thingy).
-    # Sigh.
-    ver_release=`echo $ver_release | sed 's/[a-z]//g'`
-    target_release=`echo $target_release | sed 's/[a-z]//g'`
-
-    result=same
-    if test "$ver" != "$target"; then 
-        if test "$ver_major" -lt "$target_major"; then
-            result=low
-        elif test "$ver_major" = "$target_major" -a "$ver_minor" -lt "$target_minor"; then
-            result=low
-        elif test "$ver_major" = "$target_major" -a "$ver_minor" = "$target_minor" -a "$ver_release" -lt "$target_release"; then
-            result=low
-        elif test "$ver_major" -gt "$target_major"; then
-            result=high
-        elif test "$ver_major" = "$target_major" -a "$ver_minor" -gt "$target_minor"; then
-            result=high
-        elif test "$ver_major" = "$target_major" -a "$ver_minor" = "$target_minor" -a "$ver_release" -gt "$target_release"; then
-            result=high
-        else
-            result=unknown
-        fi
-    fi
-
-    if test "$result" = "low"; then
-        cat <<EOF
-----------------------------------------------------------------------
-ERROR: Program "$prog" does not have a high enough version:
-       Found: $ver
-       Expected: $target
-
-Expected versions:
-m4: $M4_TARGET_VERSION
-Automake: $AM_TARGET_VERSION
-Autoconf: $AC_TARGET_VERSION
-Libtool:  $LT_TARGET_VERSION
-
-Either change this script to match the found version, or install
-the correct version of the tools.
-----------------------------------------------------------------------
-EOF
-        exit 1
-
-    elif test "$result" = "high"; then
-        if test "$highok" = "0"; then
-            cat <<EOF
-----------------------------------------------------------------------
-ERROR: Program "$prog" has a higher version than expected:
-       Found: $ver
-       Expected: $target
-
-Expected versions:
-m4: $M4_TARGET_VERSION
-Automake: $AM_TARGET_VERSION
-Autoconf: $AC_TARGET_VERSION
-Libtool:  $LT_TARGET_VERSION
-
-Either change this script to match the found version, or install
-the correct version of the tools.
-----------------------------------------------------------------------
-EOF
-            exit 1
-        else
-            cat <<EOF
-----------------------------------------------------------------------
-WARNING: Program "$prog" has a higher version than expected:
-         Found: $ver
-         Expected: $target
-
-Expected versions:
-m4: $M4_TARGET_VERSION
-Automake: $AM_TARGET_VERSION
-Autoconf: $AC_TARGET_VERSION
-Libtool:  $LT_TARGET_VERSION
-
-This is *usually* ok, but this script is going to sleep for 5 seconds
-to give you the chance to quit before doing anything.
-----------------------------------------------------------------------
-EOF
-            sleep 5
-        fi
-
-    elif test "$result" = "unknown"; then
-        cat <<EOF
-----------------------------------------------------------------------
-ERROR: Program "$prog" does not have the correct version:
-       Found: $ver
-       Expected: $target
-
-Expected versions:
-m4: $M4_TARGET_VERSION
-Automake: $AM_TARGET_VERSION
-Autoconf: $AC_TARGET_VERSION
-Libtool:  $LT_TARGET_VERSION
-
-Either change this script to match the found version, or install
-the correct version of the tools.
-----------------------------------------------------------------------
-EOF
-        exit 1
-    fi
-
-}
-
-#
-# Subroutine to actually make a tarball
-#
-
-make_tarball() {
-    #
-    # Autogen
-    #
-    echo "*** Running autogen.sh..."
-    rm -f success
-    (./autogen.sh -no-ompi 2>&1 && touch success) | tee auto.out
-    if test ! -f success; then
-        echo "Autogen failed.  Aborting"
-        exit 1
-    fi
-
-    #
-    # Configure
-    #
-    echo "*** Running configure..."
-    rm -f success
-    (./configure --enable-dist 2>&1 && touch success) | tee config.out
-    if test ! -f success; then
-        echo "Configure failed.  Aborting"
-        exit 1
-    fi
-
-    #
-    # make tarball
-    #
-    echo "*** Running make $dist_target..."
-    save_LD=$LD_LIBRARY_PATH
-    LD_LIBRARY_PATH=
-    rm -f success
-    (make $dist_target 2>&1 && touch success) | tee dist.out
-    if test ! -f success; then
-        echo "Make $dist_target failed.  Aborting"
-        exit 1
-    fi
-    rm -f success
-    LD_LIBRARY_PATH=$save_LD
-
-    #
-    # move
-    #
-    echo "*** Moving tarballs..."
-    mv openmpi-* ..
-
-    echo "*** All done"
-}
-
-#########################################################################
-# main
-#########################################################################
-
-echo "*** Checking GNU tools versions..."
-check_gnu_version m4 $M4_TARGET_VERSION
-check_gnu_version automake $AM_TARGET_VERSION
-check_gnu_version autoconf $AC_TARGET_VERSION
-check_gnu_version libtool $LT_TARGET_VERSION
-
-#
-# Verify that we're in a top Open MPI dir
-#
-echo "*** Checking to ensure in top-level Open MPI directory..."
-if test -f VERSION -a -f configure.ac -a -f config/ompi_get_version.m4 ; then
-    happy=1
-else
-    echo "Do not appear to be in an Open MPI top directory.  Abort!"
-    exit 1
-fi
-
-#
-# Do svn up and all that
-#
-echo "*** Removing old VERSION file..."
-rm -f VERSION
-
-if test -d .svn; then
-    echo "*** Running svn up..."
-    svn up
-    if test ! "$?" = "0"; then
-        echo "SVN update failed.  Aborting"
-        exit 1
-    fi
-elif test -d .hg; then
-    echo "*** Running hg up..."
-    hg revert VERSION
-    hg up
-    if test ! "$?" = "0"; then
-        echo "HG update failed.  Aborting"
-        exit 1
-    fi
-fi
-
-#
-# Ditch "svn/hg" from all version numbers
-#
-echo "*** Removing svn version numbers..."
-svn_r="r`svnversion .`"
-version_files=VERSION
-release_date=`date '+%b %d, %Y'`
-for file in $version_files; do
-    echo " - $file"
-    sed -e 's/^want_svn=.*/want_svn=0/' \
-        -e 's/^svn_r=.*/'svn_r=$svn_r/ \
-        -e "s/^date=.*/date=\"$release_date\"/" \
-        $file > $file.new
-    cp -f $file.new $file
-    rm $file.new
-done
-
-#
-# Make 2 tarballs:
-#
-# - one with the greek
-# - one without the greek
-#
-# unless the user specifically said --greekonly, then only make the
-# greek tarball.  Making both tarballs at once allows us to guarantee
-# to have two tarballs -- one greek and one not -- that have exactly
-# the same SVN r number (as opposed to, for example, running this
-# script to make a greek tarball, then running it again to make a
-# non-greek tarball -- there is a race condition that someone could
-# commit in the meantime and change the SVN r number in the 2nd
-# tarball)
-#
-
-# First, make greek tarball
-
-echo "*** Making greek tarball"
-make_tarball
-
-# Now if ! --greekonly, make the non-greek tarball
-
-if test "$greekonly" = "0"; then
-    echo "*** REMOVING ALL GREEK FROM VERSION NUMBERS!!"
-    for file in $version_files; do
-        echo " - $file"
-        sed -e 's/^greek=.*/greek=/' $file > $file.new
-        cp -f $file.new $file
-        rm $file.new
-    done
-    echo "Making non-greek tarball"
-    make_tarball
-fi
-
-# Put the VERSION file back the way it was
-svn revert VERSION

contrib/dist/make_orte_tarball

@@ -1 +0,0 @@
-make_orte_dist_tarball