* just for George, don't try to get the SVN r number if we don't need it. This
should speed up autogen.sh on platforms with really slow svnversion searches, as we only need the base version for autogen, which means we don't need the r number. * Since I can't type, add an error message if an invalid argument is given This commit was SVN r7224.
Этот коммит содержится в:
родитель
5d68fa836f
Коммит
aee3316243
@ -26,6 +26,16 @@
|
|||||||
srcfile="$1"
|
srcfile="$1"
|
||||||
option="$2"
|
option="$2"
|
||||||
|
|
||||||
|
case "$option" in
|
||||||
|
# svnversion can take a while to run. If we don't need it, don't run it.
|
||||||
|
--major|--minor|--release|--alpha|--beta|--base|--help)
|
||||||
|
OMPI_NEED_SVN=0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
OMPI_NEED_SVN=1
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
if test "$srcfile" = ""; then
|
if test "$srcfile" = ""; then
|
||||||
option="--help"
|
option="--help"
|
||||||
else
|
else
|
||||||
@ -50,7 +60,7 @@ else
|
|||||||
|
|
||||||
OMPI_BASE_VERSION="$OMPI_VERSION"
|
OMPI_BASE_VERSION="$OMPI_VERSION"
|
||||||
|
|
||||||
if test "$OMPI_WANT_SVN" = "1"; then
|
if test "$OMPI_WANT_SVN" = "1" -a "$OMPI_NEED_SVN" = "1" ; then
|
||||||
if test "$OMPI_SVN_R" = "-1"; then
|
if test "$OMPI_SVN_R" = "-1"; then
|
||||||
if test -d .svn; then
|
if test -d .svn; then
|
||||||
ver="r`svnversion .`"
|
ver="r`svnversion .`"
|
||||||
@ -112,6 +122,10 @@ $0 <srcfile> [<option>]
|
|||||||
--base - Show base version number (no svn number)
|
--base - Show base version number (no svn number)
|
||||||
--help - This message
|
--help - This message
|
||||||
EOF
|
EOF
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unrecognized option $option. Run $0 --help for options"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# All done
|
# All done
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user